计划排期——查询列表展示的设备改成多个设备

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

@@ -157,15 +157,15 @@ public class ItdmJCXMSHJHController {
 //        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);
-    }
+//    /**
+//     * 测试
+//     * */
+//    @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/mapper/ItdmJCXMSHJHMapper.java

@@ -79,12 +79,13 @@ public interface ItdmJCXMSHJHMapper {
      */
     @Select("select a.weituo_id, a.yangpin_id, a.id as testItemsId, a.test_items, " +
             "b.id as testPlanId, b.shebei_id, b.pm, b.jihua_start_date, b.jihua_end_date, b.status, b.report_no, b.chuanganqi, " +
-            "d.sample_name, d.sample_model_specification, e.device_name " +
+            "d.sample_name, d.sample_model_specification, GROUP_CONCAT(e.device_name SEPARATOR ',') AS deviceName " +
             "from itdm_weituo_yangpin_extend a " +
             "left join itdm_test_plan b on a.id = b.test_items_id " +
             "left join itdm_weituo_yangpin d on a.yangpin_id = d.id " +
-            "left join itdm_device e on b.shebei_id = e.id " +
-            "where a.weituo_id = #{weituoId}")
+            "left join itdm_device e on FIND_IN_SET(e.id, b.shebei_id) " +
+            "where a.weituo_id = #{weituoId} " +
+            "group by a.id")
     List<ItdmJHYQueryListVO> getAll3(@Param("weituoId") String weituoId);
 
     /**
@@ -94,15 +95,16 @@ public interface ItdmJCXMSHJHMapper {
      */
     @Select("select a.weituo_id, a.yangpin_id, a.id as testItemsId, a.test_items, " +
             "b.id as testPlanId, b.shebei_id, b.pm, b.jihua_start_date, b.jihua_end_date, b.status, b.report_no, b.chuanganqi, " +
-            "d.sample_name, d.sample_model_specification, e.device_name, " +
+            "d.sample_name, d.sample_model_specification, GROUP_CONCAT(e.device_name SEPARATOR ',') AS deviceName, " +
             "i.shenhe_status " +
             "from itdm_weituo_yangpin_extend a " +
             "left join itdm_test_plan b on a.id = b.test_items_id " +
             "left join itdm_weituo_yangpin d on a.yangpin_id = d.id " +
-            "left join itdm_device e on b.shebei_id = e.id " +
+            "left join itdm_device e on FIND_IN_SET(e.id, b.shebei_id) " +
             "left join itdm_weituo_info i on a.weituo_id = i.id " +
             "where a.weituo_id in (select id from itdm_weituo_info where itdm_weituo_info.complete_status = 0 " +
-            "and itdm_weituo_info.shenhe_status = '1' )")
+            "and itdm_weituo_info.shenhe_status = '1' )" +
+            "group by a.id")
     List<ItdmJHYQueryListVO> getAllWithoutWeituoId();
 
     /**

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

@@ -55,9 +55,9 @@ public interface IItdmJCXMSHJHService {
      */
     public List<ItdmJHYQueryListVO> getAll3(@Param("weituoNo") String weituoId);
 
-    /**
-     * 计划员查询列表(测试)
-     */
-    public List<ItdmJHYQueryListVO> getAll(@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

@@ -245,6 +245,7 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
 
     /**
      * 计划员新增或修改试验计划
+     * 231130——改设备为多选
      */
     public String JHYAddAndUpdate(@RequestBody List<ItdmJHYAddOrUpdateDTO> list){
         String msg = "提交成功！";
@@ -534,19 +535,19 @@ 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;
-    }
+//    /**
+//     * 计划员查询列表(测试)
+//     */
+//    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;
+//    }
 
     /**
      * 项目经理查询列表——一级列表——通过登录用户查询

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

@@ -42,6 +42,10 @@ public class ItdmJHYQueryListVO {
     @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,31 +131,31 @@ public class ItdmJHYQueryListVO {
     @ApiModelProperty(value = "规格型号")
     private java.lang.String sampleModelSpecification;
 
-    /**测试*/
-    public static ItdmJHYQueryListVO toItdmJHYQueryListVO(ItdmJCXMAndSYJHVO itdmVO, String weituoNo, String sampleName, String deviceName){
-        ItdmJHYQueryListVO vo = new ItdmJHYQueryListVO();
-        vo.setWeituoId(itdmVO.getWeituoId());
-        vo.setYangpinId(itdmVO.getYangpinId());
-        vo.setShebeiId(itdmVO.getShebeiId());
-        vo.setTestItems(itdmVO.getTestItems());
-        vo.setDeviceName(deviceName);
-        vo.setSampleName(sampleName);
-        vo.setWeituoNo(weituoNo);
-        vo.setChuanganqi(itdmVO.getChuanganqi());
-        vo.setStatus(itdmVO.getStatus());
-        vo.setPm(itdmVO.getPm());
-        vo.setChuanganqi(itdmVO.getChuanganqi());
-        vo.setTestPlanId(itdmVO.getTestPlanId());
-        vo.setReportNo(itdmVO.getReportNo());
-        vo.setJihuaStartDate(itdmVO.getJihuaStartDate());
-        vo.setJihuaEndDate(itdmVO.getJihuaEndDate());
-        vo.setTestItemsId(itdmVO.getTestItemsId());
-        if(itdmVO.getJihuaEndDate()!=null && itdmVO.getTestItemsId()!=null){
-            int days = (int) ((itdmVO.getJihuaEndDate().getTime() - itdmVO.getJihuaStartDate().getTime()) / (1000*3600*24));
-            vo.setLastTime(days);
-        }
-        return vo;
-    }
+//    /**测试*/
+//    public static ItdmJHYQueryListVO toItdmJHYQueryListVO(ItdmJCXMAndSYJHVO itdmVO, String weituoNo, String sampleName, String deviceName){
+//        ItdmJHYQueryListVO vo = new ItdmJHYQueryListVO();
+//        vo.setWeituoId(itdmVO.getWeituoId());
+//        vo.setYangpinId(itdmVO.getYangpinId());
+//        vo.setShebeiId(itdmVO.getShebeiId());
+//        vo.setTestItems(itdmVO.getTestItems());
+//        vo.setDeviceName(deviceName);
+//        vo.setSampleName(sampleName);
+//        vo.setWeituoNo(weituoNo);
+//        vo.setChuanganqi(itdmVO.getChuanganqi());
+//        vo.setStatus(itdmVO.getStatus());
+//        vo.setPm(itdmVO.getPm());
+//        vo.setChuanganqi(itdmVO.getChuanganqi());
+//        vo.setTestPlanId(itdmVO.getTestPlanId());
+//        vo.setReportNo(itdmVO.getReportNo());
+//        vo.setJihuaStartDate(itdmVO.getJihuaStartDate());
+//        vo.setJihuaEndDate(itdmVO.getJihuaEndDate());
+//        vo.setTestItemsId(itdmVO.getTestItemsId());
+//        if(itdmVO.getJihuaEndDate()!=null && itdmVO.getTestItemsId()!=null){
+//            int days = (int) ((itdmVO.getJihuaEndDate().getTime() - itdmVO.getJihuaStartDate().getTime()) / (1000*3600*24));
+//            vo.setLastTime(days);
+//        }
+//        return vo;
+//    }
 
     /**填入委托编号，计算持续时间，状态转化——计划员查询列表对象*/
     public static ItdmJHYQueryListVO toItdmJHYQueryListVO3(ItdmJHYQueryListVO vo, String weituoNo, ShijiDate shijiDate){
@@ -175,6 +179,10 @@ public class ItdmJHYQueryListVO {
             String[] arr = vo.getChuanganqi().split(",");
             vo.setChuanganqiArray(arr);
         }
+        if(vo.getShebeiId()!=null && !vo.getShebeiId().equals("")){
+            String[] arr = vo.getShebeiId().split(",");
+            vo.setShebeiIdArray(arr);
+        }
         if(shijiDate!=null){
             vo.setShijiStartDate(shijiDate.getShijiStartDate());
             vo.setShijiEndDate(shijiDate.getShijiEndDate());