#优化

LSH

2023-09-09 f0f4e40cf00414116a9af269f4f5ca88f142ecb4

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

@@ -47,6 +47,9 @@
    private PriQuoteBudgetService priQuoteBudgetService;

    @Autowired
    private ProcessPermissionsService processPermissionsService;

    @Autowired
    private PlanTypeService planTypeService;

    @RequestMapping(value = "/priQuote/{id}/auth")
@@ -76,7 +79,7 @@
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<PriQuote> wrapper = new EntityWrapper<>();
        wrapper.setSqlSelect("id,title,create_time as createTime,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,user_id as userId,update_user_id as updateUserId,update_time as updateTime,in_order_num as inOrderNum,member_id as memberId");
        wrapper.setSqlSelect("id,title,create_time as createTime,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,sheet_data as sheetData,user_id as userId,dept_id as deptId,settle,settle_msg as settleMsg,form,update_user_id as updateUserId,update_time as updateTime,in_order_num as inOrderNum,member_id as memberId,template");
        wrapper.in("member_id", getUserRoleBelongsToUserId());
        excludeTrash(param);
        convert(param, wrapper);
@@ -117,7 +120,7 @@
    }

    @RequestMapping(value = "/priQuote/add/auth")
    @ManagerAuth
    @ManagerAuth(memo = "添加报价单")
    public R add(@RequestBody Map<String,Object> map) {
        PriQuoteBudget priQuoteBudget = priQuoteBudgetService.selectById(Long.parseLong(map.get("priQuoteBudgetId").toString()));

@@ -135,8 +138,12 @@
        priQuote.setUserId(getUserId());
        //更新人员
        priQuote.setUpdateUserId(getUserId());
        //所属部门
        priQuote.setDeptId(getDeptId());
        //更新时间
        priQuote.setUpdateTime(new Date());
        //模板
        priQuote.setTemplate(map.get("template").toString());

        //业务员
        Plan plan = planService.selectById(priQuote.getItemId());
@@ -148,7 +155,9 @@
        priQuote.setForm(JSON.toJSONString(map));     // 自定义表单内容
        priQuote.setSettle(1);  // 1.开始
        User manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 获取部门领导
        priQuote.setSettleMsg(JSON.toJSONString(SettleDto.initPriQuote(plan, manager)));
        ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", "3-1"));//2：报价流程
        User president = userService.selectById(processPermissions.getUserId());       // 获取报价流程节点3-1确认人
        priQuote.setSettleMsg(JSON.toJSONString(SettleDto.initPriQuote(plan, manager,president,getUser())));

        planService.updateById(plan);

@@ -157,7 +166,7 @@
    }

    @RequestMapping(value = "/priQuote/addOther/auth")
    @ManagerAuth
    @ManagerAuth(memo = "另存报价单")
    public R addOther(@RequestBody Map<String,Object> map) {
        PriQuote quote = priQuoteService.selectById(Long.parseLong(map.get("id").toString()));

@@ -188,7 +197,7 @@
    }

    @RequestMapping(value = "/priQuote/update/auth")
    @ManagerAuth
    @ManagerAuth(memo = "更新报价单")
    public R update(@RequestBody Map<String,Object> map){
        PriQuote priQuote = priQuoteService.selectById(Long.parseLong(map.get("id").toString()));
        priQuote.setTitle(map.get("title").toString());
@@ -202,7 +211,7 @@
    }

    @RequestMapping(value = "/priQuote/updateForm/auth")
    @ManagerAuth
    @ManagerAuth(memo = "更新报价单")
    public R updateForm(Long id,String templateName,String title){
        PriQuote priQuote = priQuoteService.selectById(id);
        priQuote.setTemplateName(templateName);
@@ -216,7 +225,7 @@
    }

    @RequestMapping(value = "/priQuote/delete/auth")
    @ManagerAuth
    @ManagerAuth(memo = "删除报价单")
    public R delete(Long[] ids){
        if (Cools.isEmpty(ids)){
            return R.error();
@@ -279,7 +288,7 @@
        String path =  ClassUtils.getDefaultClassLoader().getResource("excel").getPath();
        String filename = format.format(new Date()) + ".xlsx";
        String filepath = path + "/" + filename;
        exportLuckySheetXlsx(path,"/" + filename,map.get("exceldata").toString());
        exportLuckySheetXlsx(path, "/" + filename, map.get("exceldata").toString(), map.get("template").toString());

        return R.ok("/priQuote/excel/" + filename);
    }
@@ -311,14 +320,14 @@
        }
    }

    public void exportLuckySheetXlsx(String newFileDir,String newFileName, String excelData) {
    public void exportLuckySheetXlsx(String newFileDir, String newFileName, String excelData, String template) {
        //解析对象，可以参照官方文档:https://mengshukeji.github.io/LuckysheetDocs/zh/guide/#%E6%95%B4%E4%BD%93%E7%BB%93%E6%9E%84
        JSONArray jsonArray = (JSONArray) JSONObject.parse(excelData);
        //如果只有一个sheet那就是get(0),有多个那就对应取下标
        JSONObject jsonObject = (JSONObject) jsonArray.get(0);
        JSONArray jsonObjectList = jsonObject.getJSONArray("celldata");
        //excel模板路径
        String filePath =  ClassUtils.getDefaultClassLoader().getResource("excel").getPath() + "/priQuoteTemplate.xlsx";
        String filePath = ClassUtils.getDefaultClassLoader().getResource("excel").getPath() + "/priQuoteTemplate/data" + template +".xlsx";
//        String filePath = "/Users/ouyang/Downloads/uploadTestProductFile/生产日报表.xlsx";
        File file = new File(filePath);
        FileInputStream in = null;
@@ -354,7 +363,7 @@
            }

            String value = "";
            if (jsonObjectValue != null && jsonObjectValue.get("v") != null){
            if (jsonObjectValue != null && jsonObjectValue.get("v") != null) {
                //获取单元格值
                value = jsonObjectValue.get("v").toString();
            }
@@ -362,11 +371,11 @@
            if (Integer.parseInt(object.get("r").toString()) >= 4 && Integer.parseInt(object.get("r").toString()) <= 9) {
                if (Integer.parseInt(object.get("c").toString()) == 2 || Integer.parseInt(object.get("c").toString()) == 6) {
                    //填充第二列数据
                    if (sheet.getRow((int) object.get("r")) !=null && sheet.getRow((int) object.get("r")).getCell((int) object.get("c")) != null){
                    if (sheet.getRow((int) object.get("r")) != null && sheet.getRow((int) object.get("r")).getCell((int) object.get("c")) != null) {
                        if (!value.equals("")) {
                            sheet.getRow((int) object.get("r")).getCell((int) object.get("c")).setCellValue(value);
                        }
                    }else{
                    } else {
                        System.out.println("错误的=" + index + ">>>" + str_);
                    }
                }
@@ -386,11 +395,11 @@
                    case 3:
                    case 4:
                    case 5:
                        if (sheet.getRow((int) object.get("r")) !=null && sheet.getRow((int) object.get("r")).getCell((int) object.get("c")) != null){
                        if (sheet.getRow((int) object.get("r")) != null && sheet.getRow((int) object.get("r")).getCell((int) object.get("c")) != null) {
                            if (!value.equals("")) {
                                sheet.getRow((int) object.get("r")).getCell((int) object.get("c")).setCellValue(value);
                            }
                        }else{
                        } else {
                            System.out.println("错误的=" + index + ">>>" + str_);
                        }
                        break;
@@ -420,7 +429,126 @@
    @PostMapping(value = "/priQuote/approval/auth")
    @ManagerAuth
    public R approvalPriQuote(@RequestParam Long planId,
                      @RequestParam(required = false) Long plannerId){return null;}
                      @RequestParam(required = false) Long plannerId){
        PriQuote priQuote = priQuoteService.selectById(planId);
        assert priQuote != null;

        switch (priQuote.getSettle()) {
            case 1:
                // 本部门经理审核
                User user = userService.selectById(priQuote.getUserId());
                User manager = userService.getDeptManager(getHostId(), user.getDeptId());
                if (manager.getId().equals(getUserId())) {

                    // 修改 settle 步骤数据
                    List<SettleDto> list = JSON.parseArray(priQuote.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;
                            default:
                                break;
                        }
                    }
                    priQuote.setSettleMsg(JSON.toJSONString(list));

                    // 修改规划单状态
                    priQuote.setSettle(2);  // 总裁办待审
                    priQuote.setUpdateUserId(getUserId());
                    priQuote.setUpdateTime(new Date());

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

                } else {
                    return R.error("抱歉，您没有审核的权限");
                }
                break;
            case 2:
                ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", "3-1"));//2：报价流程
                User planLeader = userService.selectById(processPermissions.getUserId());       // 获取报价流程节点3确认人
                if (Cools.isEmpty(planLeader)) {
                    throw new CoolException("未查找到报价流程节点3-1确认人，请联系在审批权限添加确认人！");
                }
                if (!getUserId().equals(planLeader.getId())) {
                    return R.error("抱歉，您没有审核的权限");
                }
                User planner = userService.selectById(plannerId);
                // 修改 settle 步骤数据
                List<SettleDto> list = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
                for (SettleDto dto : list) {
                    switch (dto.getStep()) {
                        case 2:
                            dto.setCurr(Boolean.FALSE);
                            break;
                        case 3:
                            dto.setCurr(Boolean.TRUE);
                            dto.setMsg("总裁办" + planLeader.getNickname() + "审批通过");
                            dto.setTime(DateUtils.convert(new Date()));
                            break;
                        default:
                            break;
                    }
                }
                priQuote.setSettleMsg(JSON.toJSONString(list));
                // 修改规划单状态
                priQuote.setSettle(3);  // 规划员待审
                priQuote.setUpdateUserId(getUserId());
                priQuote.setUpdateTime(new Date());

                if (!priQuoteService.updateById(priQuote)) {
                    throw new CoolException("审核失败，请联系管理员");
                }
                break;
            case 3:
                // 业务员
                User salesman0 = userService.selectById(priQuote.getUserId());
                if (!getUserId().equals(salesman0.getId())) {
                    return R.error("抱歉，您没有审核的权限");
                }
                // 修改 settle 步骤数据
                List<SettleDto> list1 = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
                for (SettleDto dto : list1) {
                    switch (dto.getStep()) {
                        case 3:
                            dto.setCurr(Boolean.TRUE);
                            break;
                        case 4:
                            dto.setCurr(Boolean.TRUE);
                            dto.setMsg("业务员" + salesman0.getNickname() + "审批通过");
                            dto.setTime(DateUtils.convert(new Date()));
                            break;
                        default:
                            break;
                    }
                }
                priQuote.setSettleMsg(JSON.toJSONString(list1));
                // 修改规划单状态
                priQuote.setSettle(4);  // 审批通过
                priQuote.setUpdateUserId(getUserId());
                priQuote.setUpdateTime(new Date());

                if (!priQuoteService.updateById(priQuote)) {
                    throw new CoolException("审核失败，请联系管理员");
                }
                break;
            default:
                return R.error();
        }
        return R.ok("审批成功");
    }

    @PostMapping(value = "/priQuote/refuse/auth")
    @ManagerAuth
    public R refusePriQuote(@RequestParam Long planId,
                              @RequestParam(required = false) Long plannerId){
//        PriQuote priQuote = priQuoteService.selectById(planId);
//        assert priQuote != null;
//
@@ -430,14 +558,6 @@
//                User user = userService.selectById(priQuote.getUserId());
//                User manager = userService.getDeptManager(getHostId(), user.getDeptId());
//                if (manager.getId().equals(getUserId())) {
//
//
//                    // 查找总裁办
//                    PlanType planType = planTypeService.selectById(priQuote.getPlanType());
//                    User planLeader = planTypeService.findPlanLeader(planType);
//                    if (Cools.isEmpty(planLeader)) {
//                        throw new CoolException("未查找到总裁办，请联系管理员");
//                    }
//
//                    // 修改 settle 步骤数据
//                    List<SettleDto> list = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
@@ -451,10 +571,6 @@
//                                dto.setMsg("部门经理" + manager.getNickname() + "审批通过");
//                                dto.setTime(DateUtils.convert(new Date()));
//                                break;
//                            case 3:
//                                dto.setUserId(planLeader.getId());
//                                dto.setUsername(planLeader.getNickname());
//                                break;
//                            default:
//                                break;
//                        }
@@ -462,19 +578,11 @@
//                    priQuote.setSettleMsg(JSON.toJSONString(list));
//
//                    // 修改规划单状态
//                    priQuote.setSettle(2);  // 规划组长待审
//                    priQuote.setSettle(2);  // 总裁办待审
//                    priQuote.setUpdateUserId(getUserId());
//                    priQuote.setUpdateTime(new Date());
//
//                    if (!priQuoteService.updateById(priQuote)) {
//                        throw new CoolException("审核失败，请联系管理员");
//                    }
//
//                    // 添加规划组长跟进人
//                    PlanFoll planFoll = new PlanFoll();
//                    planFoll.setPlanId(priQuote.getId());
//                    planFoll.setUserId(planLeader.getId());
//                    if (!planFollService.insert(planFoll)) {
//                        throw new CoolException("审核失败，请联系管理员");
//                    }
//
@@ -483,20 +591,13 @@
//                }
//                break;
//            case 2:
//                // 查找规划组长
//                PlanType planType = planTypeService.selectById(priQuote.getPlanType());
//                User planLeader = planTypeService.findPlanLeader(planType);
//                ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", "3-1"));//2：报价流程
//                User planLeader = userService.selectById(processPermissions.getUserId());       // 获取报价流程节点3确认人
//                if (Cools.isEmpty(planLeader)) {
//                    throw new CoolException("未查找到规划组长，请联系管理员");
//                }
//                if (Cools.isEmpty(planLeader)) {
//                    throw new CoolException("未查找到规划组长，请联系管理员");
//                    throw new CoolException("未查找到报价流程节点3-1确认人，请联系在审批权限添加确认人！");
//                }
//                if (!getUserId().equals(planLeader.getId())) {
//                    return R.error("抱歉，您没有审核的权限");
//                }
//                if (Cools.isEmpty(plannerId)) {
//                    return R.error("指定规划员不能为空");
//                }
//                User planner = userService.selectById(plannerId);
//                // 修改 settle 步骤数据
@@ -508,12 +609,8 @@
//                            break;
//                        case 3:
//                            dto.setCurr(Boolean.TRUE);
//                            dto.setMsg("售前组长" + planLeader.getNickname() + "审批通过");
//                            dto.setMsg("总裁办" + planLeader.getNickname() + "审批通过");
//                            dto.setTime(DateUtils.convert(new Date()));
//                            break;
//                        case 4:
//                            dto.setUserId(planner.getId());
//                            dto.setUsername(planner.getNickname());
//                            break;
//                        default:
//                            break;
@@ -522,63 +619,14 @@
//                priQuote.setSettleMsg(JSON.toJSONString(list));
//                // 修改规划单状态
//                priQuote.setSettle(3);  // 规划员待审
//                priQuote.setPlanner(planner.getId());
//                priQuote.setUpdateUserId(getUserId());
//                priQuote.setUpdateTime(new Date());
//
//                if (!priQuoteService.updateById(priQuote)) {
//                    throw new CoolException("审核失败，请联系管理员");
//                }
//
//                // 添加规划员跟进人
//                PlanFoll planFoll = new PlanFoll();
//                planFoll.setPlanId(priQuote.getId());
//                planFoll.setUserId(planner.getId());
//                if (!planFollService.insert(planFoll)) {
//                    throw new CoolException("审核失败，请联系管理员");
//                }
//                break;
//            case 3:
//                User plannerUser = userService.selectById(priQuote.getPlanner());
//                if (Cools.isEmpty(plannerUser)) {
//                    return R.error("未找到规划员");
//                }
//                if (!getUserId().equals(plannerUser.getId())) {
//                    return R.error("抱歉，您没有审核的权限");
//                }
//                // 业务员
//                User salesman = userService.selectById(priQuote.getUserId());
//                // 修改 settle 步骤数据
//                List<SettleDto> list0 = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
//                for (SettleDto dto : list0) {
//                    switch (dto.getStep()) {
//                        case 3:
//                            dto.setCurr(Boolean.FALSE);
//                            break;
//                        case 4:
//                            dto.setCurr(Boolean.TRUE);
//                            dto.setMsg("规划员" + plannerUser.getNickname() + "审批通过");
//                            dto.setTime(DateUtils.convert(new Date()));
//                            break;
//                        case 5:
//                            dto.setUserId(salesman.getId());
//                            dto.setUsername(salesman.getNickname());
//                            break;
//                        default:
//                            break;
//                    }
//                }
//                priQuote.setSettleMsg(JSON.toJSONString(list0));
//                // 修改规划单状态
//                priQuote.setSettle(4);  // 审批通过
//                priQuote.setUpdateUserId(getUserId());
//                priQuote.setUpdateTime(new Date());
//
//                if (!planService.updateById(priQuote)) {
//                    throw new CoolException("审核失败，请联系管理员");
//                }
//                break;
//            case 4:
//                // 业务员
//                User salesman0 = userService.selectById(priQuote.getUserId());
//                if (!getUserId().equals(salesman0.getId())) {
@@ -588,10 +636,10 @@
//                List<SettleDto> list1 = JSON.parseArray(priQuote.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()));
@@ -602,18 +650,18 @@
//                }
//                priQuote.setSettleMsg(JSON.toJSONString(list1));
//                // 修改规划单状态
//                priQuote.setSettle(5);  // 审批通过
//                priQuote.setSettle(4);  // 审批通过
//                priQuote.setUpdateUserId(getUserId());
//                priQuote.setUpdateTime(new Date());
//
//                if (!planService.updateById(priQuote)) {
//                if (!priQuoteService.updateById(priQuote)) {
//                    throw new CoolException("审核失败，请联系管理员");
//                }
//                break;
//            default:
//                return R.error();
//        }
//        return R.ok("审批成功");
//    }
        return R.ok("审批成功");
    }

}