计划排期——新增或修改的设备改成多个设备

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/controller/ItdmJCXMSHJHController.java

@@ -111,31 +111,6 @@ public class ItdmJCXMSHJHController {
     @GetMapping(value = "/JHYList")
     public Result<List<ItdmJHYQueryListVO>> JHYList3(@RequestParam(required = false,name = "weituoNo") String weituoNo) {
         List<ItdmJHYQueryListVO> list = iItdmJCXMSHJHService.getAll3(weituoNo);
-//        List<ItdmJHYQueryListVO> totalList = new ArrayList<>();
-//        int i =1;
-//        for (ItdmJHYQueryListVO vo: list){
-//            vo.setIzShiji("计划"); //非实绩
-//            totalList.add(vo);
-//
-//            Date shijiStartDate = vo.getShijiStartDate();
-//            Date shijiEndDate = vo.getShijiEndDate();
-//
-//            int lasTime = -1;
-//            if(shijiStartDate!=null && shijiEndDate!=null){
-//                int days = (int) ((shijiEndDate.getTime() - shijiStartDate.getTime()) / (1000*3600*24));
-//                lasTime = days+1;
-//            }else if(shijiStartDate!=null && shijiEndDate==null) {
-//                //如果有开始时间,没有结束时间，不必修改持续时间（为-1即可）
-//            }else if(shijiStartDate==null){
-//                //如果没有开始时间和结束时间，初始化开始时间为今天，不必修改持续时间（为-1即可）
-//                shijiStartDate = new Date();
-//            }
-//
-//            String izShiji ="实绩";  //实绩
-//            ItdmJHYQueryListVO shijiVO = ItdmJHYQueryConvert.INSTANCE.convert(vo,shijiStartDate,shijiEndDate,i++,izShiji);
-//            shijiVO.setLastTime(lasTime);
-//            totalList.add(shijiVO);
-//        }
         return Result.OK(list);
     }
 
@@ -149,23 +124,4 @@ public class ItdmJCXMSHJHController {
         return Result.OK(iItdmJCXMSHJHService.JHYAddAndUpdate(dto));
     }
 
-//    public Result<String> JHYaddAndUpdate(@RequestBody List<ItdmJHYAddOrUpdateDTO> list) {
-//        List<ItdmJHYAddOrUpdateDTO> list1 = new ArrayList<>();
-//        for(ItdmJHYAddOrUpdateDTO dto: list){
-//            if(dto.getIzShiji().equals("计划")) list1.add(dto);
-//        }
-//        return Result.OK(iItdmJCXMSHJHService.JHYAddAndUpdate(list1));
-//    }
-
-//    /**
-//     * 测试
-//     * */
-//    @ApiOperation(value="测试查出后再往vo里组", notes="测试")
-//    @GetMapping(value = "/cs")
-//    public Result<List<ItdmJHYQueryListVO>> JHYList2(@RequestParam("weituoNo") String weituoNo) {
-//        List<ItdmJHYQueryListVO> list = iItdmJCXMSHJHService.getAll(weituoNo);
-//        return Result.OK(list);
-//    }
-
-
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/dto/ItdmJHYAddOrUpdateDTO.java

@@ -41,6 +41,10 @@ public class ItdmJHYAddOrUpdateDTO {
     @Excel(name = "设备id", width = 15)
     @ApiModelProperty(value = "设备id")
     private java.lang.String shebeiId;
+    /**设备id数组*/
+    @Excel(name = "设备id数组", width = 15)
+    @ApiModelProperty(value = "设备id数组")
+    private java.lang.String[] shebeiIdArray;
     /**项目经理*/
     @Excel(name = "项目经理", width = 15)
     @ApiModelProperty(value = "项目经理")
@@ -127,7 +131,6 @@ public class ItdmJHYAddOrUpdateDTO {
         itdmTestPlan.setWeituoId(vo.getWeituoId());
         itdmTestPlan.setTestItemsId(vo.getTestItemsId());
         itdmTestPlan.setWeituoYangpinId(vo.getYangpinId());
-        itdmTestPlan.setShebeiId(vo.getShebeiId());
         itdmTestPlan.setPm(vo.getPm());
         itdmTestPlan.setReportNo(vo.getReportNo());
 
@@ -146,6 +149,16 @@ public class ItdmJHYAddOrUpdateDTO {
             itdmTestPlan.setChuanganqi(chuanganqi);
         }
 
+        if(vo.getShebeiIdArray()!=null){
+            String[] arr = vo.getShebeiIdArray();
+            String shebeiId = "";
+            for (int i = 0; i < arr.length; i++) {
+                if(i==0) shebeiId = arr[i];
+                else shebeiId = shebeiId + ","+ arr[i];
+            }
+            itdmTestPlan.setShebeiId(shebeiId);
+        }
+
         return  itdmTestPlan;
     }
 
@@ -155,7 +168,6 @@ public class ItdmJHYAddOrUpdateDTO {
         m.setJihuaShiyanId(vo.getTestPlanId());
         m.setTestItemsId(vo.getTestItemsId());
         m.setWeituoYangpinId(vo.getYangpinId());
-        m.setShebeiId(vo.getShebeiId());
 
         m.setStartDate(vo.getJihuaStartDate());
         int lastTime = vo.getLastTime();//通过持续时间计算结束时间，注意开始时间2023-5-21,持续时间1，则结束时间为2023-5-21
@@ -172,6 +184,11 @@ public class ItdmJHYAddOrUpdateDTO {
             m.setChuanganqi(chuanganqi);
         }
 
+        if(vo.getShebeiIdArray() != null){
+            String[] arr = vo.getShebeiIdArray();
+            m.setShebeiId(arr[0]);
+        }
+
         return m;
     }
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/service/IItdmJCXMSHJHService.java

@@ -47,17 +47,10 @@ public interface IItdmJCXMSHJHService {
     /**
      * 计划员新增或修改试验计划
      */
-    public String JHYAddAndUpdate(@RequestBody List<ItdmJHYAddOrUpdateDTO> list);
-
     public String JHYAddAndUpdate(@RequestBody ItdmJHYAddOrUpdateDTO dto);
     /**
      * 计划员查询列表
      */
     public List<ItdmJHYQueryListVO> getAll3(@Param("weituoNo") String weituoId);
 
-//    /**
-//     * 计划员查询列表(测试)
-//     */
-//    public List<ItdmJHYQueryListVO> getAll(@Param("weituoNo") String weituoId);
-
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/service/impl/ItdmJCXMSHJHServiceImpl.java

@@ -244,141 +244,8 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
     }
 
     /**
-     * 计划员新增或修改试验计划
-     * 231130——改设备为多选
+     * 计划员新增或修改试验计划——231130——改设备为多选
      */
-    public String JHYAddAndUpdate(@RequestBody List<ItdmJHYAddOrUpdateDTO> list){
-        String msg = "提交成功！";
-        for(ItdmJHYAddOrUpdateDTO vo:list){
-            ItdmTestPlan itdmTestPlan = ItdmJHYAddOrUpdateDTO.toItdmTestPlan(vo);
-            if(vo.getTestPlanId()==null){ //新增试验计划
-                itdmTestPlan.setStatus(0);//试验计划初始状态为未确认0
-                itdmTestPlanMapper.insert(itdmTestPlan);
-                vo.setTestPlanId(itdmTestPlan.getId());
-                //同时新增一条一样的工单master
-                ItdmGongdanMaster master = ItdmJHYAddOrUpdateDTO.toItdmGongdanMaster(vo);
-                itdmGongdanMasterMapper.insert(master);
-                System.out.println("======================================计划员新增试验计划新增master" + master.getId());
-                //再拆成工单detail，再插入新的工单detail
-                Date startDate = vo.getJihuaStartDate();
-                int lastDay = vo.getLastTime();
-                for (int i=1;i<=lastDay;i++){
-                    Date workDate = new Date(startDate.getTime() + (i-1)*1000*3600*24);
-                    ItdmGongdanDetail detail = new ItdmGongdanDetail();
-                    detail.setWoId(master.getId());
-                    detail.setWorkDate(workDate);
-                    detail.setStartTime("00:00");
-                    detail.setEndTime("23:59");
-                    detail.setChuanganqi(vo.getChuanganqi());
-                    detail.setJihuaDeviceId(master.getShebeiId());
-                    itdmGongdanDetailMapper.insert(detail);
-                }
-                //新增该pm的项目经理拆解工单的task
-                ItdmTask itdmTask = new ItdmTask();
-                itdmTask.setTaskRole("项目经理");
-                itdmTask.setTaskUser(vo.getPm());
-                itdmTask.setWeituoId(vo.getWeituoId());
-                itdmTask.setTaskContent("拆解工单");
-                itdmTask.setTaskStatus(0);//待办
-                taskService.insertTaskAfterJudge(itdmTask);
-
-                //修改计划员计划排期task状态为1进行中
-                Map<String, Object> columnMap = new HashMap<>();
-                columnMap.put("task_role","计划员");
-                columnMap.put("weituo_id",vo.getWeituoId());
-                List<ItdmTask> taskList = taskMapper.selectByMap(columnMap);
-                if(!taskList.isEmpty()) {
-                    ItdmTask itdmTask1 = taskList.get(0);
-                    itdmTask1.setTaskStatus(1);
-                    taskMapper.updateById(itdmTask1);
-                }
-            }else if(vo.getStatus() == 0){//状态为“未确定”，可以修改试验计划
-
-                QueryWrapper<ItdmTestPlan> planWrapper = new QueryWrapper<>();
-                planWrapper.eq("id",vo.getTestPlanId());
-                ItdmTestPlan plan = itdmTestPlanMapper.selectOne(planWrapper);//原计划试验对象
-
-                itdmTestPlan.setId(vo.getTestPlanId());
-                itdmTestPlanMapper.updateById(itdmTestPlan);//修改试验计划
-
-                //先判断有没有改项目经理
-                String pmplan = plan.getPm(); //原来的
-                String pmVO = vo.getPm(); // 此次的
-                if(pmplan==null){ //原来的为空，此次不为空
-                    //查原来该委托id，项目经理，新pm的task
-                    ItdmTask nItdmTask = new ItdmTask();
-                    nItdmTask.setTaskUser(pmVO);
-                    nItdmTask.setWeituoId(vo.getWeituoId());
-                    nItdmTask.setTaskRole("项目经理");
-                    nItdmTask.setTaskContent("拆解工单");
-                    nItdmTask.setTaskStatus(0);
-                    taskService.insertTaskAfterJudge(nItdmTask);
-                }else if(pmplan!=null && !pmplan.equals(pmVO)){  //改了：
-                    QueryWrapper<ItdmTestPlan> planWrapper1 = new QueryWrapper<>();
-                    planWrapper1.eq("weituo_id",vo.getWeituoId());
-                    planWrapper1.eq("pm",pmplan); //原来的
-                    List<ItdmTestPlan> testPlanList = itdmTestPlanMapper.selectList(planWrapper1);
-                    if(testPlanList.isEmpty()){
-                        //该委托id、原pm对应试验计划列表若为空删除原pm、项目经理、委托id对应的task
-                        QueryWrapper<ItdmTask> taskWrapper = new QueryWrapper<>();
-                        taskWrapper.eq("weituo_id",vo.getWeituoId());
-                        taskWrapper.eq("task_role","项目经理");
-                        taskWrapper.eq("task_user",plan.getPm());
-                        taskMapper.delete(taskWrapper);
-                    }
-
-                    //查原来该委托id，项目经理，新pm的task
-                    ItdmTask nItdmTask = new ItdmTask();
-                    nItdmTask.setTaskUser(vo.getPm());
-                    nItdmTask.setWeituoId(vo.getWeituoId());
-                    nItdmTask.setTaskRole("项目经理");
-                    nItdmTask.setTaskContent("拆解工单");
-                    nItdmTask.setTaskStatus(0);
-                    taskService.insertTaskAfterJudge(nItdmTask);
-                }
-
-                //查原来的工单master
-                Map<String, Object> masterMap = new HashMap<>();
-                masterMap.put("jihua_shiyan_id",itdmTestPlan.getId());
-                List<ItdmGongdanMaster> masterList = itdmGongdanMasterMapper.selectByMap(masterMap);
-                //删原来的工单master
-                itdmGongdanMasterMapper.deleteByMap(masterMap);
-                //删掉原来的工单detail
-                if(masterList != null && !masterList.isEmpty() && masterList.get(0)!=null){
-                    for (ItdmGongdanMaster m: masterList){
-                        Map<String, Object> detailMap = new HashMap<>();
-                        detailMap.put("wo_id",m.getId());
-                        itdmGongdanDetailMapper.deleteByMap(detailMap);
-                    }
-                }
-
-                //新增一条一样的工单master
-                ItdmGongdanMaster master = ItdmJHYAddOrUpdateDTO.toItdmGongdanMaster(vo);
-                itdmGongdanMasterMapper.insert(master);
-                System.out.println("======================================计划员修改试验计划新增master" + master.getId());
-                //再拆成工单detail，再插入新的工单detail
-                Date startDate = vo.getJihuaStartDate();
-                int lastDay = vo.getLastTime();
-                for (int i=1;i<=lastDay;i++){
-                    Date workDate = new Date(startDate.getTime() + (i-1)*1000*3600*24);
-                    ItdmGongdanDetail detail = new ItdmGongdanDetail();
-                    detail.setWoId(master.getId());
-                    detail.setWorkDate(workDate);
-                    detail.setStartTime("00:00");
-                    detail.setEndTime("23:59");
-                    detail.setChuanganqi(vo.getChuanganqi());
-                    detail.setJihuaDeviceId(master.getShebeiId());
-                    itdmGongdanDetailMapper.insert(detail);
-                }
-            }else if(vo.getStatus() != 0){
-                if(msg.equals("提交成功！")) msg="检测项目"+ vo.getTestItems();
-                else msg=msg+ "和"+ vo.getTestItems();
-            }
-        }
-        if(msg.equals("提交成功！")) return msg;
-        else return msg+"状态已确定或完成，无法修改！";
-    }
-
     public String JHYAddAndUpdate(@RequestBody ItdmJHYAddOrUpdateDTO dto){
         String msg = "提交成功！";
         ItdmTestPlan itdmTestPlan = ItdmJHYAddOrUpdateDTO.toItdmTestPlan(dto);
@@ -535,20 +402,6 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
 
     }
 
-//    /**
-//     * 计划员查询列表(测试)
-//     */
-//    public List<ItdmJHYQueryListVO> getAll(String weituoNo){
-//        String weituoId = itdmWeituoInfoMapper.selectByWeituoNo(weituoNo);
-//        List<ItdmJCXMAndSYJHVO> list = itdmJCXMSHJHMapper.getAll(weituoId);
-//        List<ItdmJHYQueryListVO> list1 = list.stream().map(i->
-//                ItdmJHYQueryListVO.toItdmJHYQueryListVO(i,itdmWeituoInfoMapper.selectById(i.getWeituoId()).getWeituoNo(),
-//                        itdmWeituoYangpinMapper.selectById(i.getYangpinId()).getSampleName(),
-//                        itdmDeviceMapper.selectById(i.getShebeiId()).getDeviceName())
-//        ).collect(Collectors.toList());
-//        return list1;
-//    }
-
     /**
      * 项目经理查询列表——一级列表——通过登录用户查询
      */