fix(jg)：使用登记添加逻辑删除

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -439,6 +439,7 @@
                  LEFT JOIN idx_biz_jg_factory_info jfi on tjure.equ_id = jfi.RECORD
                  left JOIN idx_biz_jg_register_info jri on tjure.equ_id = jri.RECORD
         WHERE tjure.equip_transfer_id = #{id}
+          AND tjure.is_delete = 0
     </select>
     <sql id="page-list-pipeline">
         SELECT
@@ -654,6 +655,7 @@
         where
             a.sequence_nbr = b.equip_transfer_id
           and a.status not in('使用单位待提交','一级受理已驳回','使用单位已撤回','已作废')
+          and a.is_delete = 0
     </select>
     <select id="getEquTypeByUseRegSeq" resultType="java.util.Map">
         select ur.sequence_nbr                                                                                   as sequenceNbr,
@@ -707,6 +709,7 @@
             and u."RECORD" = ri."RECORD"
             and (a.audit_pass_date between #{beginDate} and #{endDate})
             and a.status='已完成'
+            and a.is_delete = 0
             and u."PROVINCE" <![CDATA[<>]]> ''
             and u."CITY"  <![CDATA[<>]]> ''
             and u."COUNTY"  <![CDATA[<>]]> ''
@@ -741,6 +744,7 @@
                   and (a.audit_pass_date between #{dpFilterParamDto.beginDate} and #{dpFilterParamDto.endDate})
 
                   AND A.status = '已完成'
+                  AND A.is_delete = 0
             ) C
         WHERE
             C.areaCode LIKE concat ( '%', #{dpFilterParamDto.cityCode}, '%' )

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

@@ -550,6 +550,7 @@ public class CommonController extends BaseController {
         seqLists.forEach(sequenceNbr -> {
             LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
             lambda.eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr);
+            lambda.eq(JgRegistrationHistory::getIsDelete, false);
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambda);
             JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
             String equipId = String.valueOf(jsonObject.get("equipId"));

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

@@ -89,9 +89,7 @@ public class JgUseRegistrationController extends BaseController {
     @PostMapping(value = "/deleteMessage")
     @ApiOperation(httpMethod = "POST", value = "删除", notes = "删除")
     public ResponseModel<Object> deleteMessage(@RequestParam("id") Long id) {
-        ArrayList<Long> ids = new ArrayList<>();
-        ids.add(id);
-        jgUseRegistrationServiceImpl.deleteBatch(ids);
+        jgUseRegistrationServiceImpl.deleteBatch(Collections.singletonList(id));
         return ResponseHelper.buildResponse("ok");
     }
 

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/CommonServiceImpl.java

@@ -1881,6 +1881,7 @@ public class CommonServiceImpl implements ICommonService {
         JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
         LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
         lambda.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
+        lambda.eq(JgRegistrationHistory::getIsDelete, false);
         Integer integer = jgRegistrationHistoryService.getBaseMapper().selectCount(lambda);
         if (integer > 0) {
             jgRegistrationHistory.setChangeData(JSON.toJSONString(json));
@@ -1899,6 +1900,7 @@ public class CommonServiceImpl implements ICommonService {
     public JSONObject queryHistoryData(Long currentDocumentId) {
         LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
         lambda.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
+        lambda.eq(JgRegistrationHistory::getIsDelete, false);
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambda);
         return jgRegistrationHistory != null ? JSONObject.parseObject(jgRegistrationHistory.getChangeData()) : null;
     }
@@ -1907,6 +1909,7 @@ public class CommonServiceImpl implements ICommonService {
     public JSONArray queryHistoryDataObj(Long currentDocumentId) {
         LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
         lambda.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
+        lambda.eq(JgRegistrationHistory::getIsDelete, false);
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambda);
         if (jgRegistrationHistory != null) {
             String changeData = jgRegistrationHistory.getChangeData();
@@ -2079,6 +2082,7 @@ public class CommonServiceImpl implements ICommonService {
         jgUseRegistrations.forEach(x -> {
             LambdaQueryWrapper<JgRegistrationHistory> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(JgRegistrationHistory::getCurrentDocumentId, x.getSequenceNbr());
+            wrapper.eq(JgRegistrationHistory::getIsDelete, false);
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(wrapper);
             try {
                 if (jgRegistrationHistory.getChangeData().contains("8300")) {

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/IdxBizJgRegisterInfoServiceImpl.java

@@ -3186,6 +3186,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
         // lambda.eq(JgRegistrationHistory::getEquId, equipId);
         lambda.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
+        lambda.eq(JgRegistrationHistory::getIsDelete, false);
         lambda.eq(JgRegistrationHistory::getRegistrationClass, "使用登记");
         Integer integer = jgRegistrationHistoryService.getBaseMapper().selectCount(lambda);
         jgRegistrationHistory.setChangeData(JSON.toJSONString(map));

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/JgChangeRegistrationNameServiceImpl.java

@@ -176,6 +176,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
         lambda.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
         lambda.eq(JgRegistrationHistory::getRegistrationClass, CHANGE_NAME);
+        lambda.eq(JgRegistrationHistory::getIsDelete, false);
         Integer integer = jgRegistrationHistoryService.getBaseMapper().selectCount(lambda);
         if (integer > 0) {
             jgRegistrationHistory.setChangeData(JSON.toJSONString(map));
@@ -915,7 +916,10 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         }
 
         // 业务流水生成
-        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeRegistrationName.getSequenceNbr()).one();
+        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery()
+                .eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeRegistrationName.getSequenceNbr())
+                .eq(JgRegistrationHistory::getIsDelete, false)
+                .one();
         JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
         JSONObject dataList = JSONObject.parseObject(jsonObject.get("jgRegistrationInfo").toString());
         JSONArray objects = JSONObject.parseArray(dataList.get("dataList").toString());
@@ -1027,7 +1031,10 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         dtoMap.put("changeCertificate", JSON.parseArray(jgChangeRegistrationName.getChangeCertificate()));
         dtoMap.put("otherAccessories", JSON.parseArray(jgChangeRegistrationName.getOtherAccessories()));
         // 查询历史数据中选择的使用登记证信息
-        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr).one();
+        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery()
+                .eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr)
+                .eq(JgRegistrationHistory::getIsDelete, false)
+                .one();
         if (!ObjectUtils.isEmpty(jgRegistrationHistory)) {
             JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
             JSONObject dataList = JSONObject.parseObject(jsonObject.get("jgRegistrationInfo").toString());

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/JgChangeRegistrationReformServiceImpl.java

@@ -1239,7 +1239,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     private void restoreTechParams(JgChangeRegistrationReform jgChangeRegistrationReform) {
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(
                 new LambdaQueryWrapper<JgRegistrationHistory>()
-                        .eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeRegistrationReform.getApplyNo()));
+                        .eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeRegistrationReform.getApplyNo())
+                        .eq(JgRegistrationHistory::getIsDelete, false));
         if (jgRegistrationHistory == null) {
             return;
         }

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/JgChangeRegistrationTransferServiceImpl.java

@@ -605,7 +605,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         this.doCompensate(transfer);
         //查询设备详情
         JgRegistrationHistory historyData = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
-                .eq(JgRegistrationHistory::getCurrentDocumentId, transfer.getApplyNo()));
+                .eq(JgRegistrationHistory::getCurrentDocumentId, transfer.getApplyNo())
+                .eq(JgRegistrationHistory::getIsDelete, false));
         if (ValidationUtil.equals(FlowStatusEnum.TO_BE_FINISHED.getName(), transfer.getStatus())) {
             // 执行完成时查询历史表
             if (!ValidationUtil.isEmpty(historyData)) {
@@ -673,7 +674,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     private void delRepeatUseEquipData(JgChangeRegistrationTransfer transfer) {
         if (NOT_FLOWING_STATE.contains(transfer.getAuditStatus())) {
             JgRegistrationHistory historyData = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
-                    .eq(JgRegistrationHistory::getCurrentDocumentId, transfer.getApplyNo()));
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, transfer.getApplyNo())
+                    .eq(JgRegistrationHistory::getIsDelete, false));
             JSONObject historyJson = JSON.parseObject(historyData.getChangeData());
             List<Map<String, Object>> registrationList = (List<Map<String, Object>>) historyJson.get("registrationList");
             List<String> ids = registrationList.stream().map(v -> JSON.parseObject(v.toString()).getString("sequenceNbr")).collect(Collectors.toList());
@@ -791,7 +793,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             jgChangeRegistrationTransfer.setNextExecuteUserIds("");
             //流程执行完成后，更新设备使用信息
             JgRegistrationHistory historyData = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
-                    .eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeRegistrationTransfer.getApplyNo()));
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeRegistrationTransfer.getApplyNo())
+                    .eq(JgRegistrationHistory::getIsDelete, false));
             this.updateByFlowEnd(jgChangeRegistrationTransfer.getSequenceNbr().toString(), historyData);
             HashMap<String, Object> map = new HashMap<>();
             map.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());

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/JgChangeRegistrationUnitServiceImpl.java

@@ -190,7 +190,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         changeInfo.put("otherAccessoriesList", JSON.parse(notice.getOtherAccessories()));
         //查询使用登记证列表
         JgRegistrationHistory historyServiceOne = registrationHistoryService.getOne(
-                new LambdaQueryWrapper<JgRegistrationHistory>().eq(JgRegistrationHistory::getCurrentDocumentId, notice.getApplyNo()));
+                new LambdaQueryWrapper<JgRegistrationHistory>()
+                        .eq(JgRegistrationHistory::getCurrentDocumentId, notice.getApplyNo())
+                        .eq(JgRegistrationHistory::getIsDelete, false));
         changeInfo.put("registrationList", JSON.parse(historyServiceOne.getChangeData()));
         return new HashMap<String, Map<String, Object>>() {{
 //            this.put("changeRegisInfo", fillEquipInfoWithRuntimeOrHistoryData(notice, changeInfo));
@@ -976,7 +978,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                     updateTaskModel(registration, op);
                     //新增使用登记证和设备变更记录
                     this.saveRecord(registration);
-                    JgRegistrationHistory history = registrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, registration.getApplyNo()).one();
+                    JgRegistrationHistory history = registrationHistoryService.lambdaQuery()
+                            .eq(JgRegistrationHistory::getCurrentDocumentId, registration.getApplyNo())
+                            .eq(JgRegistrationHistory::getIsDelete, false)
+                            .one();
                     JSONArray historyJson = JSON.parseArray(history.getChangeData());
                     List<String> ids = historyJson.stream().map(v -> JSON.parseObject(v.toString()).getString("sequenceNbr")).collect(Collectors.toList());
                     List<JgUseRegistrationManage> list = useRegistrationManageService.lambdaQuery().in(BaseEntity::getSequenceNbr, ids).list();
@@ -1035,7 +1040,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
      * 删除 redis校验重复引用设备的数据
      */
     private void delRepeatUseEquipData(String applyNo, String status, String companyCode) {
-        JgRegistrationHistory history = registrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, applyNo).one();
+        JgRegistrationHistory history = registrationHistoryService.lambdaQuery()
+                .eq(JgRegistrationHistory::getCurrentDocumentId, applyNo)
+                .eq(JgRegistrationHistory::getIsDelete, false)
+                .one();
         // 获取使用登记证列表
         JSONArray registrationList = JSON.parseArray(history.getChangeData());
         if (CollectionUtils.isEmpty(registrationList)) {

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/JgChangeVehicleRegistrationUnitServiceImpl.java

@@ -421,6 +421,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
 
             LambdaQueryWrapper<JgRegistrationHistory> lambdaSelect = new QueryWrapper<JgRegistrationHistory>().lambda();
             lambdaSelect.eq(JgRegistrationHistory::getCurrentDocumentId, String.valueOf(sequenceNbr));
+            lambdaSelect.eq(JgRegistrationHistory::getIsDelete, false);
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambdaSelect);
             JSONObject historyData = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
             // 更新代办
@@ -462,7 +463,10 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
                 .eq(JgUseRegistrationManage::getIsDelete, 0)
                 .one();
         // 业务流水生成
-        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeVehicleRegistrationUnit.getSequenceNbr()).one();
+        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery()
+                .eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeVehicleRegistrationUnit.getSequenceNbr())
+                .eq(JgRegistrationHistory::getIsDelete, false)
+                .one();
         JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
         JSONArray dataList = JSONObject.parseArray(jsonObject.get("dataList").toString());
         ArrayList<JgCertificateChangeRecordEq> jgCertificateChangeRecordEqs = new ArrayList<>();
@@ -646,6 +650,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
         lambda.eq(JgRegistrationHistory::getCurrentDocumentId, dto.getSequenceNbr());
         lambda.eq(JgRegistrationHistory::getRegistrationClass, BUSINESS_NAME);
+        lambda.eq(JgRegistrationHistory::getIsDelete, false);
         Integer integer = jgRegistrationHistoryService.getBaseMapper().selectCount(lambda);
         if (integer > 0) {
             jgRegistrationHistory.setChangeData(JSON.toJSONString(map));
@@ -770,7 +775,11 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
     public Map<String, Object> getDetails(String sequenceNbr) {
         JgChangeVehicleRegistrationUnit registrationUnit = this.getById(sequenceNbr);
         this.doCompensate(registrationUnit);
-        JgRegistrationHistory history = jgRegistrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr).eq(JgRegistrationHistory::getRegistrationClass, BUSINESS_NAME).one();
+        JgRegistrationHistory history = jgRegistrationHistoryService.lambdaQuery()
+                .eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr)
+                .eq(JgRegistrationHistory::getRegistrationClass, BUSINESS_NAME)
+                .eq(JgRegistrationHistory::getIsDelete, false)
+                .one();
         if (!ObjectUtils.isEmpty(history) && !ObjectUtils.isEmpty(history.getChangeData())) {
             JSONObject object = JSONObject.parseObject(history.getChangeData());
             object.put("sequenceNbr", 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/JgEnableDisableServiceImpl.java

@@ -783,7 +783,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         Map<String, Object> resultMap = new HashMap<>();
         JgEnableDisable enableDisable = this.getById(sequenceNbr);
         this.doCompensate(enableDisable);
-        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>().eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr));
+        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
+                .eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr)
+                .eq(JgRegistrationHistory::getIsDelete, false));
         if (jgRegistrationHistory != null) {
             JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
             resultMap.putAll(jsonObject);

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/JgEquipTransferServiceImpl.java

@@ -151,7 +151,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
 
         List<JgEquipTransferEq> jgEquipTransferEqList = this.buildJgEquipTransferEqList(equipTransferEqList, transferList);
         jgEquipTransferEqMapper.insertBatchSomeColumn(jgEquipTransferEqList);
-        this.updateRedisBatch(transferList);
+        //this.updateRedisBatch(transferList);
         // 创建历史数据
         this.saveOrUpdateHisDataBatch(jgEquipTransferEqList);
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {//放在最后面防止前面有异常

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/JgInstallationNoticeServiceImpl.java

@@ -1689,7 +1689,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         list.forEach(item -> {
             // 设备信息
             List<JgInstallationNoticeEq> equList = jgInstallationNoticeEqService.lambdaQuery().eq(JgInstallationNoticeEq::getEquipTransferId, item.getSequenceNbr()).list();
-            JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, item.getSequenceNbr()).one();
+            JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery()
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, item.getSequenceNbr())
+                    .eq(JgRegistrationHistory::getIsDelete, false)
+                    .one();
             if (!ObjectUtils.isEmpty(jgRegistrationHistory) && !ObjectUtils.isEmpty(jgRegistrationHistory.getChangeData())) {
                 List<String> ids = equList.stream().map(JgInstallationNoticeEq::getEquId).collect(Collectors.toList());
                 Iterable<ESEquipmentCategoryDto> equips = esEquipmentCategory.findAllById(ids);

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/JgScrapCancelServiceImpl.java

@@ -774,7 +774,9 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         Map<String, Object> beanMap = BeanUtil.beanToMap(scrapCancel, false, true);
         beanMap.put("cancelCertificateList", JSON.parse(scrapCancel.getCancelCertificate()));
         beanMap.put("otherAccessories", JSON.parse(scrapCancel.getOtherAccessories()));
-        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>().eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr));
+        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
+                .eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr)
+                .eq(JgRegistrationHistory::getIsDelete, false));
         // 根据不同类型返回不同的字段、用于台套设备、气瓶、车用气瓶
         if (jgRegistrationHistory != null) {
             JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());

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/JgTransferNoticeServiceImpl.java

@@ -1011,6 +1011,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
         LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
         lambda.eq(JgRegistrationHistory::getCurrentDocumentId, seq);
+        lambda.eq(JgRegistrationHistory::getIsDelete, false);
         Integer integer = jgRegistrationHistoryService.getBaseMapper().selectCount(lambda);
         if (integer > 0) {
             jgRegistrationHistory.setChangeData(JSON.toJSONString(json));

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/JgUseRegistrationServiceImpl.java

@@ -414,6 +414,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // lambda.eq(JgRegistrationHistory::getEquId, equipId);
         lambda.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
         lambda.eq(JgRegistrationHistory::getRegistrationClass, "使用登记");
+        lambda.eq(JgRegistrationHistory::getIsDelete, false);
         Integer integer = jgRegistrationHistoryService.getBaseMapper().selectCount(lambda);
         if (integer > 0) {
             jgRegistrationHistory.setChangeData(JSON.toJSONString(map));
@@ -934,7 +935,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
             // 查询历史暂存表
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getOne(Wrappers.<JgRegistrationHistory>lambdaQuery()
-                    .eq(JgRegistrationHistory::getCurrentDocumentId, String.valueOf(sequenceNbr)));
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, String.valueOf(sequenceNbr))
+                    .eq(JgRegistrationHistory::getIsDelete, false));
             // 登记证记录主键
             Long changeRecordId = sequence.nextId();
 
@@ -1143,7 +1145,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             taskCode = workflowResultDto.getNextTaskCode();
         }
         JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(sequenceNbr);
-        LambdaQueryWrapper<JgUseRegistrationEq> eq = new QueryWrapper<JgUseRegistrationEq>().lambda().eq(JgUseRegistrationEq::getEquipTransferId, sequenceNbr);
+        LambdaQueryWrapper<JgUseRegistrationEq> eq = new QueryWrapper<JgUseRegistrationEq>().lambda()
+                .eq(JgUseRegistrationEq::getEquipTransferId, sequenceNbr)
+                .eq(JgUseRegistrationEq::getIsDelete, false);
         JgUseRegistrationEq jgUseRegistrationEq = jgRelationEquipMapper.selectOne(eq);
         jgUseRegistration.setEquipId(jgUseRegistrationEq.getEquId());
         jgUseRegistration.setNextTaskId(workflowResultDto.getNextTaskId());
@@ -1218,6 +1222,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
             LambdaQueryWrapper<JgRegistrationHistory> lambdaSelect = new QueryWrapper<JgRegistrationHistory>().lambda();
             lambdaSelect.eq(JgRegistrationHistory::getCurrentDocumentId, String.valueOf(sequenceNbr));
+            lambdaSelect.eq(JgRegistrationHistory::getIsDelete, false);
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambdaSelect);
             JSONObject mapData = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
             // 设备ID
@@ -1540,7 +1545,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(id);
             if (!ObjectUtils.isEmpty(carNumber)) {
                 LambdaQueryWrapper<JgUseRegistrationEq> eq = new QueryWrapper<JgUseRegistrationEq>().lambda()
-                        .eq(JgUseRegistrationEq::getEquipTransferId, jgUseRegistration.getSequenceNbr());
+                        .eq(JgUseRegistrationEq::getEquipTransferId, jgUseRegistration.getSequenceNbr())
+                        .eq(JgUseRegistrationEq::getIsDelete, false);
                 JgUseRegistrationEq jgUseRegistrationEq = jgRelationEquipMapper.selectOne(eq);
                 // 更新安全追溯-场内车辆中的“车牌号字段” 保证唯一性
                 LambdaQueryWrapper<IdxBizJgRegisterInfo> wrapper = new LambdaQueryWrapper<>();
@@ -1635,6 +1641,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             this.update(jgUseRegistration, lambda);
             LambdaQueryWrapper<JgUseRegistration> queryWrapper = new QueryWrapper<JgUseRegistration>().lambda();
             queryWrapper.eq(JgUseRegistration::getInstanceId, instanceId);
+            queryWrapper.eq(JgUseRegistration::getIsDelete, false);
             JgUseRegistration data = this.baseMapper.selectOne(queryWrapper);
             // 设备信息
             JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(data));
@@ -1647,6 +1654,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             if (!"unit".equals(manageType)) {
                 LambdaQueryWrapper<JgUseRegistrationEq> lambda1 = new QueryWrapper<JgUseRegistrationEq>().lambda();
                 lambda1.eq(JgUseRegistrationEq::getEquipTransferId, String.valueOf(data.getSequenceNbr()));
+                lambda1.eq(JgUseRegistrationEq::getIsDelete, false);
                 JgUseRegistrationEq jgUseRegistrationEq = jgRelationEquipMapper.selectOne(lambda1);
                 jsonObject.put("equipId", jgUseRegistrationEq.getEquId());
             }
@@ -1675,13 +1683,22 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 删除代办 + 中止流程
             commonServiceImpl.deleteTaskModel(String.valueOf(id), useRegistration.getInstanceId());
             // 删除单子
-            this.baseMapper.deleteById(id);
-            // 删除对应eq
-            jgUseRegistrationEqService.getBaseMapper().delete(new LambdaQueryWrapper<JgUseRegistrationEq>()
-                    .eq(JgUseRegistrationEq::getEquipTransferId, id));
+            //this.baseMapper.deleteById(id);
+            LambdaUpdateWrapper<JgUseRegistration> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.eq(JgUseRegistration::getSequenceNbr, id).set(JgUseRegistration::getIsDelete, true);
+            this.update(updateWrapper);
+
+            // 更新 eq 对应数据的 isDelete 字段为true（逻辑删除）
+            jgUseRegistrationEqService.getBaseMapper().update(null, new LambdaUpdateWrapper<JgUseRegistrationEq>()
+                            .eq(JgUseRegistrationEq::getEquipTransferId, id)
+                            .set(JgUseRegistrationEq::getIsDelete, true)
+            );
             // 删除单子对应历史表数据
-            jgRegistrationHistoryService.getBaseMapper().delete(new LambdaQueryWrapper<JgRegistrationHistory>()
-                    .eq(JgRegistrationHistory::getCurrentDocumentId, useRegistration.getSequenceNbr()));
+            jgRegistrationHistoryService.getBaseMapper().update(null,
+                    new LambdaUpdateWrapper<JgRegistrationHistory>()
+                            .eq(JgRegistrationHistory::getCurrentDocumentId, useRegistration.getSequenceNbr())
+                            .set(JgRegistrationHistory::getIsDelete, true)
+            );
         });
     }
 
@@ -1691,6 +1708,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             this.doCompensate(jgUseRegistration);
             LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
             lambda.eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr);
+            lambda.eq(JgRegistrationHistory::getIsDelete, false);
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambda);
             JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
             jsonObject.put("receiveOrgCode", jgUseRegistration.getReceiveCompanyCode() + "_" + jgUseRegistration.getReceiveOrgName());
@@ -2066,7 +2084,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         total = allEquipment.size();
         AgencyUserModel result = new AgencyUserModel();
         JgUseRegistration jgUseRegistration = jgUseRegistrationMapper.selectOne(new QueryWrapper<JgUseRegistration>().lambda()
-                .eq(JgUseRegistration::getSequenceNbr, useRegistrationSeqs.get(0)));
+                .eq(JgUseRegistration::getSequenceNbr, useRegistrationSeqs.get(0)).eq(JgUseRegistration::getIsDelete, false));
         // 暂时拿第一条的 监管部门和安全管理人员
         JSONObject jsonObjectFirst = new JSONObject();
         if (!ValidationUtil.isEmpty(registrationHistoryList.get(0))) {
@@ -2569,7 +2587,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      */
     private void invalidUseRegistrationCertificate(JgUseRegistration jgUseRegistration) {
         Integer count = jgUseRegistrationMapper.selectCount(new LambdaQueryWrapper<JgUseRegistration>()
-                .eq(JgUseRegistration::getUseRegistrationCode, jgUseRegistration.getUseRegistrationCode()));
+                .eq(JgUseRegistration::getUseRegistrationCode, jgUseRegistration.getUseRegistrationCode())
+                .eq(JgUseRegistration::getIsDelete, false));
         // 一证对应多条使用登记单时，不作废证
         if (count > 1) {
             return;
@@ -2688,6 +2707,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     public void handleErrorForm(String applyNo) {
         LambdaQueryWrapper<JgUseRegistration> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(JgUseRegistration::getApplyNo, applyNo);
+        queryWrapper.eq(JgUseRegistration::getIsDelete, false);
         JgUseRegistration jgUseRegistration = this.baseMapper.selectOne(queryWrapper);
         LambdaQueryWrapper<JgUseRegistrationManage> wrapper = new LambdaQueryWrapper<JgUseRegistrationManage>()
                 .eq(JgUseRegistrationManage::getApplyNo, applyNo);

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/JgVehicleInformationServiceImpl.java

@@ -837,6 +837,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
 
             LambdaQueryWrapper<JgRegistrationHistory> lambdaSelect = new QueryWrapper<JgRegistrationHistory>().lambda();
             lambdaSelect.eq(JgRegistrationHistory::getCurrentDocumentId, String.valueOf(sequenceNbr));
+            lambdaSelect.eq(JgRegistrationHistory::getIsDelete, false);
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambdaSelect);
             String jsonData = jgRegistrationHistory.getChangeData();
             JSONArray jsonArray = JSONArray.parseArray(jsonData);