#

luxiaotao1123

2022-11-28 e960d0d4ff14486f786e1601296a9be9cb3ce207

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

@@ -8,6 +8,7 @@
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.domain.KeyValueVo;
import com.core.exception.CoolException;
@@ -172,7 +173,8 @@

    @PostMapping(value = "/plan/approval/auth")
    @ManagerAuth
    public R approval(@RequestParam Long planId){
    public R approval(@RequestParam Long planId,
                      @RequestParam(required = false) Long planner){
        Plan plan = planService.selectById(planId);
        assert plan != null;

@@ -190,8 +192,27 @@
                        throw new CoolException("未查找到规划组长，请联系管理员");
                    }

                    // 修改 settle 步骤数据 todo
                    plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager)));
                    // 修改 settle 步骤数据
                    List<SettleDto> list = JSON.parseArray(plan.getSettleMsg(), SettleDto.class);
                    for (SettleDto dto : list) {
                        switch (dto.getStep()) {
                            case 1:
                                dto.setCurr(Boolean.FALSE);
                                break;
                            case 2:
                                dto.setCurr(Boolean.TRUE);
                                dto.setMsg("本组组长" + manager.getNickname() + "审批通过");
                                dto.setTime(DateUtils.convert(new Date()));
                                break;
                            case 3:
                                dto.setUserId(planLeader.getId());
                                dto.setUsername(planLeader.getNickname());
                                break;
                            default:
                                break;
                        }
                    }
                    plan.setSettleMsg(JSON.toJSONString(list));

                    // 修改规划单状态
                    plan.setSettle(2);  // 规划组长待审
@@ -223,11 +244,32 @@
            default:
                return R.error();
        }


        return R.ok();
    }

    @PostMapping(value = "/plan/planner/list/auth")
    @ManagerAuth
    public R plannerList(@RequestParam Long planId){
        Plan plan = planService.selectById(planId);
        assert plan != null;

        if (plan.getSettle() != 2) {
            return R.error();
        }
        // 查找规划组长
        PlanType planType = planTypeService.selectById(plan.getPlanType());
        User planLeader = planTypeService.findPlanLeader(planType);
        if (Cools.isEmpty(planLeader)) {
            throw new CoolException("未查找到规划组长，请联系管理员");
        }
        if (!getUserId().equals(planLeader.getId())) {
            return R.error("抱歉，您没有审核的权限");
        }
        // 获取当期规划组所有成员
        List<User> users = userService.selectList(new EntityWrapper<User>().eq("dept_id", planLeader.getDeptId()));
        return R.ok().add(users);
    }

    @RequestMapping(value = "/planQuery/auth")
    @ManagerAuth
    public R query(String condition) {