fix

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

@@ -8,6 +8,8 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.itdmGongDan.convert.ItdmJHYQueryConvert;
+import org.jeecg.modules.itdmGongDan.dto.ItdmJHYAddOrUpdateDTO;
+import org.jeecg.modules.itdmGongDan.dto.ItdmXMJLAddOrUpdateDTO;
 import org.jeecg.modules.itdmGongDan.service.IItdmGongdanDetailService;
 import org.jeecg.modules.itdmGongDan.service.IItdmGongdanMasterService;
 import org.jeecg.modules.itdmGongDan.service.IItdmJCXMSHJHService;
@@ -62,14 +64,14 @@ public class ItdmJCXMSHJHController {
     @AutoLog(value = "项目经理新增或修改工单master")
     @ApiOperation(value="项目经理新增或修改工单master", notes="项目经理新增或修改工单master")
     @PostMapping(value = "/XMJLAddOrUpdate")
-    public Result<String> XMJLAddOrUpdate(@RequestBody ItdmXMJLQueryListVO vo) {
+    public Result<String> XMJLAddOrUpdate(@RequestBody ItdmXMJLAddOrUpdateDTO dto) {
         System.out.println("项目经理新增或修改工单master");
 //        System.out.println(JSON.toJSON(vo));
-        return Result.OK(iItdmJCXMSHJHService.XMJLAddOrUpdate(vo));
+        return Result.OK(iItdmJCXMSHJHService.XMJLAddOrUpdate(dto));
     }
 
     /**
-     * 项目经理查询列表——有两级
+     * 项目经理查询列表——有两级（能看到所有人的）
      */
 //    @ApiOperation(value="项目经理查询列表", notes="通过委托id查询，得到委托单的检测项目、试验计划部分信息")
 //    @GetMapping(value = "/XMJLList")
@@ -143,10 +145,10 @@ public class ItdmJCXMSHJHController {
     @AutoLog(value = "计划员新增或修改试验计划")
     @ApiOperation(value="计划员新增或修改试验计划", notes="计划员新增或修改试验计划——直接left join")
     @PostMapping(value = "/JHYAddOrUpdate")
-    public Result<String> JHYaddAndUpdate(@RequestBody List<ItdmJHYQueryListVO> list) {
-        List<ItdmJHYQueryListVO> list1 = new ArrayList<>();
-        for(ItdmJHYQueryListVO vo: list){
-            if(vo.getIzShiji().equals("计划")) list1.add(vo);
+    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));
     }

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

@@ -0,0 +1,178 @@
+package org.jeecg.modules.itdmGongDan.dto;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
+import org.jeecg.modules.itdmGongDan.entity.ItdmTestPlan;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+public class ItdmJHYAddOrUpdateDTO {
+
+    /**委托id*/
+    @Excel(name = "委托id", width = 15)
+    @ApiModelProperty(value = "委托id")
+    private String weituoId;
+    /**样品id*/
+    @Excel(name = "样品id", width = 15)
+    @ApiModelProperty(value = "样品id")
+    private String yangpinId;
+    /**检测项目id*/
+    @Excel(name = "检测项目id", width = 15)
+    @ApiModelProperty(value = "检测项目id")
+    private java.lang.String testItemsId;
+    /**检测项目*/
+    @Excel(name = "检测项目", width = 15)
+    @ApiModelProperty(value = "检测项目")
+    private String testItems;
+    /**试验计划id*/
+    @Excel(name = "试验计划id", width = 15)
+    @ApiModelProperty(value = "试验计划id")
+    private String testPlanId;
+    /**设备id*/
+    @Excel(name = "设备id", width = 15)
+    @ApiModelProperty(value = "设备id")
+    private java.lang.String shebeiId;
+    /**项目经理*/
+    @Excel(name = "项目经理", width = 15)
+    @ApiModelProperty(value = "项目经理")
+    private java.lang.String pm;
+    /**计划开始日期*/
+    @Excel(name = "计划开始日期", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "计划开始日期")
+    private java.util.Date jihuaStartDate;
+    /**计划结束日期*/
+    @Excel(name = "计划结束日期", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "计划结束日期")
+    private java.util.Date jihuaEndDate;
+    /**状态*/
+    @Excel(name = "状态", width = 15, dicCode = "test_plan_status")
+    @Dict(dicCode = "test_plan_status")
+    @ApiModelProperty(value = "状态")
+    private java.lang.Integer status;
+    /**报告编号*/
+    @Excel(name = "报告编号", width = 15)
+    @ApiModelProperty(value = "报告编号")
+    private java.lang.String reportNo;
+    /**传感器id*/
+    @Excel(name = "传感器id", width = 20)
+    @ApiModelProperty(value = "传感器id")
+    private java.lang.String chuanganqi;
+    /**委托编号*/
+    @Excel(name = "委托编号", width = 15)
+    @ApiModelProperty(value = "委托编号")
+    private String weituoNo;
+    /**样品名称*/
+    @Excel(name = "样品名称", width = 15)
+    @ApiModelProperty(value = "样品名称")
+    private java.lang.String sampleName;
+    /**设备名称*/
+    @Excel(name = "设备名称", width = 15)
+    @ApiModelProperty(value = "设备名称")
+    private java.lang.String deviceName;
+    /**父id*/
+    @Excel(name = "父id", width = 20)
+    @ApiModelProperty(value = "父id")
+    private java.lang.String parent;
+    /**持续时间*/
+    @Excel(name = "持续时间", width = 20)
+    @ApiModelProperty(value = "持续时间")
+    private java.lang.Integer lastTime;
+    /**status转化*/
+    @Excel(name = "status转化", width = 15)
+    @ApiModelProperty(value = "status转化")
+    private java.lang.String statusC;
+    /**传感器数组*/
+    @Excel(name = "传感器数组", width = 15)
+    @ApiModelProperty(value = "传感器数组")
+    private java.lang.String[] chuanganqiArray;
+    /**前端用的到，用来放试验计划id*/
+    @Excel(name = "试验计划id", width = 15)
+    @ApiModelProperty(value = "试验计划id")
+    private String id;
+
+    /**实绩开始日期*/
+    @Excel(name = "实绩开始日期", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "实绩开始日期")
+    private java.util.Date shijiStartDate;
+    /**实绩结束日期*/
+    @Excel(name = "实绩结束日期", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "实绩结束日期")
+    private java.util.Date shijiEndDate;
+
+    /**是否为实绩，1为实绩，0非实绩*/
+    @ApiModelProperty(value = "是否为实绩，1为实绩，0非实绩")
+    private java.lang.String izShiji;
+
+
+    /**转化成试验计划对象——计划员新增或修改试验计划*/
+    public static ItdmTestPlan toItdmTestPlan(ItdmJHYAddOrUpdateDTO vo){
+        ItdmTestPlan itdmTestPlan = new ItdmTestPlan();
+        itdmTestPlan.setWeituoId(vo.getWeituoId());
+        itdmTestPlan.setTestItemsId(vo.getTestItemsId());
+        itdmTestPlan.setWeituoYangpinId(vo.getYangpinId());
+        itdmTestPlan.setShebeiId(vo.getShebeiId());
+        itdmTestPlan.setPm(vo.getPm());
+        itdmTestPlan.setReportNo(vo.getReportNo());
+
+        itdmTestPlan.setJihuaStartDate(vo.getJihuaStartDate());
+        int lastTime = vo.getLastTime();//通过持续时间计算结束时间，注意开始时间2023-5-21,持续时间1，则结束时间为2023-5-21
+        Date jihuaEndTime = new Date(vo.getJihuaStartDate().getTime() + (lastTime-1)*1000*3600*24);
+        itdmTestPlan.setJihuaEndDate(jihuaEndTime);
+
+        if(vo.getChuanganqiArray()!=null){
+            String[] arr = vo.getChuanganqiArray();
+            String chuanganqi = "";
+            for (int i = 0; i < arr.length; i++) {
+                if(i==0) chuanganqi = arr[i];
+                else chuanganqi = chuanganqi + ","+ arr[i];
+            }
+            itdmTestPlan.setChuanganqi(chuanganqi);
+        }
+
+        return  itdmTestPlan;
+    }
+
+    /**转化成工单master对象——计划员用于新增工单master*/
+    public static ItdmGongdanMaster toItdmGongdanMaster(ItdmJHYAddOrUpdateDTO vo){
+        ItdmGongdanMaster m = new ItdmGongdanMaster();
+        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
+        Date endDate = new Date(vo.getJihuaStartDate().getTime() + (lastTime-1)*1000*3600*24);
+        m.setEndDate(endDate);
+
+        if(vo.getChuanganqiArray() != null){
+            String[] arr = vo.getChuanganqiArray();
+            String chuanganqi = "";
+            for (int i = 0; i < arr.length; i++) {
+                if(i==0) chuanganqi = arr[i];
+                else chuanganqi = chuanganqi + ","+ arr[i];
+            }
+            m.setChuanganqi(chuanganqi);
+        }
+
+        return m;
+    }
+
+}

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

@@ -1,6 +1,8 @@
 package org.jeecg.modules.itdmGongDan.service;
 
 import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.itdmGongDan.dto.ItdmJHYAddOrUpdateDTO;
+import org.jeecg.modules.itdmGongDan.dto.ItdmXMJLAddOrUpdateDTO;
 import org.jeecg.modules.itdmGongDan.vo.ItdmJHYQueryListVO;
 import org.jeecg.modules.itdmGongDan.vo.ItdmXMJLQueryListVO;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -22,7 +24,7 @@ public interface IItdmJCXMSHJHService {
     /**
      * 项目经理新增或修改试验计划或工单master
      */
-    public String XMJLAddOrUpdate(ItdmXMJLQueryListVO vo);
+    public String XMJLAddOrUpdate(ItdmXMJLAddOrUpdateDTO dto);
 
     /**
      * 项目经理查询列表——一级列表——通过登录用户查询
@@ -45,7 +47,7 @@ public interface IItdmJCXMSHJHService {
     /**
      * 计划员新增或修改试验计划
      */
-    public String JHYAddAndUpdate(@RequestBody List<ItdmJHYQueryListVO> list);
+    public String JHYAddAndUpdate(@RequestBody List<ItdmJHYAddOrUpdateDTO> list);
 
     /**
      * 计划员查询列表

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

@@ -1,13 +1,13 @@
 package org.jeecg.modules.itdmGongDan.service.impl;
 
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.jeecg.modules.itdmDevice.mapper.ItdmDeviceMapper;
-
 import org.jeecg.modules.itdmFirstPage.entity.ItdmTask;
 import org.jeecg.modules.itdmFirstPage.mapper.ItdmTaskMapper;
 import org.jeecg.modules.itdmFirstPage.service.IItdmTaskService;
+import org.jeecg.modules.itdmGongDan.dto.ItdmJHYAddOrUpdateDTO;
+import org.jeecg.modules.itdmGongDan.dto.ItdmXMJLAddOrUpdateDTO;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
 import org.jeecg.modules.itdmGongDan.entity.ItdmTestPlan;
@@ -106,32 +106,32 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
     /**
      * 项目经理新增或修改试工单master
      */
-    public String XMJLAddOrUpdate(ItdmXMJLQueryListVO vo){
+    public String XMJLAddOrUpdate(ItdmXMJLAddOrUpdateDTO dto){
         String msg = "操作成功！";
 
-        String[] arr = vo.getChuanganqiArray();
+        String[] arr = dto.getChuanganqiArray();
         String chuanganqi = "";
         for (int i = 0; i < arr.length; i++) {
             if(i==0) chuanganqi = arr[i];
             else chuanganqi = chuanganqi + ","+ arr[i];
         }
-        vo.setChuanganqi(chuanganqi);
+        dto.setChuanganqi(chuanganqi);
 
-        if(vo.getParent()!=null){ //二级，先根据id查询工单master，判断有无该对象存在，无的话为新增，有的话修改
-            ItdmGongdanMaster gongdanMaster = itdmGongdanMasterMapper.selectById(vo.getId());
+        if(dto.getParent()!=null){ //二级，先根据id查询工单master，判断有无该对象存在，无的话为新增，有的话修改
+            ItdmGongdanMaster gongdanMaster = itdmGongdanMasterMapper.selectById(dto.getId());
 
             if(gongdanMaster==null){//是新增的数据
-                ItdmGongdanMaster itdmGongdanMaster = ItdmXMJLQueryListVO.toItdmGongdanMaster(vo);
+                ItdmGongdanMaster itdmGongdanMaster = ItdmXMJLAddOrUpdateDTO.toItdmGongdanMaster(dto);
                 itdmGongdanMasterMapper.insert(itdmGongdanMaster);//新增一条工单master
                 System.out.println("======================================项目经理新增master" + itdmGongdanMaster.getId());
 
                 //修改工单master对应的试验计划，将状态改为已确认
-                ItdmTestPlan itdmTestPlan = itdmTestPlanMapper.selectById(vo.getParent());
+                ItdmTestPlan itdmTestPlan = itdmTestPlanMapper.selectById(dto.getParent());
                 itdmTestPlan.setStatus(1);
                 itdmTestPlanMapper.updateById(itdmTestPlan);
 
-                Date startDate = vo.getJihuaStartDate();
-                int lastDay = vo.getLastTime();
+                Date startDate = dto.getJihuaStartDate();
+                int lastDay = dto.getLastTime();
                 for (int i=1;i<=lastDay;i++){
                     Date workDate = new Date(startDate.getTime() + (i-1)*1000*3600*24);
                     ItdmGongdanDetail detail = new ItdmGongdanDetail();
@@ -139,36 +139,21 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
                     detail.setWorkDate(workDate);
                     detail.setStartTime("00:00");
                     detail.setEndTime("23:59");
-                    detail.setChuanganqi(vo.getChuanganqi());
+                    detail.setChuanganqi(dto.getChuanganqi());
                     itdmGongdanDetailMapper.insert(detail);//新增对应日期的工单detail
                 }
 
-//                //先判断有无该操作员的试验实施的task
-//                ItdmTask i = new ItdmTask();
-//                i.setTaskRole("试验实施");
-//                i.setTaskUser(vo.getWorker());
-//                QueryWrapper<ItdmTask> queryWrapper = new QueryWrapper<>(i);
-//                List<ItdmTask> tList= taskMapper.selectList(queryWrapper);
-//                if(tList == null || tList.isEmpty() || tList.get(0)==null){ //原来没有,新增一条操作员试验实施的task
-//                    ItdmTask itdmTask = new ItdmTask();
-//                    itdmTask.setTaskRole("操作员");
-//                    itdmTask.setTaskUser(vo.getWorker());//操作员
-//                    itdmTask.setTaskStatus(0);//待办
-//                    itdmTask.setWeituoId(vo.getWeituoId());
-//                    itdmTask.setTaskContent("试验实施");
-//                    taskMapper.insert(itdmTask);
-//                }
                 //修改项目经理拆解工单task状态为1进行中——需要先判断
                 Map<String, Object> testPlanMap = new HashMap<>();
-                testPlanMap.put("weituo_id",vo.getWeituoId());
-                testPlanMap.put("pm",vo.getPm());
+                testPlanMap.put("weituo_id",dto.getWeituoId());
+                testPlanMap.put("pm",dto.getPm());
                 testPlanMap.put("status",0); //未确认
                 List<ItdmTestPlan> testPlanList = itdmTestPlanMapper.selectByMap(testPlanMap);
                 if(testPlanList == null || testPlanList.isEmpty() || testPlanList.get(0)==null){ //都已确认
                     Map<String, Object> columnMap = new HashMap<>();
                     columnMap.put("task_role","项目经理");
-                    columnMap.put("weituo_id",vo.getWeituoId());
-                    columnMap.put("task_user",vo.getPm());
+                    columnMap.put("weituo_id",dto.getWeituoId());
+                    columnMap.put("task_user",dto.getPm());
                     List<ItdmTask> taskList = taskMapper.selectByMap(columnMap);
                     if(taskList != null && !taskList.isEmpty() && taskList.get(0)!=null) {
                         ItdmTask itdmTask1 = taskList.get(0);
@@ -176,97 +161,51 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
                         taskMapper.updateById(itdmTask1);
                     }
                 }
-            }else {//非空，则修改——先判断能否修改
-                if(vo.getShijiStartDate()==null){//此时可以修改
-
-//                    ItdmGongdanMaster master = itdmGongdanMasterMapper.selectById(vo.getId());
-//                    String workerBefore = master.getWorker(); //原来的操作员
-//                    String workerNow = vo.getWorker(); //现在的操作员
+            }else {//非空，是用于修改的数据——先判断能否修改
+                if(dto.getShijiStartDate()==null){//此时可以修改
 
                     //先修改工单master
-                    ItdmGongdanMaster itdmGongdanMaster = ItdmXMJLQueryListVO.toItdmGongdanMaster(vo);
-                    itdmGongdanMaster.setId(vo.getId());
+                    ItdmGongdanMaster itdmGongdanMaster = ItdmXMJLAddOrUpdateDTO.toItdmGongdanMaster(dto);
+                    itdmGongdanMaster.setId(dto.getId());
                     itdmGongdanMasterMapper.updateById(itdmGongdanMaster);
-                    System.out.println("======================================项目经理修改master" + vo.getId());
+                    System.out.println("======================================项目经理修改master" + dto.getId());
 
                     //修改工单master对应的试验计划，将状态改为已确认
-                    ItdmTestPlan itdmTestPlan = itdmTestPlanMapper.selectById(vo.getParent());
+                    ItdmTestPlan itdmTestPlan = itdmTestPlanMapper.selectById(dto.getParent());
                     itdmTestPlan.setStatus(1);
                     itdmTestPlanMapper.updateById(itdmTestPlan);
 
                     //然后删原来的工单detail
                     ItdmGongdanDetail itdmGongdanDetail = new ItdmGongdanDetail();
-                    itdmGongdanDetail.setWoId(vo.getId());
+                    itdmGongdanDetail.setWoId(dto.getId());
                     QueryWrapper<ItdmGongdanDetail> wrapper = new QueryWrapper<>(itdmGongdanDetail);
                     itdmGongdanDetailMapper.delete(wrapper);
 
                     //再拆成工单detail，再插入新的工单detail
-                    Date startDate = vo.getJihuaStartDate();
-                    int lastDay = vo.getLastTime();
+                    Date startDate = dto.getJihuaStartDate();
+                    int lastDay = dto.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(vo.getId());
+                        detail.setWoId(dto.getId());
                         detail.setWorkDate(workDate);
                         detail.setStartTime("00:00");
                         detail.setEndTime("23:59");
-                        detail.setChuanganqi(vo.getChuanganqi());
+                        detail.setChuanganqi(dto.getChuanganqi());
                         itdmGongdanDetailMapper.insert(detail);//新增对应日期的工单detail
                     }
 
-//                    if(!workerBefore.equals(workerNow)){ //操作员改了
-//                        //查该委托单id、原操作员对应的工单master列表，若为空删除委托地、原操作员对应的task
-//                        int m = 0;
-//                        QueryWrapper<ItdmTestPlan> planWrapper1 = new QueryWrapper<>();
-//                        planWrapper1.eq("weituo_id",vo.getWeituoId());
-//                        planWrapper1.eq("pm",vo.getPm());
-//                        List<ItdmTestPlan> testPlanList = itdmTestPlanMapper.selectList(planWrapper1);
-//                        if(testPlanList == null || testPlanList.isEmpty() || testPlanList.get(0)==null){
-//                            for (ItdmTestPlan p:testPlanList){
-//                                QueryWrapper<ItdmGongdanMaster> planWrapper2 = new QueryWrapper<>();
-//                                planWrapper2.eq("jihua_shiyan_id",p.getId());
-//                                planWrapper2.eq("worker",workerBefore);
-//                                List<ItdmGongdanMaster> masterList = itdmGongdanMasterMapper.selectList(planWrapper2);
-//                                if(masterList != null && !masterList.isEmpty() && masterList.get(0)!=null) m++;
-//                            }
-//
-//                            if(m==0){
-//                                QueryWrapper<ItdmTask> taskWrapper = new QueryWrapper<>();
-//                                taskWrapper.eq("weituo_id",vo.getWeituoId());
-//                                taskWrapper.eq("taskRole","操作员");
-//                                taskWrapper.eq("task_user",workerBefore);
-//                                taskMapper.delete(taskWrapper);
-//                            }
-//                        }
-//                        //查该委托单id、新操作员对应的task列表，若为空则新增新操作员的task
-//                        ItdmTask iTask = new ItdmTask();
-//                        iTask.setTaskRole("操作员");
-//                        iTask.setTaskUser(workerNow);
-//                        iTask.setWeituoId(vo.getWeituoId());
-//                        QueryWrapper<ItdmTask> queryWrapper = new QueryWrapper<>(iTask);
-//                        List<ItdmTask> tList= taskMapper.selectList(queryWrapper);
-//                        if(tList == null || tList.isEmpty() || tList.get(0)==null){ //没有的话新增该委托id、新操作员的task
-//                            ItdmTask nItdmTask = new ItdmTask();
-//                            nItdmTask.setTaskUser(workerNow);
-//                            nItdmTask.setWeituoId(vo.getWeituoId());
-//                            nItdmTask.setTaskRole("操作员");
-//                            nItdmTask.setTaskContent("试验实施");
-//                            nItdmTask.setTaskStatus(0);
-//                            taskMapper.insert(nItdmTask);
-//                        }
-//                    }
-
                     //修改项目经理拆解工单task状态为1进行中——需要先判断
                     Map<String, Object> testPlanMap = new HashMap<>();
-                    testPlanMap.put("weituo_id",vo.getWeituoId());
-                    testPlanMap.put("pm",vo.getPm());
+                    testPlanMap.put("weituo_id",dto.getWeituoId());
+                    testPlanMap.put("pm",dto.getPm());
                     testPlanMap.put("status",0);//未确认状态
                     List<ItdmTestPlan> testPlanList = itdmTestPlanMapper.selectByMap(testPlanMap);
                     if(testPlanList == null || testPlanList.isEmpty() || testPlanList.get(0)==null){ //都已确认
                         Map<String, Object> map = new HashMap<>();
                         map.put("task_role","项目经理");
-                        map.put("weituo_id",vo.getWeituoId());
-                        map.put("task_user",vo.getPm());
+                        map.put("weituo_id",dto.getWeituoId());
+                        map.put("task_user",dto.getPm());
                         List<ItdmTask> tList = taskMapper.selectByMap(map);
                         if(tList != null && !tList.isEmpty() && tList.get(0)!=null){
                             ItdmTask itdmTask1 = tList.get(0);
@@ -305,16 +244,16 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
     /**
      * 计划员新增或修改试验计划
      */
-    public String JHYAddAndUpdate(@RequestBody List<ItdmJHYQueryListVO> list){
+    public String JHYAddAndUpdate(@RequestBody List<ItdmJHYAddOrUpdateDTO> list){
         String msg = "提交成功！";
-        for(ItdmJHYQueryListVO vo:list){
-            ItdmTestPlan itdmTestPlan = ItdmJHYQueryListVO.toItdmTestPlan(vo);
+        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 = ItdmJHYQueryListVO.toItdmGongdanMaster(vo);
+                ItdmGongdanMaster master = ItdmJHYAddOrUpdateDTO.toItdmGongdanMaster(vo);
                 itdmGongdanMasterMapper.insert(master);
                 System.out.println("======================================计划员新增试验计划新增master" + master.getId());
                 //再拆成工单detail，再插入新的工单detail
@@ -410,7 +349,7 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
                 }
 
                 //新增一条一样的工单master
-                ItdmGongdanMaster master = ItdmJHYQueryListVO.toItdmGongdanMaster(vo);
+                ItdmGongdanMaster master = ItdmJHYAddOrUpdateDTO.toItdmGongdanMaster(vo);
                 itdmGongdanMasterMapper.insert(master);
                 System.out.println("======================================计划员修改试验计划新增master" + master.getId());
                 //再拆成工单detail，再插入新的工单detail

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/vo/ItdmJHYQueryListVO.java

@@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
-import org.jeecg.modules.itdmGongDan.entity.ItdmTestPlan;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -178,58 +176,4 @@ public class ItdmJHYQueryListVO {
         }
         return vo;
     }
-
-    /**转化成试验计划对象——计划员新增或修改试验计划*/
-    public static ItdmTestPlan toItdmTestPlan(ItdmJHYQueryListVO vo){
-        ItdmTestPlan itdmTestPlan = new ItdmTestPlan();
-        itdmTestPlan.setWeituoId(vo.getWeituoId());
-        itdmTestPlan.setTestItemsId(vo.getTestItemsId());
-        itdmTestPlan.setWeituoYangpinId(vo.getYangpinId());
-        itdmTestPlan.setShebeiId(vo.getShebeiId());
-        itdmTestPlan.setPm(vo.getPm());
-        itdmTestPlan.setReportNo(vo.getReportNo());
-
-        itdmTestPlan.setJihuaStartDate(vo.getJihuaStartDate());
-        int lastTime = vo.getLastTime();//通过持续时间计算结束时间，注意开始时间2023-5-21,持续时间1，则结束时间为2023-5-21
-        Date jihuaEndTime = new Date(vo.getJihuaStartDate().getTime() + (lastTime-1)*1000*3600*24);
-        itdmTestPlan.setJihuaEndDate(jihuaEndTime);
-
-        if(vo.getChuanganqiArray()!=null){
-            String[] arr = vo.getChuanganqiArray();
-            String chuanganqi = "";
-            for (int i = 0; i < arr.length; i++) {
-                if(i==0) chuanganqi = arr[i];
-                else chuanganqi = chuanganqi + ","+ arr[i];
-            }
-            itdmTestPlan.setChuanganqi(chuanganqi);
-        }
-
-        return  itdmTestPlan;
-    }
-
-    /**转化成工单master对象——用于新增工单master*/
-    public static ItdmGongdanMaster toItdmGongdanMaster(ItdmJHYQueryListVO vo){
-        ItdmGongdanMaster m = new ItdmGongdanMaster();
-        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
-        Date endDate = new Date(vo.getJihuaStartDate().getTime() + (lastTime-1)*1000*3600*24);
-        m.setEndDate(endDate);
-
-        if(vo.getChuanganqiArray() != null){
-            String[] arr = vo.getChuanganqiArray();
-            String chuanganqi = "";
-            for (int i = 0; i < arr.length; i++) {
-                if(i==0) chuanganqi = arr[i];
-                else chuanganqi = chuanganqi + ","+ arr[i];
-            }
-            m.setChuanganqi(chuanganqi);
-        }
-
-        return m;
-    }
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/vo/ItdmXMJLQueryListVO.java

@@ -2,14 +2,14 @@ package org.jeecg.modules.itdmGongDan.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
 import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
-import org.jeecg.modules.itdmGongDan.entity.ItdmTestPlan;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.util.Date;
-
+@Data
+@Accessors(chain = true)
 public class ItdmXMJLQueryListVO {
 
     /**委托id*/
@@ -125,254 +125,6 @@ public class ItdmXMJLQueryListVO {
     private java.lang.String[] shiiyanTypeArray;
 
 
-    public String getWeituoId() {
-        return weituoId;
-    }
-
-    public void setWeituoId(String weituoId) {
-        this.weituoId = weituoId;
-    }
-
-    public String getYangpinId() {
-        return yangpinId;
-    }
-
-    public void setYangpinId(String yangpinId) {
-        this.yangpinId = yangpinId;
-    }
-
-    public String getTestItems() {
-        return testItems;
-    }
-
-    public void setTestItems(String testItems) {
-        this.testItems = testItems;
-    }
-
-    public String getShebeiId() {
-        return shebeiId;
-    }
-
-    public void setShebeiId(String shebeiId) {
-        this.shebeiId = shebeiId;
-    }
-
-    public String getPm() {
-        return pm;
-    }
-
-    public void setPm(String pm) {
-        this.pm = pm;
-    }
-
-    public String getWeituoNo() {
-        return weituoNo;
-    }
-
-    public void setWeituoNo(String weituoNo) {
-        this.weituoNo = weituoNo;
-    }
-
-    public String getSampleName() {
-        return sampleName;
-    }
-
-    public void setSampleName(String sampleName) {
-        this.sampleName = sampleName;
-    }
-
-    public String getDeviceName() {
-        return deviceName;
-    }
-
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
-    }
-
-    public Date getJihuaStartDate() {
-        return jihuaStartDate;
-    }
-
-    public void setJihuaStartDate(Date jihuaStartDate) {
-        this.jihuaStartDate = jihuaStartDate;
-    }
-
-    public Date getJihuaEndDate() {
-        return jihuaEndDate;
-    }
-
-    public void setJihuaEndDate(Date jihuaEndDate) {
-        this.jihuaEndDate = jihuaEndDate;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public String getReportNo() {
-        return reportNo;
-    }
-
-    public void setReportNo(String reportNo) {
-        this.reportNo = reportNo;
-    }
-
-    public String getChuanganqi() {
-        return chuanganqi;
-    }
-
-    public void setChuanganqi(String chuanganqi) {
-        this.chuanganqi = chuanganqi;
-    }
-
-    public String getParent() {
-        return parent;
-    }
-
-    public void setParent(String parent) {
-        this.parent = parent;
-    }
-
-    public String getTestPlanId() {
-        return testPlanId;
-    }
-
-    public void setTestPlanId(String testPlanId) {
-        this.testPlanId = testPlanId;
-    }
-
-    public String getTestItemsId() {
-        return testItemsId;
-    }
-
-    public void setTestItemsId(String testItemsId) {
-        this.testItemsId = testItemsId;
-    }
-
-    public Integer getLastTime() {
-        return lastTime;
-    }
-
-    public void setLastTime(Integer lastTime) {
-        this.lastTime = lastTime;
-    }
-
-
-    public String getShiiyanType() {
-        return shiiyanType;
-    }
-
-    public void setShiiyanType(String shiiyanType) {
-        this.shiiyanType = shiiyanType;
-    }
-
-    public String getWorker() {
-        return worker;
-    }
-
-    public void setWorker(String worker) {
-        this.worker = worker;
-    }
-
-    public Integer getYangpinCount() {
-        return yangpinCount;
-    }
-
-    public void setYangpinCount(Integer yangpinCount) {
-        this.yangpinCount = yangpinCount;
-    }
-
-    public String getNeirong() {
-        return neirong;
-    }
-
-    public void setNeirong(String neirong) {
-        this.neirong = neirong;
-    }
-
-    public String getStatusC() {
-        return statusC;
-    }
-
-    public void setStatusC(String statusC) {
-        this.statusC = statusC;
-    }
-    public Date getShijiStartDate() {
-        return shijiStartDate;
-    }
-
-    public void setShijiStartDate(Date shijiStartDate) {
-        this.shijiStartDate = shijiStartDate;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String[] getChuanganqiArray() {
-        return chuanganqiArray;
-    }
-
-    public void setChuanganqiArray(String[] chuanganqiArray) {
-        this.chuanganqiArray = chuanganqiArray;
-    }
-
-    public String[] getShiiyanTypeArray() {
-        return shiiyanTypeArray;
-    }
-
-    public void setShiiyanTypeArray(String[] shiiyanTypeArray) {
-        this.shiiyanTypeArray = shiiyanTypeArray;
-    }
-
-
-    /**
-     * 将二级对象转化为工单master，用于新增或修改
-     * */
-    public static ItdmGongdanMaster toItdmGongdanMaster(ItdmXMJLQueryListVO vo){
-        ItdmGongdanMaster m = new ItdmGongdanMaster();
-//        m.setId(vo.getId());//如果用于新增，为空
-        m.setJihuaShiyanId(vo.getTestPlanId());
-        m.setTestItemsId(vo.getTestItemsId());
-        m.setWeituoYangpinId(vo.getYangpinId());
-        m.setShebeiId(vo.getShebeiId());
-        m.setShiiyanType(vo.getShiiyanType());
-        m.setWorker(vo.getWorker());
-        m.setYangpinCount(vo.getYangpinCount());
-
-        m.setStartDate(vo.getJihuaStartDate());
-        int lastTime = vo.getLastTime();//通过持续时间计算结束时间，注意开始时间2023-5-21,持续时间1，则结束时间为2023-5-21
-        Date endDate = new Date(vo.getJihuaStartDate().getTime() + (lastTime-1)*1000*3600*24);
-        m.setEndDate(endDate);
-
-        m.setShijiStartDate(vo.getShijiStartDate());//如果用于新增，为空
-        m.setNeirong(vo.getNeirong());
-
-        String[] arr = vo.getChuanganqiArray();
-        String chuanganqi = "";
-        for (int i = 0; i < arr.length; i++) {
-            if(i==0) chuanganqi = arr[i];
-            else chuanganqi = chuanganqi + ","+ arr[i];
-        }
-        m.setChuanganqi(chuanganqi);
-
-        String[] shiyanTypeArr = vo.getShiiyanTypeArray();
-        String shiyanType = "";
-        for (int i = 0; i < shiyanTypeArr.length; i++) {
-            if(i==0) shiyanType = shiyanTypeArr[i];
-            else shiyanType = shiyanType + ","+ shiyanTypeArr[i];
-        }
-        m.setShiiyanType(shiyanType);
-        return m;
-    }
 
     /**
      * 项目经理查询
@@ -432,34 +184,4 @@ public class ItdmXMJLQueryListVO {
         return vo;
     }
 
-
-    /**转化成试验计划对象——项目经理修改试验计划*/
-    public static ItdmTestPlan toItdmTestPlan(ItdmXMJLQueryListVO vo){
-        ItdmTestPlan itdmTestPlan = new ItdmTestPlan();
-        itdmTestPlan.setId(vo.getTestPlanId());
-        itdmTestPlan.setWeituoId(vo.getWeituoId());
-        itdmTestPlan.setTestItemsId(vo.getTestItemsId());
-        itdmTestPlan.setWeituoYangpinId(vo.getYangpinId());
-        itdmTestPlan.setShebeiId(vo.getShebeiId());
-        itdmTestPlan.setPm(vo.getPm());
-
-        itdmTestPlan.setJihuaStartDate(vo.getJihuaStartDate());
-        int lastTime = vo.getLastTime();//通过持续时间计算结束时间，注意开始时间2023-5-21,持续时间1，则结束时间为2023-5-1
-        Date jihuaEndTime = new Date(vo.getJihuaStartDate().getTime() + (lastTime-1)*1000*3600*24);
-        itdmTestPlan.setJihuaEndDate(jihuaEndTime);
-
-        itdmTestPlan.setReportNo(vo.getReportNo());
-        itdmTestPlan.setChuanganqi(vo.getChuanganqi());
-        itdmTestPlan.setStatus(vo.getStatus());
-
-        String[] arr = vo.getChuanganqiArray();
-        String chuanganqi = "";
-        for (int i = 0; i < arr.length; i++) {
-            if(i==0) chuanganqi = arr[i];
-            else chuanganqi = chuanganqi + ","+ arr[i];
-        }
-        itdmTestPlan.setChuanganqi(chuanganqi);
-
-        return  itdmTestPlan;
-    }
 }