修改sop链表计划

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/sop/vo/SopRespVO.java

@@ -70,6 +70,9 @@ public class SopRespVO {
     @ExcelProperty("备注")
     private String remark;
 
+    @Schema(description = "下次执行日期")
+    private String nextExecutDate;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;

yudao-module-iscs/src/main/resources/mapper/SopMapper.xml

@@ -16,7 +16,8 @@
         w.workstation_name,
         d.machinery_name,
         any_value(di.label) as sopTypeName,
-        COUNT( p.id ) AS pointCount
+        COUNT( p.id ) AS pointCount,
+        e.next_execut_date
         FROM
         isc_sop s
         LEFT JOIN isc_workarea wa ON wa.id = s.workarea_id
@@ -24,6 +25,7 @@
         LEFT JOIN system_users u ON u.id = s.creator
         LEFT JOIN isc_machinery d ON d.id = s.machinery_id
         LEFT JOIN isc_sop_points p ON p.sop_id = s.id
+        LEFT JOIN isc_sop_execution_plan e ON e.sop_id = s.id
         LEFT JOIN system_dict_data di ON di.dict_type = "sop_type" and di.value = s.sop_type
         <where>
             <if test="vo.sopCode != null and vo.sopCode.trim != ''">