#售前规划申请单需求多选完善

LSH

2023-07-28 08c2f587b9c2ec4d1401f8e5e3904851aa380fff

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

@@ -148,44 +148,45 @@

   @RequestMapping(value = "/plan/update/auth")
   @ManagerAuth
    @Transactional
    public R update(@RequestParam Map<String, Object> param){
        String planNeed = null;
        Integer id = null;
        for (Map.Entry<String, Object> entry : param.entrySet()){
            String val = String.valueOf(entry.getValue());
            if (Cools.isEmpty(val)){
                continue;
            }
            if (entry.getKey().equals("planNeed")){
                planNeed = val;
            }
            if (entry.getKey().equals("id")){
                try{
                    id = Integer.parseInt(val);
                }catch (Exception e){
                    return R.error();
                }
            }
        }
//        String planNeed = null;
//        Integer id = null;
//        for (Map.Entry<String, Object> entry : param.entrySet()){
//            String val = String.valueOf(entry.getValue());
//            if (Cools.isEmpty(val)){
//                continue;
//            }
//            if (entry.getKey().equals("planNeed")){
//                planNeed = val;
//            }
//            if (entry.getKey().equals("id")){
//                try{
//                    id = Integer.parseInt(val);
//                }catch (Exception e){
//                    return R.error();
//                }
//            }
//        }
        if (Cools.isEmpty(param) || Cools.isEmpty(param.get("id"))){
            return R.error();
        }
        List<String> planNeedbs = new ArrayList<>(Arrays.asList(planNeed.split("-")));
        if (planNeedbs.get(0).equals("[object Object]")){
            planNeedbs.remove(0);
            Plan plan1 = planService.selectById(id);
            List<String> planNeedas = Arrays.asList(plan1.getPlanNeed().split("-"));
            List<String> routeIntersectionString = SetOfUtils.getRouteIntersectionString(planNeedas, planNeedbs, RouteCollectCountType.DEDUPLICATIONUNION);
            planNeed="";
            for (String planNeedss:routeIntersectionString){
                planNeed=planNeed==""? planNeedss:planNeed + "-" + planNeedss;
            }
        }
//        List<String> planNeedbs = new ArrayList<>(Arrays.asList(planNeed.split("-")));
//        if (planNeedbs.get(0).equals("[object Object]")){
//            planNeedbs.remove(0);
//            Plan plan1 = planService.selectById(id);
//            List<String> planNeedas = Arrays.asList(plan1.getPlanNeed().split("-"));
//            List<String> routeIntersectionString = SetOfUtils.getRouteIntersectionString(planNeedas, planNeedbs, RouteCollectCountType.DEDUPLICATIONUNION);
//            planNeed="";
//            for (String planNeedss:routeIntersectionString){
//                planNeed=planNeed==""? planNeedss:planNeed + "-" + planNeedss;
//            }
//        }


        // pre
        Plan plan = JSON.parseObject(JSON.toJSONString(param), Plan.class);
        plan.setPlanNeed(planNeed);
//        plan.setPlanNeed(planNeed);
        param.entrySet().removeIf(next -> this.fields.contains(next.getKey()));
        plan.setUpdateBy(getUserId());
        plan.setUpdateTime(new Date());