#

LSH

2023-11-09 affb9fbb6862699df4495517c41c62be7b5e10a6

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

@@ -6,10 +6,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.common.*;
import com.core.domain.KeyValueVo;
import com.core.exception.CoolException;
import com.zy.crm.common.model.SettleDto;
@@ -118,6 +115,23 @@
        });
    }

    @RequestMapping(value = "/plan/assistantPlan/view/auth")
    @ManagerAuth(memo = "查看副规划申请单")
    @Transactional
    public R assistantPlanView(@RequestParam Long hostPlanId) {
        Plan plan = planService.selectById(hostPlanId);
        if (plan.getAssistantHostSign()==1){
            EntityWrapper<Plan> wrapper = new EntityWrapper<>();
            wrapper.eq("id",plan.getHostPlanId());
            Page<Plan> planPage = planService.selectPage(new Page<>(1, 1), wrapper);
            return R.ok(planPage);
        }
        EntityWrapper<Plan> wrapper = new EntityWrapper<>();
        wrapper.eq("id",plan.getAssistantPlanId());
        Page<Plan> planPage = planService.selectPage(new Page<>(1, 1), wrapper);
        return R.ok(planPage);
    }

    @RequestMapping(value = "/plan/add/auth")
    @ManagerAuth(memo = "添加规划申请单")
    @Transactional
@@ -169,6 +183,11 @@
            manager = getUser();
        }
        PlanType planType = planTypeService.selectById(plan.getPlanType());
        if (planType.getType().equals(2)) {
            plan.setStatus2(0);
        }else {
            plan.setStatus2(10);
        }
        User planLeader = planTypeService.findPlanLeader(planType);
        plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager, planLeader)));

@@ -194,6 +213,13 @@
    @Transactional
    public R assistantPlanAdd(@RequestParam Long hostPlanId) {
        Plan hostPlan = planService.selectById(hostPlanId);
        if (hostPlan.getAssistantHostSign()!=0){
            return R.error("此规划单不需要创建副流程");
        }
        PlanType planType2 = planTypeService.selectById(hostPlan.getPlanType());
        if (planType2.getType()!=2){
            return R.error("此规划单不需要创建副流程");
        }
        if (!Cools.isEmpty(hostPlan.getAssistantPlanId()) && hostPlan.getAssistantPlanId()!=0){
            return R.error("此规划单已存在副规划单，id为"+hostPlan.getAssistantPlanId());
        }
@@ -333,6 +359,7 @@
                 Plan planB = planService.selectById(planA.getHostPlanId());
                 planB.setAssistantPlanId(0L);
                 planB.setHostPlanId(0L);
                 planB.setStatus2(0);
                 planService.updateById(planB);
             }else {
                 if (!Cools.isEmpty(planA.getAssistantPlanId()) && planA.getAssistantPlanId()!=0){
@@ -511,8 +538,7 @@
//                break;
            case 1:
                // 查找规划组长
                PlanType planType = planTypeService.selectById(plan.getPlanType());
                User planLeader = planTypeService.findPlanLeader(planType);
                User planLeader = userService.selectById(plan.getDirector());
                if (Cools.isEmpty(planLeader)) {
                    throw new CoolException("未查找到规划组长，请联系管理员");
                }
@@ -654,6 +680,12 @@
                plan.setUpdateBy(getUserId());
                plan.setUpdateTime(new Date());

                if (plan.getAssistantHostSign()==1){
                    Plan planHost = planService.selectById(plan.getHostPlanId());
                    planHost.setStatus2(1);
                    planService.updateById(planHost);
                }

                if (!planService.updateById(plan)) {
                    throw new CoolException("审核失败，请联系管理员");
                }
@@ -717,6 +749,9 @@
        }
        // 查找规划组长
        PlanType planType = planTypeService.selectById(plan.getPlanType());
        if (plan.getAssistantHostSign()==1){
            planType.setType(1);
        }
        User planLeader = planTypeService.findPlanLeader(planType);
        if (Cools.isEmpty(planLeader)) {
            throw new CoolException("未查找到规划组长，请联系管理员");
@@ -783,6 +818,7 @@
        EntityWrapper<Plan> wrapper = new EntityWrapper<>();
        wrapper.like("name", condition);
        wrapper.eq("status",1);
        wrapper.eq("assistant_host_sign",0);

        List<ProcessPermissions> processPermissionsList = processPermissionsService.selectList(new EntityWrapper<ProcessPermissions>().eq("process_memo", 4).or().eq("process_memo", 5));//2：核价流程
        int type =0;
@@ -817,6 +853,20 @@
            map.put("value", plan.getName());
            result.add(map);
        }
        if (type==1){
            EntityWrapper<Plan> wrapper2 = new EntityWrapper<>();
            wrapper2.like("name", condition);
            wrapper2.eq("status",1);
            wrapper2.eq("assistant_host_sign",1);
            List<Plan> plan2s = planService.selectList(wrapper2);
            for (Plan plan : plan2s){
                Map<String, Object> map = new HashMap<>();
                map.put("id", plan.getId());
//            map.put("value", plan.getName()+"---"+plan.getId());
                map.put("value", plan.getName());
                result.add(map);
            }
        }
        return R.ok(result);
    }