fix计划排期、拆解工单查询列表多设备；fix项目经理查询（按真实姓名）sql

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

@@ -162,9 +162,11 @@ public class ItdmXMJLAddOrUpdateDTO {
 
         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];
+        if (shiyanTypeArr != null && shiyanTypeArr.length > 0) {
+            for (int i = 0; i < shiyanTypeArr.length; i++) {
+                if(i==0) shiyanType = shiyanTypeArr[i];
+                else shiyanType = shiyanType + ","+ shiyanTypeArr[i];
+            }
         }
         m.setShiiyanType(shiyanType);
         return m;

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/mapper/ItdmJCXMSHJHMapper.java

@@ -15,15 +15,18 @@ 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, m.start_date as jihuaStartDate, m.end_date as jihuaEndDate, b.status, b.report_no, b.chuanganqi, " +
+    @Select("select a.weituo_id, m.weituo_yangpin_id, m.test_items_id, a.test_items, " +
+            "m.jihua_shiyan_id, b.pm, " +
+            "m.shebei_id, m.start_date as jihuaStartDate, m.end_date as jihuaEndDate, " +
+            "b.status, b.report_no, m.chuanganqi, " +
             "d.sample_name, d.sample_model_specification, e.device_name, " +
-            "m.jihua_shiyan_id as parent, m.shiiyan_type, m.worker, m.yangpin_count, m.neirong, m.shiji_start_date,m.id " +
+            "m.jihua_shiyan_id as parent, " +
+            "m.shiiyan_type, m.worker, m.yangpin_count, m.neirong, m.shiji_start_date,m.id " +
             "from itdm_gongdan_master m " +
             "left join itdm_test_plan b on m.jihua_shiyan_id = b.id " +
             "left join itdm_weituo_yangpin_extend a  on m.test_items_id = a.id " +
             "left join itdm_weituo_yangpin d on m.weituo_yangpin_id = d.id " +
-            "left join itdm_device e on b.shebei_id = e.id " +
+            "left join itdm_device e on m.shebei_id = e.id " +
             "where a.weituo_id = #{weituoId} and m.jihua_shiyan_id " +
             "in (select b.id from itdm_test_plan b " +
             "left join itdm_weituo_info f on b.weituo_id = f.id " +
@@ -50,7 +53,8 @@ public interface ItdmJCXMSHJHMapper {
             "m.jihua_shiyan_id, b.pm, " +
             "m.shebei_id, m.start_date as jihuaStartDate, m.end_date as jihuaEndDate, " +
             "b.status, b.report_no, m.chuanganqi, " +
-            "d.sample_name, d.sample_model_specification, e.device_name, m.jihua_shiyan_id as parent, " +
+            "d.sample_name, d.sample_model_specification, e.device_name, " +
+            "m.jihua_shiyan_id as parent, " +
             "m.shiiyan_type, m.worker, m.yangpin_count, m.neirong, m.shiji_start_date,m.id " +
             "from itdm_gongdan_master m " +
             "left join itdm_test_plan b on m.jihua_shiyan_id = b.id " +
@@ -65,13 +69,12 @@ 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, GROUP_CONCAT(e.device_name SEPARATOR ',') AS deviceName " +
+            "d.sample_name, d.sample_model_specification, e.device_name " +
             "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 FIND_IN_SET(e.id, b.shebei_id) " +
-            "where a.weituo_id = #{weituoId}" +
-            "group by a.id")
+            "left join itdm_device e on b.shebei_id = e.id " +
+            "where a.weituo_id = #{weituoId}")
     List<ItdmXMJLQueryListVO> getXMJLFirstList(@Param("weituoId") String weituoId);
 
 
@@ -80,13 +83,12 @@ 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, GROUP_CONCAT(e.device_name SEPARATOR ',') AS deviceName " +
+            "d.sample_name, d.sample_model_specification, e.device_name " +
             "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 FIND_IN_SET(e.id, b.shebei_id) " +
-            "where a.weituo_id = #{weituoId} " +
-            "group by a.id")
+            "left join itdm_device e on b.shebei_id = e.id " +
+            "where a.weituo_id = #{weituoId}")
     List<ItdmJHYQueryListVO> getAll3(@Param("weituoId") String weituoId);
 
     /**
@@ -96,16 +98,14 @@ 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, GROUP_CONCAT(e.device_name SEPARATOR ',') AS deviceName, " +
+            "d.sample_name, d.sample_model_specification, " +
             "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 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' )" +
-            "group by a.id")
+            "and itdm_weituo_info.shenhe_status = '1' )")
     List<ItdmJHYQueryListVO> getAllWithoutWeituoId();
 
     /**

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

@@ -2,9 +2,11 @@ package org.jeecg.modules.itdmGongDan.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.itdmDevice.mapper.ItdmDeviceMapper;
+import org.jeecg.modules.itdmDevice.service.IItdmDeviceService;
 import org.jeecg.modules.itdmFirstPage.entity.ItdmTask;
 import org.jeecg.modules.itdmFirstPage.mapper.ItdmTaskMapper;
 import org.jeecg.modules.itdmFirstPage.service.IItdmTaskService;
@@ -69,6 +71,9 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
     @Autowired
     @SuppressWarnings("all")
     private IItdmTaskService taskService;
+    @Autowired
+    @SuppressWarnings("all")
+    private IItdmDeviceService deviceService;
 
     /**
      *   删除2级工单master+对应的工单detail
@@ -230,8 +235,13 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
     public List<ItdmXMJLQueryListVO> getXMJLFirstList(String weituoNo){
         String weituoId = itdmWeituoInfoMapper.selectByWeituoNo(weituoNo);
         List<ItdmXMJLQueryListVO> list1 = itdmJCXMSHJHMapper.getXMJLFirstList(weituoId);
-        List<ItdmXMJLQueryListVO> list2 = list1.stream().map(i->
-                ItdmXMJLQueryListVO.toItdmXMJLQueryListVO1(i,weituoNo)).collect(Collectors.toList());
+        List<ItdmXMJLQueryListVO> list2 = list1.stream().map(i -> {
+            String deviceName = "";
+            if(i.getShebeiId()!=null && !i.getShebeiId().equals("")){
+                deviceName = deviceService.queryNameByIdList(i.getShebeiId());
+            }
+            return ItdmXMJLQueryListVO.toItdmXMJLQueryListVO1(i,weituoNo,deviceName);
+        }).collect(Collectors.toList());
         return list2;
     }
 
@@ -408,7 +418,12 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
                 List<ItdmGongdanMaster> shijiEndList = itdmGongdanMasterMapper.getShijiEndDateListByTestPlanId(testPlanId);
                 if(shijiEndList==null || shijiEndList.isEmpty()) jhpqStatus="1"; //已完成
 
-                return ItdmJHYQueryListVO.toItdmJHYQueryListVO3(i,weituoNo,shijiDate,jhpqStatus);
+                String deviceName = "";
+                if(i.getShebeiId()!=null && !i.getShebeiId().equals("")){
+                    deviceName = deviceService.queryNameByIdList(i.getShebeiId());
+                }
+
+                return ItdmJHYQueryListVO.toItdmJHYQueryListVO3(i,weituoNo,shijiDate,jhpqStatus,deviceName);
             }).collect(Collectors.toList());
             return list1;
         }else {
@@ -422,7 +437,12 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
                 List<ItdmGongdanMaster> shijiEndList = itdmGongdanMasterMapper.getShijiEndDateListByTestPlanId(testPlanId);
                 if(shijiEndList==null || shijiEndList.isEmpty()) jhpqStatus="1"; //已完成
 
-                return ItdmJHYQueryListVO.toItdmJHYQueryListVO3(i,weituoNo1,shijiDate,jhpqStatus);
+                String deviceName = "";
+                if(i.getShebeiId()!=null && !i.getShebeiId().equals("")){
+                    deviceName = deviceService.queryNameByIdList(i.getShebeiId());
+                }
+
+                return ItdmJHYQueryListVO.toItdmJHYQueryListVO3(i,weituoNo1,shijiDate,jhpqStatus,deviceName);
             }).collect(Collectors.toList());
             return list1;
         }
@@ -435,8 +455,13 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
     public List<ItdmXMJLQueryListVO> getXMJLFirstListByUserName(String weituoNo,String realName){
         String weituoId = itdmWeituoInfoMapper.selectByWeituoNo(weituoNo);
         List<ItdmXMJLQueryListVO> list1 = itdmJCXMSHJHMapper.getXMJLFirstListByUserName(weituoId,realName);
-        List<ItdmXMJLQueryListVO> list2 = list1.stream().map(i->
-                ItdmXMJLQueryListVO.toItdmXMJLQueryListVO1(i,weituoNo)).collect(Collectors.toList());
+        List<ItdmXMJLQueryListVO> list2 = list1.stream().map(i->{
+                    String deviceName = "";
+                    if(i.getShebeiId()!=null && !i.getShebeiId().equals("")){
+                        deviceName = deviceService.queryNameByIdList(i.getShebeiId());
+                    }
+                    return ItdmXMJLQueryListVO.toItdmXMJLQueryListVO1(i,weituoNo,deviceName);
+        }).collect(Collectors.toList());
         return list2;
     }
     /**

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

@@ -162,7 +162,8 @@ public class ItdmJHYQueryListVO {
 //    }
 
     /**填入委托编号，计算持续时间，状态转化——计划员查询列表对象*/
-    public static ItdmJHYQueryListVO toItdmJHYQueryListVO3(ItdmJHYQueryListVO vo, String weituoNo, ShijiDate shijiDate, String jhpqStatus){
+    public static ItdmJHYQueryListVO toItdmJHYQueryListVO3(ItdmJHYQueryListVO vo, String weituoNo, ShijiDate shijiDate, String jhpqStatus,String deviceName){
+        vo.setDeviceName(deviceName);
         vo.setJhpqStatus(jhpqStatus);//0未完成1已完成
         vo.setId(vo.getTestItemsId());//用来放检测项目id
         vo.setWeituoNo(weituoNo);

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

@@ -139,7 +139,8 @@ public class ItdmXMJLQueryListVO {
      * 1级列表
      * 填入委托编号，计算持续时间，状态转换
      * */
-    public static ItdmXMJLQueryListVO toItdmXMJLQueryListVO1(ItdmXMJLQueryListVO vo, String weituoNo){
+    public static ItdmXMJLQueryListVO toItdmXMJLQueryListVO1(ItdmXMJLQueryListVO vo, String weituoNo, String deviceName){
+        vo.setDeviceName(deviceName);
         vo.setWeituoNo(weituoNo);
         if(vo.getJihuaEndDate()!=null && vo.getTestItemsId()!=null){
             int days = (int) ((vo.getJihuaEndDate().getTime() - vo.getJihuaStartDate().getTime()) / (1000*3600*24));

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmPersonManage/controller/ItdmPersonManageController.java

@@ -37,9 +37,9 @@ public class ItdmPersonManageController extends JeecgController<ItdmPersonManage
 	private IItdmPersonManageService itdmPersonManageService;
 
 	 /**
-	  * 项目经理下拉列表
+	  * 项目经理、操作员下拉列表————不用了
 	  */
-	 @ApiOperation(value="项目经理下拉列表", notes="项目经理下拉列表")
+	 @ApiOperation(value="项目经理、操作员下拉列表————不用了", notes="目经理、操作员下拉列表————不用了")
 	 @GetMapping("/xialalist")
 	 public List<ItdmPersonManage> list1(@RequestParam("position") String position)
 	 {