fix(jg):维修告知删除

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgMaintainNoticeController.java

@@ -81,8 +81,8 @@ public class JgMaintainNoticeController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/delete")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除维修告知", notes = "根据sequenceNbr删除维修告知")
-    public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbr") Long[] sequenceNbr) {
-        return ResponseHelper.buildResponse(iJgMaintainNoticeService.deleteBySequenceNbr(sequenceNbr));
+    public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbrs") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(iJgMaintainNoticeService.deleteBySequenceNbr(new Long[]{sequenceNbr}));
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgMaintainNoticeServiceImpl.java

@@ -17,9 +17,11 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNoticeEq;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintainNoticeEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintainNoticeMapper;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgRegistrationHistoryMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintainNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
@@ -116,6 +118,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     @Autowired
     private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
 
+    @Autowired
+    private JgRegistrationHistoryMapper jgRegistrationHistoryMapper;
+
     /**
      * 根据sequenceNbr查询
      *
@@ -372,14 +377,20 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     }
 
     @Override
-    public boolean deleteBySequenceNbr(Long[] sequenceNbr) {
-        this.baseMapper.deleteById(sequenceNbr);
-        LambdaQueryWrapper<JgMaintainNoticeEq> lambda = new QueryWrapper<JgMaintainNoticeEq>().lambda();
-        lambda.eq(JgMaintainNoticeEq::getEquipTransferId, sequenceNbr);
-        jgMaintainNoticeEqMapper.delete(lambda);
-        // 删除待办 + 中止流程
-        JgMaintainNotice jgMaintainNotice = this.baseMapper.selectById(sequenceNbr);
-        commonService.deleteTaskModel(sequenceNbr + "",jgMaintainNotice.getInstanceId());
+    public boolean deleteBySequenceNbr(Long[] sequenceNbrs) {
+        for (Long sequenceNbr : sequenceNbrs) {
+            JgMaintainNotice jgMaintainNotice = this.baseMapper.selectById(sequenceNbr);
+            // 删除待办 + 中止流程
+            commonService.deleteTaskModel(sequenceNbr + "",jgMaintainNotice.getInstanceId());
+            // 删除业务单
+            this.baseMapper.deleteById(sequenceNbr);
+            // 删除对应equ
+            jgMaintainNoticeEqMapper.delete(new QueryWrapper<JgMaintainNoticeEq>().lambda()
+                    .eq(JgMaintainNoticeEq::getEquipTransferId, sequenceNbr));
+            // 删除单子对应历史表数据
+            jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>()
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, jgMaintainNotice.getSequenceNbr()));
+        }
         return true;
     }