对接修改

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/exception/vo/ExceptionRespVO.java

@@ -62,7 +62,7 @@ public class ExceptionRespVO {
 
     @Schema(description = "引发人")
     @ExcelProperty("引发人")
-    private Long raiserName;
+    private String raiserName;
 
     @Schema(description = "参数ID")
     @ExcelProperty("参数ID")
@@ -84,4 +84,17 @@ public class ExceptionRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "异常发生时间")
+    private String startRaiseTime;
+
+    @Schema(description = "异常发生时间")
+    private String endRaiseTime;
+
+    @Schema(description = "异常处理时间")
+    private String startHandleTime;
+
+    @Schema(description = "异常处理时间")
+    private String endHandleTime;
+
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/sop/SopExecutionPlanServiceImpl.java

@@ -73,7 +73,7 @@ public class SopExecutionPlanServiceImpl extends ServiceImpl<SopExecutionPlanMap
         SopExecutionPlanRespVO sopExecutionPlan1 = getSopExecutionPlan(sopExecutionPlan.getId());
         if (!sopExecutionPlan1.getPreviewDataList().isEmpty()) {
             sopExecutionPlanMapper.update(Wrappers.<SopExecutionPlanDO>lambdaUpdate()
-                    .eq(SopExecutionPlanDO::getSopId, sopExecutionPlan.getId())
+                    .eq(SopExecutionPlanDO::getId, sopExecutionPlan.getId())
                     .set(SopExecutionPlanDO::getNextExecutDate, sopExecutionPlan1.getPreviewDataList().get(0).getPlanDay()));
             /*if (sopExecutionPlan1.getPreviewDataList().get(0).getPlanDay().equals(DateUtil.format(new Date(), "yyyy-MM-dd"))) {
                 // 如果初始化的
@@ -95,7 +95,7 @@ public class SopExecutionPlanServiceImpl extends ServiceImpl<SopExecutionPlanMap
                 !updateReqVO.getTimePoint().equals(byId.getTimePoint())) {
             // 改动了计划的实质性内容，需要直接修改计划的开始时间
             updateReqVO.setCreateTime(LocalDateTime.now());
-            // 获取新的书简周期
+            // 获取新的数据周期
             List<String> previewDateList = getPreviewDateList(updateReqVO.getEffectiveTime(), updateReqVO.getFrequencyUnit(), updateReqVO.getFrequency(), updateReqVO.getTimePoint());
             updateReqVO.setNextExecutDate(previewDateList.isEmpty() ? "" : previewDateList.get(0));
         }
@@ -372,7 +372,6 @@ public class SopExecutionPlanServiceImpl extends ServiceImpl<SopExecutionPlanMap
     @Transactional
     @Override
     public Boolean addJobBySopExecutionPlan() throws JsonProcessingException {
-
         String yyyymmdd = DateUtil.format(new Date(), "yyyy-MM-dd");
         SopExecutionPlanRespVO sopExecutionPlanRespVO = new SopExecutionPlanRespVO();
         sopExecutionPlanRespVO.setNextExecutDate(yyyymmdd);

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

@@ -17,7 +17,6 @@
                 LEFT JOIN isc_workstation w ON w.id = c.workstation_id
                 LEFT JOIN ( SELECT o.cabinet_id, count( o.id ) AS open_count FROM isc_cabinet_open_record o
                 <where>
-                    c.deleted = 0
                     <if test="startTime != null and startTime.trim != ''">
                         and o.open_time &gt;= #{startTime}
                     </if>
@@ -48,6 +47,7 @@
                     </if>
                 </where>
                 GROUP BY e.loan_from_id ) lex ON lex.loan_from_id = c.id
+        where  c.deleted = 0
         order by c.id asc
     </select>