Merge branch 'develop_tzs_main' into develop_tzs_register

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

@@ -350,6 +350,7 @@
         and pc.use_unit_credit_code=#{useUnitCreditCode}
         and (pc.project_contraption_parent_id is null or pc.project_contraption_parent_id = '')
         and pc.equ_category = '8300'
+        and (pc.equ_state != '3' or pc.equ_state is null)
         <if test="proIds != null and proIds.size() > 0">
             and pc.sequence_nbr not in
             <foreach collection="proIds" item="projectContraptionId" open="(" close=")" separator=",">

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

@@ -1047,9 +1047,9 @@
         FROM
             "tzs_jg_maintenance_contract_eq" as tjmce
             LEFT JOIN "tzs_jg_maintenance_contract" as tjmc ON tjmce."equip_transfer_id" = tjmc."sequence_nbr"
+            AND tjmc."status" = '已完成'
         WHERE
           tjmce."equ_id" = #{id}
-          AND tjmc."status" = '已完成'
           ORDER BY tjmce."rec_date" desc
           LIMIT 1
     </select>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/refresh/handler/EquipmentRefreshHandler.java

@@ -66,12 +66,18 @@ public class EquipmentRefreshHandler implements IDataRefreshHandler {
                 List<IdxBizJgInspectionDetectionInfo> inspectionDetectionInfos = iIdxBizJgInspectionDetectionInfoService.queryLastedGroupByInspectType(record);
                 IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = iIdxBizJgInspectionDetectionInfoService.queryNewestDetailByRecord(record);
                 IdxBizJgMaintenanceRecordInfo lastMaintenanceRecordInfo = maintenanceRecordInfoService.queryNewestDetailByRecord(record);
+                // 最新检验信息
                 StatisticsDataUpdateService.formatInspectDate(esEquipmentInfo, inspectionDetectionInfo, record);
+                // 发证日期
                 esEquipmentInfo.setIssueDate(getIssueDate(esEquipmentInfo.getUSE_ORG_CODE()));
+                // 最新维保信息
                 esEquipmentInfo.setMAINTAIN_UNIT(lastMaintenanceRecordInfo.getMeUnitCreditCode());
                 esEquipmentInfo.setMAINTAIN_UNIT_NAME(lastMaintenanceRecordInfo.getMeUnitName());
+                // 检验信息
                 esEquipmentInfo.setInspections(BeanUtil.copyToList(inspectionDetectionInfos, ESEquipmentInfo.Inspection.class));
+                // 维保信息
                 esEquipmentInfo.setMaintenances(lastMaintenanceRecordInfo.getSequenceNbr() != null ? Collections.singletonList(BeanUtil.copyProperties(lastMaintenanceRecordInfo, ESEquipmentInfo.Maintenance.class)) : new ArrayList<>());
+                // 技术参数
                 esEquipmentInfo.setTechParams(this.buildTechParamByEquList(record, esEquipmentInfo.getEQU_LIST_CODE()));
                 if (EquipmentClassifityEnum.YLGD.getCode().equals(esEquipmentInfo.getEQU_LIST_CODE())) {
                     List<ESEquipmentInfo.TechParam> techParams = esEquipmentInfo.getTechParams();

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

@@ -2571,6 +2571,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         Map<String, Object> installDetail = this.baseMapper.getInstallDetail(record);
         // 维保信息
         Map<String, Object> maintenanceDetail = this.baseMapper.getMaintenanceDetail(record);
+        if (ValidationUtil.isEmpty(maintenanceDetail)) {
+            maintenanceDetail = this.baseMapper.getMaintenanceDetailByIdx(record);
+        }
         if (!ObjectUtils.isEmpty(inspectDetail)) {
             detail.putAll(inspectDetail);
         }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/pom.xml

@@ -25,6 +25,12 @@
             <groupId>com.yeejoin</groupId>
             <artifactId>visual-feign-morphic</artifactId>
             <version>1.11.0-TZS</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.typroject</groupId>
+                    <artifactId>tyboot-core-foundation</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>