1.维保作废历史维保数据被清空bug

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgMaintenanceContractEqMapper.java

@@ -14,6 +14,4 @@ import java.util.List;
 public interface JgMaintenanceContractEqMapper extends CustomBaseMapper<JgMaintenanceContractEq> {
 
     Boolean deleteForBatch(@Param("ids") List<Long> ids);
-
-    void updateIdxBizJgRegisterInfo(@Param("list") List<String> list);
 }

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractEqMapper">
-    <update id="updateIdxBizJgRegisterInfo">
-        UPDATE idx_biz_jg_maintenance_record_info
-        SET
-        "ME_UNIT_NAME" = NULL,
-        "ME_UNIT_CREDIT_CODE" = NULL,
-        "ME_MASTER" = NULL,
-        "ME_MASTER_PHONE" = NULL,
-        "ME_MASTER_ID" = NULL,
-        "ME_MASTER1" = NULL,
-        "ME_MASTER1_PHONE" = NULL,
-        "ME_MASTER1_ID" = NULL,
-        "INFORM_START" = NULL,
-        "INFORM_END" = NULL,
-        "REPAIR_INFORM" = NULL
-        WHERE
-        RECORD IN
-        <foreach collection="list" item="id" index="index" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </update>
-
     <delete id="deleteForBatch">
         UPDATE amos_tzs_biz.tzs_jg_maintenance_contract_eq tjmce
         set tjmce.is_delete = 1

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

@@ -83,10 +83,6 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     @Autowired
     TzsServiceFeignClient tzsServiceFeignClient;
     @Autowired
-    RestHighLevelClient restHighLevelClient;
-    @Autowired
-    RedisUtils redisUtils;
-    @Autowired
     ICmWorkflowService workflowService;
     @Autowired
     CommonServiceImpl commonService;
@@ -111,9 +107,6 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     @Autowired
     private ICmWorkflowService iCmWorkflowService;
     @Autowired
-    IIdxBizJgUseInfoService useInfoService;
-
-    @Autowired
     EventPublisher eventPublisher;
 
     /**
@@ -724,6 +717,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             info.setInformStart(ObjectUtils.isEmpty(jgMaintenanceContract.getInformStart()) ? null : jgMaintenanceContract.getInformStart());
             info.setInformEnd(ObjectUtils.isEmpty(jgMaintenanceContract.getInformEnd()) ? null : jgMaintenanceContract.getInformEnd());
             info.setRepairInform(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceContract()) ? null : jgMaintenanceContract.getMaintenanceContract());
+            // 记录创建业务的id，在维保备案作废时，将对应的维保记录删除
+            info.setSourceId(id + "");
             maintenanceRecordInfoList.add(info);
         });
 
@@ -896,27 +891,14 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         queryWrapper.eq(JgMaintenanceContractEq::getEquipTransferId, maintenanceContract.getSequenceNbr());
         List<JgMaintenanceContractEq> equipmentLists = maintenanceContractEqMapper.selectList(queryWrapper);
         if (!CollectionUtils.isEmpty(equipmentLists)) {
-            List<String> list = equipmentLists.stream().filter(t -> t.getEquId() != null).map(JgMaintenanceContractEq::getEquId).collect(Collectors.toList());
-            maintenanceContractEqMapper.updateIdxBizJgRegisterInfo(list);
+            // 删除在审批完成时写入的设备维保记录
+            idxBizJgMaintenanceRecordInfoService.remove(new LambdaQueryWrapper<IdxBizJgMaintenanceRecordInfo>().eq(IdxBizJgMaintenanceRecordInfo::getSourceId, maintenanceContract.getSequenceNbr()));
             // 删除批量业务ID信息
-            List<String> equipTransferIds = equipmentLists.stream()
-                    .map(JgMaintenanceContractEq::getEquipTransferId)
-                    .filter(Objects::nonNull)
-                    .collect(Collectors.toList());
-            if (!equipTransferIds.isEmpty()) {
+            List<String> equipTransferIds = Collections.singletonList(maintenanceContract.getSequenceNbr().toString());
             jgResumeInfoService.deleteBatchByBusinessId(equipTransferIds);
-            }
             jgResumeInfoService.deleteBatchByBusinessId(equipmentLists.stream().filter(t -> t.getEquipTransferId() != null).map(JgMaintenanceContractEq::getEquId).collect(Collectors.toList()));
         }
     }
-//    private void delRepeatUseEquipData(JgMaintenanceContract maintenanceContract) {
-//        LambdaQueryWrapper<JgMaintenanceContractEq> queryWrapper = new LambdaQueryWrapper<>();
-//        queryWrapper.eq(JgMaintenanceContractEq::getEquipTransferId, maintenanceContract.getSequenceNbr());
-//        List<JgMaintenanceContractEq> maintenanceContractEq = maintenanceContractEqMapper.selectList(queryWrapper);
-//        for (JgMaintenanceContractEq jgMaintenanceContractEq : maintenanceContractEq) {
-//            EquipUsedCheckStrategyContext.getUsedStrategy("maintenanceContract").delDataForCheckEquipRepeatUsed(Collections.singletonList(jgMaintenanceContractEq.getEquId()), maintenanceContract.getReceiveOrgCode());
-//        }
-//    }
 
     private void finishedTask(JgMaintenanceContract maintenanceContract) {
         HashMap<String, Object> taskMap = new HashMap<>();

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

@@ -689,10 +689,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         taskV2Model.setFlowStatus(this.getTaskStatusByName(jgScrapCancelDto.getAuditStatus()));
         taskV2Model.setFlowStatusLabel(jgScrapCancelDto.getAuditStatus());
         taskV2Model.setTaskType(businessTypeJudgment(jgScrapCancelDto.getCancelType()).getCode());
-//        taskV2Model.setStartUser(jgScrapCancelDto.getRecUserName());
         taskV2Model.setTaskTypeLabel(businessTypeJudgment(jgScrapCancelDto.getCancelType()).getName());
-        taskV2Model.setStartDate(jgScrapCancelDto.getCreateDate());
-        taskV2Model.setStartUserId(jgScrapCancelDto.getCreateUserId());
         taskV2Model.setStartUserCompanyName(jgScrapCancelDto.getUseUnitName());
         taskV2Model.setExecuteUserIds(nextUserIds);
         taskV2Model.setFlowCode(jgScrapCancelDto.getNextTaskId());

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgMaintenanceRecordInfo.java

@@ -146,4 +146,10 @@ public class IdxBizJgMaintenanceRecordInfo extends TzsBaseEntity {
 
     @TableField(exist = false)
     private String supervisoryCode;
+
+    /**
+     * 原始业务id(如维保备案id)
+     */
+    @TableField("\"SOURCE_ID\"")
+    private String sourceId;
 }