#

LSH

2023-11-28 bf6b2a0e57730d4b241a5b94cf2e8d3954a48c88

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

@@ -140,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);
@@ -182,16 +188,16 @@
        }

        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())));
        reimburseOnline.setMemberId(manager.getId());
@@ -212,19 +218,19 @@
    @Transactional
    public R formModify(@RequestBody ReimburseOnlineDomainParam param){

        long planId = 0;
        if (!param.getTemplateName().equals("非项目型报销")){
            if (Cools.isEmpty(param.getOrderNo())){
                return R.error("修改失败！"+param.getTemplateName()+"需要关联项目号");
            }
            String[] split = param.getOrderNo().split("---");
            planId = Long.parseLong(split[1]);
        }
//        long planId = 0;
//        if (!param.getTemplateName().equals("非项目型报销")){
//            if (Cools.isEmpty(param.getOrderNo())){
//                return R.error("修改失败！"+param.getTemplateName()+"需要关联项目号");
//            }
//            String[] split = param.getOrderNo().split("---");
//            planId = Long.parseLong(split[1]);
//        }
        Date now = new Date();
        ReimburseOnline reimburseOnline = reimburseOnlineService.selectById(param.getReimburseId());

        if (!reimburseOnline.getSettle().equals(0)){
            return R.error("修改失败！提交之后禁止修改！");
        if (!reimburseOnline.getSettle().equals(1)){
            return R.error("修改失败！部门经理审核之后禁止修改！");
        }
        if (!reimburseOnline.getUserId().equals(getUserId())){
            return R.error("非创建人员禁止修改！");
@@ -233,7 +239,7 @@

        reimburseOnline.setCheckData(param.getCheckData());
        reimburseOnline.setTemplateName(param.getTemplateName());
        reimburseOnline.setItemId(planId);
//        reimburseOnline.setItemId(planId);
        reimburseOnline.setName(param.getName());
        reimburseOnline.setUpdateTime(new Date());