对接调整

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/point/PagePointDTO.java

@@ -40,4 +40,7 @@ public class PagePointDTO
     @ApiModelProperty(value = "岗位id")
     private Long workstationId;
 
+    @ApiModelProperty(value = "工艺id")
+    private Long machineryId;
+
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/points/PointPageVO.java

@@ -86,4 +86,7 @@ public class PointPageVO extends BaseBean
     @ApiModelProperty(value = "岗位名称")
     private String workstationName;
 
+    @ApiModelProperty(value = "岗位名称")
+    private String machineryName;
+
 }

ktg-iscs/src/main/resources/mapper/IsIsolationPointMapper.xml

@@ -171,12 +171,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             l.lock_type_img,
             t.lockset_type_img,
             s.loto_name,
-            w.workstation_name
+            w.workstation_name,
+            GROUP_CONCAT(DISTINCT ma.machinery_name) AS machinery_name
         FROM is_isolation_point p
         LEFT JOIN is_lock_type l ON l.lock_type_id = p.lock_type_id
         LEFT JOIN is_lockset_type t ON t.lockset_type_id = p.lockset_type_id
         LEFT JOIN is_workstation w ON w.workstation_id = p.workstation_id
         LEFT JOIN is_loto_station s ON s.loto_id = p.loto_id
+        LEFT JOIN is_machinery_points m ON m.point_id = p.point_id
+        LEFT JOIN is_machinery ma ON ma.machinery_id = m.machinery_id
         <where>
             <if test="dto.pointCode != null and dto.pointCode.trim != ''">
                 and p.point_code like concat('%',#{dto.pointCode},'%')
@@ -205,7 +208,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dto.workstationId != null">
                 and p.workstation_id = #{dto.workstationId}
             </if>
+            <if test="dto.machineryId != null">
+                and m.machinery_id = #{dto.machineryId}
+            </if>
         </where>
+            group by p.point_id
             order by p.point_id desc
     </select>
 </mapper>