Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/PipingExcelDto.java

@@ -128,6 +128,10 @@ public class PipingExcelDto extends BaseDto {
     @ExcelProperty(value = "检验报告编号")
     private String inspectReportNo;
 
+    @ApiModelProperty(value = "检验报告附件")
+    @ExcelIgnore
+    private String inspectReport;
+
     //-----------------------------------------------------------------------设计信息
 
     @ApiModelProperty(value = "设计单位统一社会信用代码")

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

@@ -80,6 +80,7 @@
             ur.supervision_org_code,
             ur.use_address as fullAddress,
             ur.cancel_reason as cancelReason,
+            ur.project_contraption_id as projectContraptionId,
             (select group_concat(re.equ_id) from tzs_jg_use_registration_eq re  where ur.sequence_nbr = re.equip_transfer_id) as equipId,
             (SELECT
                  group_concat(DISTINCT other.supervisory_code)

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

@@ -75,7 +75,7 @@ public class DataDockController {
      **/
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/savePipingData")
-    @ApiOperation(httpMethod = "POST", value = "工业管道批量保存", notes = "工业管道批量保存")
+    @ApiOperation(httpMethod = "POST", value = "工业 、公用、长输管道批量保存", notes = "工业 、公用、长输管道批量保存")
     @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<?> savePipingData(@RequestBody Map<String, Object> paramMap) {
         return ResponseHelper.buildResponse(dataDockService.savePipingData(paramMap));

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

@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgProjectContraptionMapper;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
@@ -29,6 +30,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -45,6 +47,8 @@ public class JgUseRegistrationController extends BaseController {
 
     @Autowired
     JgUseRegistrationServiceImpl jgUseRegistrationServiceImpl;
+    @Resource
+    private IdxBizJgProjectContraptionMapper jgProjectContraptionMapper;
 
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -143,6 +147,9 @@ public class JgUseRegistrationController extends BaseController {
         list.getRecords().forEach(x -> {
             x.put("companyType", info.getCompany().getCompanyType());
             x.put("regType", "1".equals(x.get("regType")) ? "历史登记": "2".equals(x.get("regType")) ? "特殊历史登记": "新增登记");
+            if ("8000".equals(String.valueOf(x.get("equListCode")))){
+                x.put("canVoided", jgProjectContraptionMapper.countContraptionInUseTimesForDeleteByIntoManagement(Long.parseLong((String) x.get("projectContraptionId"))) == 0);
+            }
         });
         return ResponseHelper.buildResponse(list);
     }

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

@@ -14,6 +14,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
@@ -23,10 +24,7 @@ import com.yeejoin.amos.boot.module.jg.api.converter.DictParamsConverter;
 import com.yeejoin.amos.boot.module.jg.api.converter.EquCategoryConverter;
 import com.yeejoin.amos.boot.module.jg.api.converter.EquDefineConverter;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
+import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.*;
@@ -45,6 +43,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
+import org.aspectj.weaver.ast.Var;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
@@ -56,6 +55,9 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.io.InputStream;
 import java.sql.Timestamp;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.temporal.ValueRange;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.regex.Pattern;
@@ -97,6 +99,8 @@ public class DataDockServiceImpl {
     private final TzsServiceFeignClient tzsServiceFeignClient;
     private final CommonServiceImpl commonService;
     private final JgRegistrationHistoryServiceImpl jgRegistrationHistoryService;
+    private final JgCertificateChangeRecordServiceImpl certificateChangeRecordService;
+    private final JgCertificateChangeRecordEqServiceImpl certificateChangeRecordEqService;
 
     private final Map<String, Object> resultError = new HashMap<>();
     List<String> useInnerCodeList = new ArrayList<>();// 单位内部编号集合
@@ -1433,12 +1437,34 @@ public class DataDockServiceImpl {
         }
     }
 
-    @GlobalTransactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     public Object savePipingData(Map<String, Object> paramMap) {
         // 获取数据
         JSONObject equipInfo = JSON.parseObject(toJSONString(paramMap.get("equipInfo")), JSONObject.class);
         JSONObject attachmentUpload = JSON.parseObject(toJSONString(paramMap.get("attachmentUpload")), JSONObject.class);
-        List<PipingExcelDto> equLists = JSONArray.parseArray(toJSONString(attachmentUpload.get("equLists"))).toJavaList(PipingExcelDto.class);
+        JSONArray equListsJSONArr = JSONArray.parseArray(toJSONString(attachmentUpload.get("equLists")));
+        List<PipingExcelDto> equLists = equListsJSONArr.toJavaList(PipingExcelDto.class);
+        for (int i = 0; i < equLists.size(); i++) {
+            PipingExcelDto equ = equLists.get(i);
+            JSONObject equJson = JSON.parseObject(toJSONString(equListsJSONArr.get(i)));
+            JSONArray fileDataArray = equJson.getJSONArray("fileData");
+
+            if (fileDataArray == null || fileDataArray.isEmpty()) {
+                continue;
+            }
+
+            for (Object arr : fileDataArray) {
+                JSONObject fileData = JSON.parseObject(toJSONString(arr));
+                if (ValidationUtil.isEmpty(fileData) || !"inspectReport".equals(fileData.getString("key"))) {
+                    continue;
+                }
+
+                JSONArray value = fileData.getJSONArray("value");
+                if (value != null) {
+                    equ.setInspectReport(value.toJSONString());
+                }
+            }
+        }
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
 
         // 监管——历史——管道——批量
@@ -1465,18 +1491,58 @@ public class DataDockServiceImpl {
             // 生成使用登记表信息 + 设备关系表 + 历史表
             JgUseRegistration useReg = this.saveUseRegAndEq(paramsDto, records, proCon);
             // 生成使用登记证表数据
-            this.saveUseRegManage(paramsDto, useReg);
+            JgUseRegistrationManage regManage = this.saveUseRegManage(paramsDto, useReg);
+            // 流水表
+            this.saveCertChangeRecord(useReg, regManage, records, paramsDto);
         }
         return Boolean.TRUE;
     }
 
+    public void saveCertChangeRecord(JgUseRegistration useReg, JgUseRegistrationManage regManage, List<String> records, EquipRequestParamsDto paramsDto) {
+        Long changeRecordId = sequence.nextId();
+        JgCertificateChangeRecord changeRecord = new JgCertificateChangeRecord()
+                .setApplyNo(useReg.getApplyNo())
+                .setReceiveOrgName(useReg.getReceiveOrgName())
+                .setAuditPassDate(new Date())
+                .setRegType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName())
+                .setRegDate(useReg.getCreateDate())
+                .setChangeContent(this.buildRecordContent(useReg, paramsDto))
+                .setUseRegistrationCode(useReg.getUseRegistrationCode())
+                .setReceiveCompanyCode(useReg.getReceiveCompanyOrgCode())
+                .setCertificateNo(regManage.getCertificateNo())
+                .setUseUnitCreditCode(useReg.getUseUnitCreditCode())
+                .setUseUnitName(useReg.getUseUnitName())
+                .setEquCategory(paramsDto.getEquCategoryCode())
+                .setCreateDate(new Date());
+        certificateChangeRecordService.save(changeRecord);
+        records.forEach(record -> {
+            JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
+            changeRecordEq.setChangeRecordId(String.valueOf(changeRecordId));
+            changeRecordEq.setEquId(record);
+            certificateChangeRecordEqService.save(changeRecordEq);
+        });
+    }
+
+    public String buildRecordContent(JgUseRegistration useReg, EquipRequestParamsDto paramsDto) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日");
+        return paramsDto.getCompanyName() + "的" + paramsDto.getExecUserName() + "办理了【" + "历史设备登记" + "】，" +
+                "单号【" + useReg.getApplyNo() + "】，办理日期" + simpleDateFormat.format(new Date());
+    }
+
     /**
-     * 检查本单位是否存在使用等级证编号
+     * 检查本单位是否存在使用等级证编号 + 不能是系统未生成的
      *
      * @param paramsDto
      */
     public void checkTheUnitRegManageAlreadyExists(EquipRequestParamsDto paramsDto) {
-        Integer useRegManageCount = jgUseRegistrationManageService.lambdaQuery().eq(JgUseRegistrationManage::getUseRegistrationCode, paramsDto.getCompanyCode()).eq(JgUseRegistrationManage::getUseUnitName, paramsDto.getCompanyName()).eq(JgUseRegistrationManage::getUseRegistrationCode, paramsDto.getUseOrgCode()).eq(JgUseRegistrationManage::getEquList, EquipmentClassifityEnum.getNameByCode(paramsDto.getEquListCode())).eq(JgUseRegistrationManage::getEquCategory, EquCategoryConverter.getKeyByValue(paramsDto.getEquCategoryCode())).count();
+        idxBizJgRegisterInfoServiceImpl.checkUseRegistrationCode(paramsDto.getUseOrgCode(),"unit");
+        Integer useRegManageCount = jgUseRegistrationManageService.lambdaQuery()
+                .eq(JgUseRegistrationManage::getUseUnitCreditCode, paramsDto.getCompanyCode())
+                .eq(JgUseRegistrationManage::getUseUnitName, paramsDto.getCompanyName())
+                .eq(JgUseRegistrationManage::getUseRegistrationCode, paramsDto.getUseOrgCode())
+                .eq(JgUseRegistrationManage::getEquList, paramsDto.getEquListName())
+                .eq(JgUseRegistrationManage::getEquCategory, paramsDto.getEquCategoryName())
+                .count();
         if (useRegManageCount > 0) {
             throw new BadRequest("系统已存在该使用登记证编号！");
         }
@@ -1722,13 +1788,13 @@ public class DataDockServiceImpl {
      */
     public JgUseRegistration saveUseRegAndEq(EquipRequestParamsDto paramsDto, List<String> records, IdxBizJgProjectContraption proCon) {
         ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
-        String spplyNo = listResponseModel.getResult().get(0);
+        String applyNo = listResponseModel.getResult().get(0);
         Long useRegseq = sequence.nextId();
         JgUseRegistration useReg = new JgUseRegistration()
                 .setSupervisoryCode(proCon.getSupervisoryCode())
                 .setUseUnitCreditCode(paramsDto.getCompanyCode())
                 .setUseUnitName(paramsDto.getCompanyName())
-                .setApplyNo(spplyNo)
+                .setApplyNo(applyNo)
                 .setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName())
                 .setStatus(FlowStatusEnum.TO_BE_FINISHED.getName())
                 .setReceiveOrgName(paramsDto.getReceiveOrgName())
@@ -1745,6 +1811,8 @@ public class DataDockServiceImpl {
                 .setCreateDate(new Date())
                 .setCreateUserId(paramsDto.getExecUserId())
                 .setCreateUserName(paramsDto.getExecUserName())
+                .setProjectContraptionId(String.valueOf(proCon.getSequenceNbr()))
+                .setProjectContraption(paramsDto.getProjectContraption())
                 .setRegDate(new Date());
         useReg.setSequenceNbr(useRegseq);
         jgUseRegistrationServiceImpl.save(useReg);
@@ -1759,7 +1827,7 @@ public class DataDockServiceImpl {
             jgUseRegistrationEqServiceImpl.save(useRegEq);
         });
 
-        JSONObject changeData = getJgUseRegistrationChangeData(paramsDto, records, spplyNo);
+        JSONObject changeData = getJgUseRegistrationChangeData(paramsDto, records, applyNo);
 
         JgRegistrationHistory registrationHistory = JgRegistrationHistory.builder()
                 .registrationClass("使用登记")
@@ -1778,6 +1846,7 @@ public class DataDockServiceImpl {
     }
 
     private JSONObject getJgUseRegistrationChangeData(EquipRequestParamsDto paramsDto, List<String> records, String spplyNo) {
+        String record = Optional.ofNullable(records.get(0)).orElse("");
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("receiveOrgCode", paramsDto.getReceiveOrgCode() + "_" + paramsDto.getReceiveOrgName());
         jsonObject.put("status", FlowStatusEnum.TO_BE_FINISHED.getName());
@@ -1789,6 +1858,18 @@ public class DataDockServiceImpl {
         }
         IdxBizJgProjectContraption projectContraption = idxBizJgProjectContraptionService.getById(paramsDto.getProjectContraptionSeq());
         jsonObject.put("pipelineLength", projectContraption.getPipelineLength());
+        jsonObject.put("useUnitCreditCode", paramsDto.getCompanyCode());
+        jsonObject.put("useUnitName", paramsDto.getCompanyName());
+        IdxBizJgConstructionInfo constructionInfo = idxBizJgConstructionInfoService.lambdaQuery().eq(IdxBizJgConstructionInfo::getRecord, record).orderByDesc(IdxBizJgConstructionInfo::getRecDate).one();
+        jsonObject.put("uscUnitCreditCode", constructionInfo.getUscUnitCreditCode());
+        jsonObject.put("uscUnitName", constructionInfo.getUscUnitName());
+        IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = idxBizJgInspectionDetectionInfoService.lambdaQuery().eq(IdxBizJgInspectionDetectionInfo::getRecord, record).orderByDesc(IdxBizJgInspectionDetectionInfo::getRecDate).one();
+        JSONObject inspectionDetectionInfoJO = (JSONObject) JSON.toJSON(inspectionDetectionInfo);
+        jsonObject.putAll(inspectionDetectionInfoJO);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        jsonObject.put("inspectDate", sdf.format(inspectionDetectionInfo.getInspectDate()));
+        jsonObject.put("nextInspectDate", sdf.format(inspectionDetectionInfo.getNextInspectDate()));
+        jsonObject.put("orgBranchCode", paramsDto.getOrgBranchCode() + "_" + paramsDto.getOrgBranchName());
         jsonObject.put("projectContraption", projectContraption.getProjectContraption());
         jsonObject.put("projectContraptionNo", projectContraption.getProjectContraptionNo());
         jsonObject.put("equipmentLists", jgUseRegistrationServiceImpl.getBaseMapper().queryForUnitPipelineEquipment(records));
@@ -1803,7 +1884,7 @@ public class DataDockServiceImpl {
      *
      * @param paramsDto
      */
-    public void saveUseRegManage(EquipRequestParamsDto paramsDto, JgUseRegistration useReg) {
+    public JgUseRegistrationManage saveUseRegManage(EquipRequestParamsDto paramsDto, JgUseRegistration useReg) {
         Map<String, String> equType = new HashMap<>();
         equType.put("equListCode", paramsDto.getEquCategoryCode());
         equType.put("equCategoryCode", paramsDto.getEquDefineCode());
@@ -1826,8 +1907,15 @@ public class DataDockServiceImpl {
                 .certificateStatus("已登记")
                 .regDate(new Date())
                 // .equUseAddress()
-                .useUnitAddress(paramsDto.getCompanyAddress()).manageType("unit").isScrap("0").version(1).build();
+                .createDate(new Date())
+                .createUserId(paramsDto.getExecUserId())
+                .useUnitAddress(paramsDto.getCompanyAddress())
+                .manageType("unit")
+                .isScrap("0")
+                .version(1)
+                .build();
         jgUseRegistrationManageService.save(registrationManage);
+        return registrationManage;
     }
 
     /**
@@ -1837,9 +1925,25 @@ public class DataDockServiceImpl {
      */
     public IdxBizJgProjectContraption saveProjectContraption(EquipRequestParamsDto paramsDto) {
         Long seq = sequence.nextId();
-        IdxBizJgProjectContraption contraption = IdxBizJgProjectContraption.builder().projectContraption(paramsDto.getProjectContraption()).projectContraptionNo(paramsDto.getProjectContraptionNo()).useUnitCreditCode(paramsDto.getCompanyCode()).useUnitName(paramsDto.getCompanyName())
+        IdxBizJgProjectContraption contraption = IdxBizJgProjectContraption.builder()
+                .projectContraption(paramsDto.getProjectContraption())
+                .projectContraptionNo(paramsDto.getProjectContraptionNo())
+                .useUnitCreditCode(paramsDto.getCompanyCode())
+                .useUnitName(paramsDto.getCompanyName())
                 // .uscUnitCreditCode().uscUnitName()
-                .equList(paramsDto.getEquListCode()).equListName(paramsDto.getEquListName()).equCategory(paramsDto.getEquCategoryCode()).equCategoryName(paramsDto.getEquCategoryName()).equDefine(paramsDto.getEquDefineCode()).equDefineName(paramsDto.getEquDefineName()).pipelineLength(paramsDto.getPipelineLength()).productPhoto(paramsDto.getProductPhoto()).otherAccessories(paramsDto.getOtherAccessories()).orgCode(paramsDto.getOrgBranchCode()).orgName(paramsDto.getOrgBranchName()).productQualificationCertificate(paramsDto.getProductQualificationCertificate())
+                .equList(paramsDto.getEquListCode())
+                .equListName(paramsDto.getEquListName())
+                .equCategory(paramsDto.getEquCategoryCode())
+                .equCategoryName(paramsDto.getEquCategoryName())
+                .equDefine(paramsDto.getEquDefineCode())
+                .equDefineName(paramsDto.getEquDefineName())
+                .pipelineLength(paramsDto.getPipelineLength())
+                .productPhoto(paramsDto.getProductPhoto())
+                .useRegistrationCode(paramsDto.getUseOrgCode())
+                .otherAccessories(paramsDto.getOtherAccessories())
+                .orgCode(paramsDto.getOrgBranchCode())
+                .orgName(paramsDto.getOrgBranchName())
+                .productQualificationCertificate(paramsDto.getProductQualificationCertificate())
                 // .province().provinceName().city().cityName().county().countyName().street().streetName().address()
                 .supervisoryCode(idxBizJgRegisterInfoServiceImpl.getSupervisoryCode(paramsDto.getVehicleApanage(), paramsDto.getEquCategoryCode())).isIntoManagement(Boolean.TRUE).dataSource(paramsDto.getDataSource()).equCode(paramsDto.getEquCode()).isFirstMerge(Boolean.FALSE).build();
         contraption.setSequenceNbr(seq);

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

@@ -209,7 +209,7 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
                             .collect(Collectors.joining())
             );
             record.setCanEdit(this.checkContraptionIsCanEdit(record.getSequenceNbr()));
-            record.setCanDelete(this.checkContraptionIsCanDelete(record.getSequenceNbr()));
+            record.setCanDelete(this.checkContraptionIsCanDelete(record.getSequenceNbr(),isIntoManagement));
             //判断是否有检验结果录入
             judgeCheckResult(record);
         });
@@ -236,8 +236,13 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
         return inUseTime <= 0;
     }
 
-    private Boolean checkContraptionIsCanDelete(Long projectContraptionId) {
-        Integer inUseTime = this.baseMapper.countContraptionInUseTimesForDelete(projectContraptionId);
+    private Boolean checkContraptionIsCanDelete(Long projectContraptionId,Boolean isIntoManagement) {
+        Integer inUseTime = 0;
+        if(isIntoManagement){
+            inUseTime= this.baseMapper.countContraptionInUseTimesForDeleteByIntoManagement(projectContraptionId);
+        }else {
+            inUseTime = this.baseMapper.countContraptionInUseTimesForDelete(projectContraptionId);
+        }
         return inUseTime <= 0;
     }
 

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

@@ -3991,7 +3991,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             JSONObject hisJson = JSON.parseObject(history.getChangeData());
             Map<String, Object> fieldMappings = new HashMap<>();
             fieldMappings.put("useRegistrationCode", projectContraption.getUseRegistrationCode());
-            fieldMappings.put("safetyManager", hisJson.get("safetyManager"));
+            fieldMappings.put("safetyManager", hisJson.get("safetyManagerId") + "_" +hisJson.get("safetyManager"));
             fieldMappings.put("useDate", hisJson.get("useDate"));
             fieldMappings.put("otherAccessories", hisJson.get("otherAccessories"));
             fieldMappings.put("factoryUseSiteStreet", hisJson.get("factoryUseSiteStreet"));
@@ -4002,6 +4002,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             fieldMappings.put("county", hisJson.get("county"));
             fieldMappings.put("longitudeLatitude", hisJson.get("longitudeLatitude"));
             fieldMappings.put("estateUnitName", hisJson.get("estateUnitName"));
+            fieldMappings.put("orgBranchCode", hisJson.get("orgBranchCode"));
             fieldMappings.forEach(re::put);
         }
     }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgProjectContraptionMapper.java

@@ -79,4 +79,11 @@ public interface IdxBizJgProjectContraptionMapper extends BaseMapper<IdxBizJgPro
      * 获取不为空的检验信息个数
      */
     int selectCheckCountByNotNull(@Param("sequenceNbr") String sequenceNbr);
+
+    /**
+     * 统计已纳管设备被引用的次数（只有存在就算引用-作废除外）
+     * @param projectContraptionId 设备唯一标识
+     * @return 被引用次数 > 0 则设备不可删除
+     */
+    Integer countContraptionInUseTimesForDeleteByIntoManagement(@Param("projectContraptionId")Long projectContraptionId);
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/IdxBizJgProjectContraptionMapper.xml

@@ -264,4 +264,112 @@
         A.inspectOrgName != NULL AND A.inspectOrgName != '' AND A.inspectConclusion!=NULL and A.inspectConclusion!=''
         and A.nextInspectDate  != NULL
     </select>
+
+    <select id="countContraptionInUseTimesForDeleteByIntoManagement" resultType="java.lang.Integer">
+        SELECT
+        SUM(inUseNumber)
+        FROM (
+        SELECT
+        COUNT(1) AS inUseNumber
+        FROM tzs_jg_equip_transfer a
+        LEFT JOIN tzs_jg_equip_transfer_eq b ON b.equip_transfer_id=a.sequence_nbr
+        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
+        WHERE c.project_contraption_id = #{projectContraptionId}
+        AND a.is_delete = 0
+        AND ( a.apply_status != '6617')
+        UNION
+        SELECT
+        COUNT(1) AS inUseNumber
+        FROM
+        tzs_jg_use_registration a
+        WHERE a.project_contraption_id = #{projectContraptionId}
+        AND a.is_delete = 0
+        AND ( a.status != '已作废')
+        UNION
+        SELECT
+        COUNT(1) AS inUseNumber
+        FROM tzs_jg_change_registration_unit a
+        LEFT JOIN tzs_jg_change_registration_unit_eq b ON b.unit_change_registration_id=a.sequence_nbr
+        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
+        WHERE c.project_contraption_id = #{projectContraptionId}
+        AND a.is_delete = 0
+        AND ( a.status != '已作废')
+        UNION
+        SELECT
+        COUNT(1) AS inUseNumber
+        FROM tzs_jg_enable_disable a
+        LEFT JOIN tzs_jg_enable_disable_eq b ON b.enable_disable_apply_id=a.sequence_nbr
+        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
+        WHERE c.project_contraption_id = #{projectContraptionId}
+        AND a.is_delete = 0
+        AND ( a.audit_status != '已作废')
+        UNION
+        SELECT
+        COUNT(1) AS inUseNumber
+        FROM tzs_jg_scrap_cancel a
+        LEFT JOIN tzs_jg_scrap_cancel_eq b ON b.equip_transfer_id=a.sequence_nbr
+        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
+        WHERE c.project_contraption_id = #{projectContraptionId}
+        AND a.is_delete = 0
+        AND ( a.audit_status != '使用单位已撤回')
+        UNION
+        SELECT
+        COUNT(1) AS inUseNumber
+        FROM tzs_jg_change_registration_transfer a
+        LEFT JOIN tzs_jg_change_registration_transfer_eq b ON b.equip_transfer_id=a.sequence_nbr
+        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
+        WHERE c.project_contraption_id = #{projectContraptionId}
+        AND a.is_delete = 0
+        AND ( a.audit_status != '使用单位已撤回')
+        UNION
+        SELECT
+        COUNT(1) AS inUseNumber
+        FROM tzs_jg_change_registration_name a
+        LEFT JOIN tzs_jg_change_registration_name_eq b ON b.name_change_registration_id=a.sequence_nbr
+        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
+        WHERE c.project_contraption_id = #{projectContraptionId}
+        AND a.is_delete = 0
+        AND ( a.audit_status != '使用单位已撤回')
+        UNION
+        SELECT
+        COUNT(1) AS inUseNumber
+        FROM
+        tzs_jg_installation_notice a
+        WHERE a.project_contraption_id = #{projectContraptionId}
+        AND (a.notice_status != '6617')
+        UNION
+        SELECT
+        COUNT(1) AS inUseNumber
+        FROM tzs_jg_maintain_notice a
+        LEFT JOIN tzs_jg_maintain_notice_eq b ON b.equip_transfer_id=a.sequence_nbr
+        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
+        WHERE c.project_contraption_id = #{projectContraptionId}
+        AND a.is_delete = 0
+        AND ( a.notice_status != '6617')
+        UNION
+        SELECT
+        COUNT(1) AS inUseNumber
+        FROM tzs_jg_reform_notice a
+        LEFT JOIN tzs_jg_reform_notice_eq b ON b.equip_transfer_id=a.sequence_nbr
+        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
+        WHERE c.project_contraption_id = #{projectContraptionId}
+        AND a.is_delete = 0
+        AND ( a.notice_status != '6617')
+        UNION
+        SELECT
+        COUNT(1) AS inUseNumber
+        FROM tzs_jg_transfer_notice a
+        LEFT JOIN tzs_jg_transfer_notice_eq b ON b.equip_transfer_id=a.sequence_nbr
+        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
+        WHERE c.project_contraption_id = #{projectContraptionId}
+        AND a.is_delete = 0
+        AND ( a.notice_status != '6617')
+        UNION
+        SELECT
+        COUNT(1) AS inUseNumber
+        FROM tz_jyjc_inspection_application a
+        WHERE a.project_contraption_id = #{projectContraptionId}
+        AND ( a.status != '6617')
+        )
+    </select>
 </mapper>