1.按照台套办理调整-作废功能

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

@@ -549,7 +549,7 @@
         <if test="jsonObject.record != null and jsonObject.record != ''" >
             and ui."RECORD" =  #{jsonObject.record}
         </if>
-        and not exists(SELECT 1 FROM tzs_jg_vehicle_information v, tzs_jg_vehicle_information_eq ve WHERE v.sequence_nbr = ve.vehicle_id AND ve.equ_id = ui."RECORD" and v.status !='使用单位待提交' and  v.status !='一级受理已驳回' and  v.status !='使用单位已撤回' )
+        and not exists(SELECT 1 FROM tzs_jg_vehicle_information v, tzs_jg_vehicle_information_eq ve WHERE v.sequence_nbr = ve.vehicle_id AND ve.equ_id = ui."RECORD" and v.status !='使用单位待提交' and  v.status !='一级受理已驳回' and  v.status !='使用单位已撤回' and  v.status !='已作废' )
         ORDER BY ui.REC_DATE DESC
     </select>
 

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

@@ -197,6 +197,7 @@
         and v.status !='使用单位待提交'
         and v.status !='一级受理已驳回'
         and v.status !='使用单位已撤回'
+        and v.status !='已作废'
         and v.sequence_nbr !=#{vehicleId}
         and ve.equ_id in
         <foreach collection="records" item="record" open="(" close=")" separator=",">

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

@@ -139,7 +139,7 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/equipCanUsedByVessel/page")
-    @ApiOperation(httpMethod = "GET", value = "车用气瓶设备列表查询", notes = "车用气瓶设备列表查询")
+    @ApiOperation(httpMethod = "GET", value = "查询车用气瓶可进行选择的设备列表", notes = "查询车用气瓶可进行选择的设备列表")
     public ResponseModel<Page<JSONObject>>queryEquipCanUsedByVesselPage(@RequestParam Map<String, Object> queryMap) {
         JSONObject jsonObject = new JSONObject(queryMap);
         return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.queryEquipCanUsedByVesselPage(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/IdxBizJgRegisterInfoServiceImpl.java

@@ -1882,7 +1882,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     }
 
     @Override
-    public Page<JSONObject> queryEquipCanUsedByVesselPage(JSONObject jsonObject) {
+    public Page<JSONObject>  queryEquipCanUsedByVesselPage(JSONObject jsonObject) {
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         String useUnitCreditCode = reginParams.getCompany().getCompanyCode();
         // 使用单位为个人时候 特殊处理

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

@@ -1063,6 +1063,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         commonServiceImpl.buildTaskModel(list);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public void flowExecute(Long id, String instanceId, String operate, String comment, String carNumber, String manageType, String nextTaskId) {
         String lockKey = CommonServiceImpl.buildJgExecuteLockKey(instanceId);
         RLock lock = redissonClient.getLock(lockKey);
@@ -1137,6 +1138,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         }
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public void withdraw(String instanceId, String nextTaskId, String manageType) {
         String lockKey = CommonServiceImpl.buildJgExecuteLockKey(instanceId);
         RLock lock = redissonClient.getLock(lockKey);
@@ -1242,6 +1244,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jsonObject.remove("submit");
             jsonObject.remove("instanceId");
             if (!"unit".equals(jgUseRegistration.getManageType())) {
+                // 作废时（完成时）equipId 为空
+                record = setDefaultRecord(jgUseRegistration, record);
                 // 需求：当申请信息由于设备信息错误被驳回及撤回时显示的数据还是旧设备数据，导致该申请单无法使用
                 // 解决方案：设备基本信息、制造信息、设计信息、安装信息、维保信息，已完成时显示历史数据、非完成时显示最新设备数据
                 this.fillHistoryDataWithNewEquip(jsonObject, jgUseRegistration, record);
@@ -1250,19 +1254,22 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 IdxBizJgRegisterInfo idxBizJgRegisterInfo = idxBizJgRegisterInfoMapper.selectOne(wrapper);
                 jsonObject.put("carNumber", idxBizJgRegisterInfo.getCarNumber());
             } else {
-                List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) jsonObject.get("equipmentLists");
-                List<String> records = equipmentLists.stream().map(v -> (String) v.get("record")).collect(Collectors.toList());
-                jsonObject.remove("equipmentLists");
-                if (CylinderTypeEnum.CYLINDER.getCode().equals(jsonObject.get("EQU_CATEGORY_CODE"))) {
-                    List<DictionarieValueModel> fillingMedium = Systemctl.dictionarieClient.dictValues("FILLING_MEDIUM").getResult();
-                    Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataValue));
-                    List<Map<String, Object>> result = jgUseRegistrationMapper.queryForUnitVesselEquipment(records);
-                    result.forEach(i -> {
-                        i.put("chargingMedium", fillingMediumMap.get(i.get("chargingMedium")));
-                    });
-                    jsonObject.put("equipmentLists", result);
-                } else {
-                    jsonObject.put("equipmentLists", jgUseRegistrationMapper.queryForUnitPipelineEquipment(records));
+                // 完成、作废时显示历史数据,其他状态显示实时数据
+                if (!(jgUseRegistration.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName()) || jgUseRegistration.getStatus().equals(FlowStatusEnum.TO_BE_DISCARD.getName()))) {
+                    List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) jsonObject.get("equipmentLists");
+                    List<String> records = equipmentLists.stream().map(v -> (String) v.get("record")).collect(Collectors.toList());
+                    jsonObject.remove("equipmentLists");
+                    if (CylinderTypeEnum.CYLINDER.getCode().equals(jsonObject.get("EQU_CATEGORY_CODE"))) {
+                        List<DictionarieValueModel> fillingMedium = Systemctl.dictionarieClient.dictValues("FILLING_MEDIUM").getResult();
+                        Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataValue));
+                        List<Map<String, Object>> result = jgUseRegistrationMapper.queryForUnitVesselEquipment(records);
+                        result.forEach(i -> {
+                            i.put("chargingMedium", fillingMediumMap.get(i.get("chargingMedium")));
+                        });
+                        jsonObject.put("equipmentLists", result);
+                    } else {
+                        jsonObject.put("equipmentLists", jgUseRegistrationMapper.queryForUnitPipelineEquipment(records));
+                    }
                 }
             }
             // 转化 附件 字段
@@ -1312,6 +1319,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return detail;
     }
 
+    private String setDefaultRecord(JgUseRegistration jgUseRegistration, String record) {
+        if (StringUtils.isEmpty(record)) {
+            JgUseRegistrationEq jgUseRegistrationEq = jgUseRegistrationEqService.getOne(new LambdaQueryWrapper<JgUseRegistrationEq>().eq(JgUseRegistrationEq::getEquipTransferId, jgUseRegistration.getSequenceNbr()));
+            record = jgUseRegistrationEq.getEquId();
+        }
+        return record;
+    }
+
     private Map<String, Object> getInspectDetail(String record) {
         LambdaQueryWrapper<IdxBizJgRegisterInfo> wrapper = new QueryWrapper<IdxBizJgRegisterInfo>().lambda().eq(IdxBizJgRegisterInfo::getRecord, record);
         IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(wrapper);
@@ -1598,7 +1613,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
     /**
      * 使用登记单条作废
-     * @param sequenceNbr 唯一标识
+     *
+     * @param sequenceNbr  唯一标识
      * @param cancelReason 作废原因
      * @return JgUseRegistration
      */
@@ -1620,7 +1636,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
     private void processElseDataByStatus(String flowStatus, JgUseRegistration jgUseRegistration) {
-        switch (flowStatus){
+        switch (flowStatus) {
             case "使用单位待提交":
                 // 1.删除暂存时生成的待办
                 commonServiceImpl.deleteTaskModel(jgUseRegistration.getSequenceNbr() + "");
@@ -1639,13 +1655,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 // iCmWorkflowService.stopProcess(jgUseRegistration.getInstanceId());
                 // 3.清空redis（缓存的流程中及已完成使用登记的设备）
                 this.clearDataForCheckEquipRepeatUsed(jgUseRegistration);
+
         }
     }
 
     private void clearUseInfoOfEquip(JgUseRegistration jgUseRegistration) {
         LambdaQueryWrapper<JgUseRegistrationEq> eqLambdaQueryWrapper = new LambdaQueryWrapper<JgUseRegistrationEq>().eq(JgUseRegistrationEq::getEquipTransferId, jgUseRegistration.getSequenceNbr());
         List<JgUseRegistrationEq> eqList = jgRelationEquipMapper.selectList(eqLambdaQueryWrapper);
-        eqList.forEach(e->{
+        eqList.forEach(e -> {
             String record = e.getEquId();
             // 1.使用信息表部分字段赋空
             this.rollBackUseInfo(record);
@@ -1662,7 +1679,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
     private void rollBackForEquipEsInfo(String record) {
         Optional<ESEquipmentCategoryDto> optional = esEquipmentCategory.findById(record);
-        if(optional.isPresent()){
+        if (optional.isPresent()) {
             ESEquipmentCategoryDto esEquipmentCategoryDto = optional.get();
             esEquipmentCategoryDto.setUSE_ORG_CODE(null);
             esEquipmentCategoryDto.setSTATUS(null);
@@ -1677,7 +1694,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         LambdaUpdateWrapper<IdxBizJgSupervisionInfo> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.eq(IdxBizJgSupervisionInfo::getRecord, record);
         updateWrapper.set(IdxBizJgSupervisionInfo::getOrgBranchName, null);
-        updateWrapper.set(IdxBizJgSupervisionInfo::getOrgBranchCode,null);
+        updateWrapper.set(IdxBizJgSupervisionInfo::getOrgBranchCode, null);
         updateWrapper.set(IdxBizJgSupervisionInfo::getCompanyOrgBranchCode, null);
         idxBizJgSupervisionInfoMapper.update(null, updateWrapper);
     }
@@ -1688,6 +1705,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 未注册，来源cb_data_dictionary type =  'ZC'
         updateWrapper.set(IdxBizJgRegisterInfo::getRegisterState, "6046");
         updateWrapper.set(IdxBizJgRegisterInfo::getUseOrgCode, null);
+        updateWrapper.set(IdxBizJgRegisterInfo::getCarNumber, null);
         idxBizJgRegisterInfoService.update(updateWrapper);
     }
 
@@ -1705,7 +1723,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         updateWrapper.set(IdxBizJgUseInfo::getEstateUnitCreditCode, null);
         updateWrapper.set(IdxBizJgUseInfo::getEstateUnitName, null);
         updateWrapper.set(IdxBizJgUseInfo::getUsePlace, null);
-        useInfoMapper.update(null,updateWrapper);
+        updateWrapper.set(IdxBizJgUseInfo::getLongitudeLatitude, null);
+        updateWrapper.set(IdxBizJgUseInfo::getAddress, null);
+        updateWrapper.set(IdxBizJgUseInfo::getSafetyManageDt, null);
+        updateWrapper.set(IdxBizJgUseInfo::getSafetyManagerId, null);
+        updateWrapper.set(IdxBizJgUseInfo::getSafetyManager, null);
+        updateWrapper.set(IdxBizJgUseInfo::getFactoryUseSiteStreet, null);
+        useInfoMapper.update(null, updateWrapper);
     }