reafact(jyjc): 属地调整

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/dto/PipelinePushItemDto.java

@@ -70,4 +70,6 @@ public class PipelinePushItemDto {
     @ApiModelProperty(value = "备注")
     private String remarks;
 
+    @ApiModelProperty(value = "属地监管部门名称")
+    private String localRegulator;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/InspectionEquipData.java

@@ -73,6 +73,9 @@ public class InspectionEquipData {
     @ApiModelProperty(value = "登记机关")
     private String regUnitName;
 
+    @ApiModelProperty(value = "属地监管部门名称")
+    private String localRegulator;
+
     @ApiModelProperty(value = "维保单位统一社会信用代码")
     private String meUnitCreditCode;
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/event/listener/InspectionApplicationPushEventListener.java

@@ -156,6 +156,8 @@ public class InspectionApplicationPushEventListener {
     private final static List<String> DSJ_ARRAY = Arrays.asList("DQJY", "SCJY");
 
     private static final BigDecimal ZERO = new BigDecimal("0.000");
+    @Autowired
+    private IdxBizJgSupervisionInfoMapper idxBizJgSupervisionInfoMapper;
 
 
     @TransactionalEventListener(value = InspectionApplicationPushEvent.class)
@@ -246,8 +248,8 @@ public class InspectionApplicationPushEventListener {
             BeanUtil.copyProperties(applicationModel, pushDataPipeline);
             pushDataPipeline.setPipelineClass(applicationModel.getEquCategory());
             pushDataPipeline.setSuperviseOrgName(this.getSuperviseNameByCode(applicationModel.getApplicationUnitCode()));
-            this.setProjectContraptionInfo(applicationModel.getProjectContraptionId(), pushDataPipeline);
-            pushDataPipeline.setInspectionEquips(this.getPipelines(applicationModel));
+            IdxBizJgProjectContraption projectContraption = this.setProjectContraptionInfo(applicationModel.getProjectContraptionId(), pushDataPipeline);
+            pushDataPipeline.setInspectionEquips(this.getPipelines(applicationModel,projectContraption));
             pushDataPipeline.setTotalLength(calTotalLength(pushDataPipeline.getInspectionEquips()));
             pushDataPipeline.setTraceId(traceId + "");
             pushDataPipeline.setApplicationUnitAddress(applicationUnitAddress);
@@ -282,23 +284,25 @@ public class InspectionApplicationPushEventListener {
         return commonService.buildFullAddress(baseEnterpriseInfo);
     }
 
-    private List<PipelinePushItemDto> getPipelines(JyjcInspectionApplicationModel applicationModel) {
+    private List<PipelinePushItemDto> getPipelines(JyjcInspectionApplicationModel applicationModel, IdxBizJgProjectContraption projectContraption) {
         List<Map<String, Object>> pipelines = inspectionApplicationService.getPipelines(applicationModel);
         return pipelines.stream().map(p -> {
             PipelinePushItemDto resultItemDto = new PipelinePushItemDto();
             BeanUtil.copyProperties(p, resultItemDto);
             resultItemDto.setEquipId(p.get("record").toString());
+            resultItemDto.setLocalRegulator(projectContraption.getOrgName());
             return resultItemDto;
         }).collect(Collectors.toList());
     }
 
-    private void setProjectContraptionInfo(String projectContraptionId, InspectionApplicationPushDataPipeline pushDataPipeline) {
+    private IdxBizJgProjectContraption setProjectContraptionInfo(String projectContraptionId, InspectionApplicationPushDataPipeline pushDataPipeline) {
         IdxBizJgProjectContraption idxBizJgProjectContraption = projectContraptionMapper.selectById(projectContraptionId);
         if (idxBizJgProjectContraption != null) {
             pushDataPipeline.setDeviceName(idxBizJgProjectContraption.getProjectContraption());
             pushDataPipeline.setAddress(getDetailAddress(idxBizJgProjectContraption));
             pushDataPipeline.setUseRegistrationCode(idxBizJgProjectContraption.getUseRegistrationCode());
         }
+        return idxBizJgProjectContraption;
     }
 
     private String getDetailAddress(IdxBizJgProjectContraption projectContraption) {
@@ -327,6 +331,8 @@ public class InspectionApplicationPushEventListener {
             this.setProductData(equipData, e.getEquipUnicode());
             // 设计信息
             this.setDesignInfo(equipData, e.getEquipUnicode());
+            // 属地信息
+            this.setSuperviseInfo(equipData, e.getEquipUnicode());
             // 维保单位信息
             this.setMaintenanceInfo(equipData, e.getEquipUnicode());
             // 单个查询执行，原因数据量较大 in 慢
@@ -337,6 +343,15 @@ public class InspectionApplicationPushEventListener {
         }).collect(Collectors.toList());
     }
 
+    private void setSuperviseInfo(InspectionEquipData equipData, String equipUnicode) {
+        IdxBizJgSupervisionInfo supervisionInfo = idxBizJgSupervisionInfoMapper.selectOne(new LambdaQueryWrapper<IdxBizJgSupervisionInfo>()
+                .eq(IdxBizJgSupervisionInfo::getRecord, equipUnicode)
+                .select(IdxBizJgSupervisionInfo::getRecord, IdxBizJgSupervisionInfo::getOrgBranchName));
+        if (supervisionInfo != null) {
+            equipData.setLocalRegulator(supervisionInfo.getOrgBranchName());
+        }
+    }
+
     private void setDesignInfo(InspectionEquipData equipData, String equipUnicode) {
         IdxBizJgDesignInfo designInfo = designInfoMapper.selectOne(new LambdaQueryWrapper<IdxBizJgDesignInfo>()
                 .eq(IdxBizJgDesignInfo::getRecord, equipUnicode)
@@ -395,7 +410,8 @@ public class InspectionApplicationPushEventListener {
             LambdaQueryWrapper<JgUseRegistrationManage> queryWrapper = new LambdaQueryWrapper<JgUseRegistrationManage>()
                     .eq(JgUseRegistrationManage::getUseRegistrationCode, equipData.getUseRegistrationCode())
                     .eq(JgUseRegistrationManage::getIsDelete, 0)
-                    .select(JgUseRegistrationManage::getReceiveCompanyCode, BaseEntity::getSequenceNbr);
+                    .select(JgUseRegistrationManage::getReceiveCompanyCode, BaseEntity::getSequenceNbr)
+                    .last("limit 1");
             JgUseRegistrationManage manage = jgUseRegistrationManageMapper.selectOne(queryWrapper);
             if (manage != null) {
                 equipData.setRegUnitName(companyCodeRegNameMap.getOrDefault(manage.getReceiveCompanyCode(), manage.getReceiveOrgName()));

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

@@ -85,6 +85,7 @@ import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -216,6 +217,12 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     @Lazy
     private DocUpdateService docUpdateService;
 
+    /**
+     * 预留属性：西安电梯是否禁用检验：true-禁用，不可报检；false-启用，可报检
+     */
+    @Value("${xa.dt.inspect.disabled:true}")
+    private Boolean xaDtInspectDisabled;
+
 
     @NotNull
     public static List<DictionarieModel> getDictionarieModels(String bizTypes) {
@@ -1675,7 +1682,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
      * @param boolMust  匹配条件
      */
     private void disableXADT(String equListCode, BoolQueryBuilder boolMust) {
-        if(EquipmentClassifityEnum.DT.getCode().equals(equListCode)){
+        if(xaDtInspectDisabled && EquipmentClassifityEnum.DT.getCode().equals(equListCode)){
             boolMust.mustNot(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(BizCommonConstant.XA_ORG_CODE) + "*"));
         }
     }