Merge remote-tracking branch 'origin/zycrm' into zycrm

Junjie

2023-11-10 cbc9250b33a955bc919a6afc5d4101ef65bbfafa

 src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java

@@ -56,6 +56,12 @@
    @Autowired
    private ProcessPermissionsService processPermissionsService;

    @Autowired
    private BusinessTripService businessTripService;

    @Autowired
    private BusinessTripOtherService businessTripOtherService;

    @RequestMapping(value = "/reimburseOnline/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
@@ -68,7 +74,7 @@
        }

        // 步骤条相关
        resultObj.put("step", reimburseOnline.getSettle() == 6 ? 0 : reimburseOnline.getSettle() + 1);
        resultObj.put("step", reimburseOnline.getSettle() == 7 ? 0 : reimburseOnline.getSettle() + 1);

        return R.ok().add(resultObj);
    }
@@ -134,7 +140,13 @@
            }
        }
        if (!signUserId && !signDeptId){
            wrapper.eq("user_id", getUserId());
            if (getRole().getId()==1){
                wrapper.or().eq("host_id",1);
            }else if (getRole().getId()==2){
                wrapper.eq("dept_id",getDeptId());
            }else {
                wrapper.eq("user_id", getUserId());
            }
        }
        if (signHostId){
            wrapper.or().eq("host_id",1);
@@ -144,47 +156,51 @@
    @ManagerAuth(memo = "添加报销单")
    @Transactional
    public R formAdd(@RequestBody ReimburseOnlineDomainParam param){
        long planId = 0;
        long orderId = 0;
        if (!param.getTemplateName().equals("非项目型报销")){
            if (Cools.isEmpty(param.getOrderNo())){
                return R.error("添加失败！"+param.getTemplateName()+"需要关联项目号");
            if (Cools.isEmpty(param.getOrderId())){
                if (Cools.isEmpty(param.getBusinessId())){
                    if (Cools.isEmpty(param.getBusinessOtherId())){
                        return R.error("添加失败！"+param.getTemplateName()+"需要关联项目号");
                    }
                    BusinessTripOther businessTripOther = businessTripOtherService.selectById(param.getBusinessOtherId());
                    param.setOrderId(businessTripOther.getOrderId());
                }else {
                    BusinessTrip businessTrip = businessTripService.selectById(param.getBusinessId());
                    param.setOrderId(businessTrip.getOrderId());
                }
            }
            String[] split = param.getOrderNo().split("---");
            planId = Long.parseLong(split[1]);
            orderId = param.getOrderId();
        }
        Date now = new Date();
        Rule rule = ruleService.selectById(1);
        ReimburseOnline reimburseOnline = new ReimburseOnline(planId,RuleUtils.rule(rule),now,getUser());
        ReimburseOnline reimburseOnline = new ReimburseOnline(orderId,RuleUtils.rule(rule),now,getUser());
        reimburseOnline.setCheckData(param.getCheckData());
        reimburseOnline.setTemplateName(param.getTemplateName());
        reimburseOnline.setName(param.getName());
        reimburseOnline.setName("");

        reimburseOnline.setSettle(0);  // 0.创建
        User manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 获取部门领导
        reimburseOnline.setSettle(1);  // 1.创建
        User manager = new User();
        try{
            manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 获取部门领导
        }catch (Exception e){
            manager = getUser();
        }

        ProcessPermissions processPermissions3 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", param.getCheckData().equals("否")? "3-1" : "3-2"));//3：报销流程
        User president3 = userService.selectById(processPermissions3.getUserId());       // 获取报价流程节点3确认人
        User president3 = userService.selectById(processPermissions3.getUserId());       // 获取流程节点3确认人

        ProcessPermissions processPermissions4 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", "4-1"));//3：报销流程
        User president4 = userService.selectById(processPermissions4.getUserId());       // 获取报价流程节点4确认人
        User president4 = userService.selectById(processPermissions4.getUserId());       // 获取流程节点4确认人

        ProcessPermissions processPermissions5 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", "5-1"));//3：报销流程
        User president5 = userService.selectById(processPermissions5.getUserId());       // 获取报价流程节点5确认人
        User president5 = userService.selectById(processPermissions5.getUserId());       // 获取流程节点5确认人

        ProcessPermissions processPermissions6 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", "6-1"));//3：报销流程
        User president6 = userService.selectById(processPermissions6.getUserId());       // 获取报价流程节点6确认人
        User president6 = userService.selectById(processPermissions6.getUserId());       // 获取流程节点6确认人

        reimburseOnline.setSettleMsg(JSON.toJSONString(SettleDto.initPriQuote(reimburseOnline, manager,president3,president4,president5,president6,getUser())));
        Map<String, Object> map = new HashMap<>();
        map.put("title","非项目型报销");
        map.put("reimburseId",reimburseOnline.getPlanId$());
        map.put("docType",param.getDocType());
        map.put("orderNo",param.getOrderNo());
        map.put("templateName",param.getTemplateName());
        map.put("checkData",param.getCheckData());
        map.put("name",param.getName());
        reimburseOnline.setForm(JSON.toJSONString(map));
        reimburseOnline.setMemberId(getUser().getId());
        reimburseOnline.setMemberId(manager.getId());

        if (!reimburseOnlineService.insert(reimburseOnline)){
            return R.error("添加报销主档失败");
@@ -226,16 +242,6 @@
        reimburseOnline.setItemId(planId);
        reimburseOnline.setName(param.getName());
        reimburseOnline.setUpdateTime(new Date());

        Map<String, Object> map = new HashMap<>();
        map.put("title",reimburseOnline.getPlanId$());
        map.put("reimburseId",param.getReimburseId());
        map.put("docType",param.getDocType());
        map.put("orderNo",param.getOrderNo());
        map.put("templateName",param.getTemplateName());
        map.put("checkData",param.getCheckData());
        map.put("name",param.getName());
        reimburseOnline.setForm(JSON.toJSONString(map));

        if (!reimburseOnlineService.updateById(reimburseOnline)){
            return R.error("更新报销主档失败");
@@ -465,7 +471,7 @@
        for (ReimburseOnline priOnline : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", priOnline.getId());
            map.put("value", priOnline.getOrderNum() + "/" + priOnline.getPlanId$() + "/" + priOnline.getMemberId$());
            map.put("value", priOnline.getOrderNum() + "/" + priOnline.getOrderId$() + "/" + priOnline.getMemberId$());
            result.add(map);
        }
        return R.ok(result);
@@ -534,13 +540,18 @@
                reimburseOnline.setMemberId(manager1.getId());

                if (!reimburseOnlineService.updateById(reimburseOnline)) {
                    throw new CoolException("审核失败，请联系管理员");
                    throw new CoolException("提交失败，请联系管理员");
                }
                break;
            case 1:
                // 本部门经理审核
                User user = userService.selectById(reimburseOnline.getUserId());
                User manager = userService.getDeptManager(getHostId(), user.getDeptId());
                User manager = new User();
                try{
                    manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 获取部门领导
                }catch (Exception e){
                    manager = user;
                }
                if (manager.getId().equals(getUserId())) {

                    // 修改 settle 步骤数据