#登陆界面去掉左边界面两个logo

LSH

2023-10-05 94defeef43a6eb0187f1df071c669e75ddcbd144

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

@@ -19,13 +19,8 @@
import com.zy.crm.common.utils.SetOfUtils;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.controller.result.FollowerTableVo;
import com.zy.crm.manager.entity.Order;
import com.zy.crm.manager.entity.Plan;
import com.zy.crm.manager.entity.PlanFoll;
import com.zy.crm.manager.entity.PlanType;
import com.zy.crm.manager.service.PlanFollService;
import com.zy.crm.manager.service.PlanService;
import com.zy.crm.manager.service.PlanTypeService;
import com.zy.crm.manager.entity.*;
import com.zy.crm.manager.service.*;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.DeptService;
import com.zy.crm.system.service.UserService;
@@ -64,6 +59,8 @@
    private DeptService deptService;
    @Autowired
    private OssService ossService;
    @Autowired
    private PriOnline2Service priOnline2Service;

    @GetMapping(value = "/plan/{id}/auth")
    @ManagerAuth
@@ -81,7 +78,7 @@
        }
        resultObj.put("formHtml", planType.getHtml());
        // 步骤条相关
        resultObj.put("step", plan.getSettle() == 5 ? 0 : plan.getSettle() + 1);
        resultObj.put("step", plan.getSettle() == 4 ? 0 : plan.getSettle() + 1);

        return R.ok().add(resultObj);
    }
@@ -127,21 +124,25 @@
        if (planService.selectByUuid(hostId, plan.getUuid()) != null) {
            throw new CoolException("规划单已存在");
        }
        Date now = new Date();
        plan.setHostId(hostId);
        plan.setUuid(planService.getUuid(hostId));  // 规划单代号
        plan.setDeptId(getDeptId());               // 所属部门
        plan.setUserId(getUserId());               // 所属人员

        plan.setAppleTime(now);
        plan.setCreateBy(getUserId());
        plan.setCreateTime(new Date());
        plan.setCreateTime(now);
        plan.setUpdateBy(getUserId());
        plan.setUpdateTime(new Date());
        plan.setUpdateTime(now);
        plan.setStatus(1);

        plan.setForm(JSON.toJSONString(param));     // 自定义表单内容
        plan.setSettle(1);  // 1.开始
        User manager = userService.getDeptManager(hostId, getUser().getDeptId());        // 获取部门领导
        plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager)));
        PlanType planType = planTypeService.selectById(plan.getPlanType());
        User planLeader = planTypeService.findPlanLeader(planType);
        plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager, planLeader)));

        if (!planService.insert(plan)) {
            throw new CoolException("保持失败，请重试");
@@ -150,7 +151,7 @@
        // 自动添加跟进人
        PlanFoll planFoll = new PlanFoll();
        planFoll.setPlanId(plan.getId());
        planFoll.setUserId(manager.getId());
        planFoll.setUserId(planLeader.getId());
        if (!planFollService.insert(planFoll)) {
            throw new CoolException("保持失败，请重试");
        }
@@ -215,7 +216,11 @@
    @ManagerAuth(memo = "删除规划申请单")
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
            planService.deleteById(id);
             int priOnline2 = priOnline2Service.selectCount(new EntityWrapper<PriOnline2>().eq("item_id", id));
             if (priOnline2!=0){
                 return R.error("存在关联的核价单，禁止删除！！！");
             }
             planService.deleteById(id);
        }
        return R.ok();
    }
@@ -326,63 +331,63 @@
        assert plan != null;

        switch (plan.getSettle()) {
//            case 1:
//                // 本组组长审核
//                User user = userService.selectById(plan.getUserId());
//                User manager = userService.getDeptManager(getHostId(), user.getDeptId());
//                if (manager.getId().equals(getUserId())) {
//
//                    // 查找规划组长
//                    PlanType planType = planTypeService.selectById(plan.getPlanType());
//                    User planLeader = planTypeService.findPlanLeader(planType);
//                    if (Cools.isEmpty(planLeader)) {
//                        throw new CoolException("未查找到规划组长，请联系管理员");
//                    }
//
//                    // 修改 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);  // 规划组长待审
//                    plan.setUpdateBy(getUserId());
//                    plan.setUpdateTime(new Date());
//
//                    if (!planService.updateById(plan)) {
//                        throw new CoolException("审核失败，请联系管理员");
//                    }
//
//                    // 添加规划组长跟进人
//                    PlanFoll planFoll = new PlanFoll();
//                    planFoll.setPlanId(plan.getId());
//                    planFoll.setUserId(planLeader.getId());
//                    if (!planFollService.insert(planFoll)) {
//                        throw new CoolException("审核失败，请联系管理员");
//                    }
//
//                } else {
//                    return R.error("抱歉，您没有审核的权限");
//                }
//                break;
            case 1:
                // 本组组长审核
                User user = userService.selectById(plan.getUserId());
                User manager = userService.getDeptManager(getHostId(), user.getDeptId());
                if (manager.getId().equals(getUserId())) {

                    // 查找规划组长
                    PlanType planType = planTypeService.selectById(plan.getPlanType());
                    User planLeader = planTypeService.findPlanLeader(planType);
                    if (Cools.isEmpty(planLeader)) {
                        throw new CoolException("未查找到规划组长，请联系管理员");
                    }

                    // 修改 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);  // 规划组长待审
                    plan.setUpdateBy(getUserId());
                    plan.setUpdateTime(new Date());

                    if (!planService.updateById(plan)) {
                        throw new CoolException("审核失败，请联系管理员");
                    }

                    // 添加规划组长跟进人
                    PlanFoll planFoll = new PlanFoll();
                    planFoll.setPlanId(plan.getId());
                    planFoll.setUserId(planLeader.getId());
                    if (!planFollService.insert(planFoll)) {
                        throw new CoolException("审核失败，请联系管理员");
                    }

                } else {
                    return R.error("抱歉，您没有审核的权限");
                }
                break;
            case 2:
                // 查找规划组长
                PlanType planType = planTypeService.selectById(plan.getPlanType());
                User planLeader = planTypeService.findPlanLeader(planType);
@@ -403,15 +408,15 @@
                List<SettleDto> list = JSON.parseArray(plan.getSettleMsg(), SettleDto.class);
                for (SettleDto dto : list) {
                    switch (dto.getStep()) {
                        case 2:
                        case 1:
                            dto.setCurr(Boolean.FALSE);
                            break;
                        case 3:
                        case 2:
                            dto.setCurr(Boolean.TRUE);
                            dto.setMsg("售前组长" + planLeader.getNickname() + "审批通过");
                            dto.setTime(DateUtils.convert(new Date()));
                            break;
                        case 4:
                        case 3:
                            dto.setUserId(planner.getId());
                            dto.setUsername(planner.getNickname());
                            break;
@@ -421,7 +426,7 @@
                }
                plan.setSettleMsg(JSON.toJSONString(list));
                // 修改规划单状态
                plan.setSettle(3);  // 规划员待审
                plan.setSettle(2);  // 规划员待审
                plan.setPlanner(planner.getId());
                plan.setUpdateBy(getUserId());
                plan.setUpdateTime(new Date());
@@ -438,7 +443,7 @@
                    throw new CoolException("审核失败，请联系管理员");
                }
                break;
            case 3:
            case 2:
                User plannerUser = userService.selectById(plan.getPlanner());
                if (Cools.isEmpty(plannerUser)) {
                    return R.error("未找到规划员");
@@ -452,15 +457,15 @@
                List<SettleDto> list0 = JSON.parseArray(plan.getSettleMsg(), SettleDto.class);
                for (SettleDto dto : list0) {
                    switch (dto.getStep()) {
                        case 3:
                        case 2:
                            dto.setCurr(Boolean.FALSE);
                            break;
                        case 4:
                        case 3:
                            dto.setCurr(Boolean.TRUE);
                            dto.setMsg("规划员" + plannerUser.getNickname() + "审批通过");
                            dto.setTime(DateUtils.convert(new Date()));
                            break;
                        case 5:
                        case 4:
                            dto.setUserId(salesman.getId());
                            dto.setUsername(salesman.getNickname());
                            break;
@@ -470,7 +475,7 @@
                }
                plan.setSettleMsg(JSON.toJSONString(list0));
                // 修改规划单状态
                plan.setSettle(4);  // 审批通过
                plan.setSettle(3);  // 审批通过
                plan.setUpdateBy(getUserId());
                plan.setUpdateTime(new Date());

@@ -478,7 +483,7 @@
                    throw new CoolException("审核失败，请联系管理员");
                }
                break;
            case 4:
            case 3:
                // 业务员
                User salesman0 = userService.selectById(plan.getUserId());
                if (!getUserId().equals(salesman0.getId())) {
@@ -488,10 +493,10 @@
                List<SettleDto> list1 = JSON.parseArray(plan.getSettleMsg(), SettleDto.class);
                for (SettleDto dto : list1) {
                    switch (dto.getStep()) {
                        case 4:
                        case 3:
                            dto.setCurr(Boolean.TRUE);
                            break;
                        case 5:
                        case 4:
                            dto.setCurr(Boolean.TRUE);
                            dto.setMsg("业务员" + salesman0.getNickname() + "审批通过");
                            dto.setTime(DateUtils.convert(new Date()));
@@ -502,7 +507,7 @@
                }
                plan.setSettleMsg(JSON.toJSONString(list1));
                // 修改规划单状态
                plan.setSettle(5);  // 审批通过
                plan.setSettle(4);  // 审批通过
                plan.setUpdateBy(getUserId());
                plan.setUpdateTime(new Date());

@@ -522,7 +527,7 @@
        Plan plan = planService.selectById(planId);
        assert plan != null;

        if (plan.getSettle() != 2) {
        if (plan.getSettle() != 1) {
            return R.error();
        }
        // 查找规划组长