1 éve
szülő
commit
3f0ec68274

+ 6 - 0
platform-rest/src/main/java/com/platform/rest/controller/sb/SbStatusLogController.java

@@ -6,9 +6,11 @@ import com.platform.common.util.StringUtils;
 import com.platform.dao.dto.check.CheckJobDTO;
 import com.platform.dao.dto.sb.SbStatusLogDTO;
 import com.platform.dao.entity.check.CheckJob;
+import com.platform.dao.entity.repair.RepairApplicationForm;
 import com.platform.dao.entity.sb.SbStatusLog;
 import com.platform.dao.enums.SbInfoStatusEnum;
 import com.platform.dao.mapper.check.CheckJobMapper;
+import com.platform.dao.mapper.repair.RepairApplicationFormMapper;
 import com.platform.dao.mapper.sb.SbStatusLogMapper;
 import com.platform.dao.vo.export.sb.ExportSbStatusLogVO2;
 import com.platform.service.check.CheckJobService;
@@ -45,6 +47,7 @@ public class SbStatusLogController {
   private final CheckJobMapper checkJobMapper;
 
   private final SbStatusLogMapper sbStatusLogMapper;
+  private final RepairApplicationFormMapper repairApplicationFormMapper;
 
   /**
    * 通过id查询单条记录
@@ -75,6 +78,9 @@ public class SbStatusLogController {
           CheckJob checkJob = new CheckJob();
           checkJob.setSbId(sbStatusLogDTO.getSbId());
           checkJobMapper.delete(checkJob);
+          RepairApplicationForm form = new RepairApplicationForm();
+          form.setSbId(sbStatusLogDTO.getSbId());
+          repairApplicationFormMapper.delete(form);
       }
       return new R<>(sbStatusLogService.saveModelByDTOAndUserInfo(sbStatusLogDTO, SecurityUtils.getUserInfo()));
   }

+ 1 - 0
platform-service/src/main/java/com/platform/service/check/impl/CheckJobServiceImpl.java

@@ -586,6 +586,7 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
     }
 
 
+
     /**
      * 生成设备的保养任务
      *

+ 11 - 0
platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -501,6 +501,17 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
 
     @Override
     public void modModelByDTO(SbInfoDTO model) {
+        SbInfo info = new SbInfo();
+        info.setId(model.getId());
+        info= mapper.selectOne(info);
+        if (!info.getStatus().equals(model.getStatus()) && SbInfoStatusEnum.IN_USE.equals(info.getStatus())){
+            CheckJob checkJob = new CheckJob();
+            checkJob.setSbId(model.getId());
+            checkJobMapper.delete(checkJob);
+            RepairApplicationForm form = new RepairApplicationForm();
+            form.setSbId(model.getId());
+            repairApplicationFormMapper.delete(form);
+        }
 
         if (model.getIsFinancing() == null) {
             model.setIsFinancing(SbInfoFinancingEnum.NOT.getValue());