拆解工单—查询列表一级列表的设备改成多个设备

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

@@ -65,12 +65,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<ItdmXMJLQueryListVO> getXMJLFirstList(@Param("weituoId") String weituoId);
 
 

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

@@ -128,6 +128,10 @@ public class ItdmXMJLQueryListVO {
     @Excel(name = "规格型号", width = 15)
     @ApiModelProperty(value = "规格型号")
     private java.lang.String sampleModelSpecification;
+    /**设备id数组*/
+    @Excel(name = "设备id数组", width = 15)
+    @ApiModelProperty(value = "设备id数组")
+    private java.lang.String[] shebeiIdArray;
 
 
     /**
@@ -155,6 +159,10 @@ public class ItdmXMJLQueryListVO {
             String[] arr = vo.getChuanganqi().split(",");
             vo.setChuanganqiArray(arr);
         }
+        if(vo.getShebeiId()!=null && !vo.getShebeiId().equals("")){
+            String[] arr = vo.getShebeiId().split(",");
+            vo.setShebeiIdArray(arr);
+        }
         return vo;
     }