Merge remote-tracking branch 'origin/develop_tzs_test' into develop_tzs_register

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/XiAnDataDockController.java

@@ -28,7 +28,7 @@ public class XiAnDataDockController {
     /**
      * 西安除电梯外七大类设备批量导入
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @PostMapping(value = "/importData")
     @ApiOperation(httpMethod = "POST", value = "西安除电梯外七大类设备批量导入", notes = "西安除电梯外七大类设备批量导入")
     public Object importPressureData(@RequestParam MultipartFile file) {
@@ -53,7 +53,7 @@ public class XiAnDataDockController {
     /**
      * 西安电梯历史设备以及业务数据批量导入
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @PostMapping(value = "/importElevatorData")
     @ApiOperation(httpMethod = "POST", value = "西安电梯历史设备以及业务数据批量导入", notes = "西安电梯历史设备以及业务数据批量导入")
     public Object importElevatorData(@RequestParam MultipartFile file, @RequestParam(required = false, defaultValue = "true") Boolean isRegistration) {

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/OpenapiBizTokenMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.api.openapi.face.orm.entity.OpenapiBizToken;
 import org.apache.ibatis.annotations.Param;
@@ -32,6 +33,7 @@ public interface OpenapiBizTokenMapper extends BaseMapper<OpenapiBizToken> {
 	@Select("select DEVELOPER_AGENCY from iot_openapi_biz_token  where DEVELOPER_AGENCY is not null AND DATA_TYPE = 'cyl' group by DEVELOPER_AGENCY")
 	public List<String> getServiceList();
 
-	@Select("select use_unit_code, use_unit from amos_tzs_biz.tz_base_enterprise_info where app_id = '${appId}'")
+	@Select("select use_unit_code, use_unit from amos_tzs_biz.tz_base_enterprise_info where app_id = #{appId}")
+	@DS("tzs")
 	Map<String, String> queryUnitInfoByAppId(@Param("appId") String appId);
 }	
\ No newline at end of file

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/OpenapiBizTokenService.java

@@ -66,6 +66,8 @@ public class OpenapiBizTokenService extends BaseService<OpenapiBizTokenModel, Op
 		idPasswordAuthModel.setPassword(DesUtil.encode(systemUserInfo.getPassword(), Constant.PASSWORD_ENCODE_KEY));
 		BizTokenModel bizTokenModel = new BizTokenModel();
 		bizTokenModel.setAppId(appId);
+		bizTokenModel.setProduct(appId);
+
 		RequestContext.setProduct(appId);
 	    RequestContext.setAppKey(bizTokenModel.getAppKey());
 		FeignClientResult<HashMap<String, Object>> responseModel = Privilege.authClient.idpassword(idPasswordAuthModel);
@@ -73,9 +75,6 @@ public class OpenapiBizTokenService extends BaseService<OpenapiBizTokenModel, Op
 		String token = (String) authModel.get("token");
 		bizTokenModel.setToken(token);
 		RequestContext.setToken(token);
-//		AgencyUserModel user = Privilege.agencyUserClient.getme().getResult();
-//		bizTokenModel.setApiCompanyCode(user.getCompanys().get(0).getCompanyCode()); // 当前一个人只能有一个单位
-//		bizTokenModel.setApiCompanyName(user.getCompanys().get(0).getCompanyName()); // 当前一个人只能有一个单位
 		// 调整为从业务表根据appId查询单位信息
 		bizTokenModel.setApiCompanyCode(unitCode);
 		bizTokenModel.setApiCompanyName(unitName);

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/service/XiAnDataDockServiceImpl.java

@@ -783,7 +783,7 @@ public class XiAnDataDockServiceImpl {
         Map<String, Object> rMap = new HashMap<>();
         // 主线程中获取登录信息传递到异步线程中
         RequestContextWrapper contextWrapper = RequestContextWrapper.capture();
-        Set<String> importResult = ConcurrentHashMap.newKeySet(); // 使用线程安全的Set
+        Set<String> errorResult = ConcurrentHashMap.newKeySet(); // 使用线程安全的Set
         // 分批处理，但限制同时运行的批次数
         int maxConcurrentBatches = 5; // 最大并发批次数
         Semaphore semaphore = new Semaphore(maxConcurrentBatches);
@@ -812,7 +812,7 @@ public class XiAnDataDockServiceImpl {
                         Collection<?> data = (Collection<?>) resultMap.get("result");
                         data.stream()
                                 .filter(item -> item instanceof String)
-                                .forEach(item -> importResult.add((String) item));
+                                .forEach(item -> errorResult.add((String) item));
                     }
                     if (resultMap.containsKey("status") && Integer.parseInt(resultMap.get("status").toString()) != 200) {
                         throw new RuntimeException(resultMap.get("message").toString());
@@ -828,9 +828,9 @@ public class XiAnDataDockServiceImpl {
         }
         // 等待所有异步任务完成
         CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
-        if (!ValidationUtil.isEmpty(importResult)) {
-            rMap.put("message", importResult);
-            log.info("更新失败：{}", importResult);
+        if (!ValidationUtil.isEmpty(errorResult)) {
+            rMap.put("message", errorResult);
+            log.info("更新失败：{}", errorResult);
             return rMap;
         }
         log.info("设备保存成功");

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/CylinderSyncServiceImpl.java

@@ -19,7 +19,7 @@ import java.util.List;
  * @date 2022-03-04
  */
 @Service
-@DS("cyl")
+@DS("openapi")
 public class CylinderSyncServiceImpl {
 	@Autowired
 	private CylCylinderFillingCheckMapper fillingCheckMapper;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/converter/DictParamsConverter.java

@@ -73,6 +73,8 @@ public class DictParamsConverter implements Converter<String> {
         dictMap.put("GD2", "6007");
         dictMap.put("GB1", "8890");
         dictMap.put("GB2", "8891");
+        dictMap.put("GA1", "8888");
+        dictMap.put("GA2", "8889");
         dictMap.put("压缩天然气", "COMPRESSED_NATURAL_GAS");
         dictMap.put("液化天然气", "LIQUEFIED_NATURAL_GAS");
         dictMap.put("液化石油气", "LIQUEFIED_PETROLEUM_GAS");

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationUnit.java

@@ -26,7 +26,7 @@ public class JgChangeRegistrationUnit extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 变更类型（0转出，1转入）
+     * 变更类型（0-区内，1-区外）
      */
 	@TableField("change_type")
     private String changeType;

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

@@ -375,6 +375,10 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
     Map<String, String> queryTcmUnitInfoBySeq(@Param("unitSeq") String unitSeq, @Param("unitType") String unitType);
 
     String queryTcmUnitSeqByCreditCode(@Param("unitCreditCode") String unitCreditCode, @Param("unitType") String unitType);
+
     // 产权单位调整为可输入或选择--结束
+    List<Map<String, Object>> queryInMaintenanceRecord();
+
+    List<Map<String, Object>> queryInInspectionRecord();
 }
 

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

@@ -1177,7 +1177,7 @@
             SELECT "RECORD","NEXT_INSPECT_DATE",rowNum1
             FROM
             (
-                SELECT ROW_NUMBER () OVER ( PARTITION BY "RECORD" ORDER BY "INSPECT_DATE" DESC) AS rowNum1,"RECORD", "NEXT_INSPECT_DATE"
+                SELECT ROW_NUMBER () OVER ( PARTITION BY "RECORD" ORDER BY "INSPECT_DATE" DESC, REC_DATE DESC) AS rowNum1,"RECORD", "NEXT_INSPECT_DATE"
                 FROM
                 idx_biz_jg_inspection_detection_info where "NEXT_INSPECT_DATE" is not null
             ) d
@@ -3501,4 +3501,49 @@
             and unit_type = #{unitType}
         </if>
     </select>
+
+    <select id="queryInMaintenanceRecord" resultType="java.util.Map">
+        SELECT
+            ui."RECORD"
+        FROM
+            idx_biz_jg_use_info ui
+                LEFT JOIN idx_biz_jg_other_info oi ON oi."RECORD" = ui."RECORD"
+                LEFT JOIN idx_biz_jg_supervision_info si on si."RECORD" = ui."RECORD"
+                LEFT JOIN (
+                SELECT
+                    "RECORD", "INFORM_END", rowNum1
+                FROM
+                    (
+                        SELECT ROW_NUMBER() OVER (PARTITION BY "RECORD" ORDER BY "REC_DATE" DESC) AS rowNum1, "RECORD", "INFORM_END"
+                        FROM
+                            idx_biz_jg_maintenance_record_info where "INFORM_END" is not null
+                    ) d
+                WHERE d.rowNum1 = 1 and  d."INFORM_END" >= CURRENT_DATE
+            ) tt on tt."RECORD" = ui."RECORD"
+        WHERE si."ORG_BRANCH_CODE" like '50%'
+          and oi."CLAIM_STATUS" not in ('草稿','已拒领','待认领')
+          and tt."INFORM_END" is not null
+    </select>
+
+    <select id="queryInInspectionRecord" resultType="java.util.Map">
+        SELECT
+            ui."RECORD"
+        FROM
+            idx_biz_jg_use_info ui
+                LEFT JOIN idx_biz_jg_other_info oi ON oi."RECORD" = ui."RECORD"
+                LEFT JOIN idx_biz_jg_supervision_info si on si."RECORD" = ui."RECORD"
+                LEFT JOIN (
+                SELECT "RECORD", "NEXT_INSPECT_DATE", rowNum1
+                FROM
+                    (
+                        SELECT ROW_NUMBER () OVER ( PARTITION BY "RECORD" ORDER BY "INSPECT_DATE" DESC, "REC_DATE" DESC) AS rowNum1, "RECORD", "NEXT_INSPECT_DATE"
+                        FROM
+                            idx_biz_jg_inspection_detection_info where "NEXT_INSPECT_DATE" is not null
+                    ) d
+                WHERE d.rowNum1 =1 and  d."NEXT_INSPECT_DATE" >= CURRENT_DATE
+            ) tt on tt."RECORD" = ui."RECORD"
+        WHERE si."ORG_BRANCH_CODE" like '50%'
+          AND oi."CLAIM_STATUS" not in ('草稿','已拒领','待认领')
+          AND tt."NEXT_INSPECT_DATE" is not null
+    </select>
 </mapper>

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

@@ -1322,7 +1322,7 @@
                 </if>
             </otherwise>
         </choose>
-        ORDER BY ui.REC_DATE DESC
+        ORDER BY factoryNum ASC,ui.REC_DATE DESC
         ) aa
         <where>
             <if test="jsonObject.equDefineName != null and jsonObject.equDefineName != ''">
@@ -1443,7 +1443,7 @@
         <foreach collection="records" item="record" open="(" close=")" separator=",">
             #{record}
         </foreach>
-        ORDER BY ui.REC_DATE DESC
+        ORDER BY factoryNum ASC,ui.REC_DATE DESC
     </select>
     <select id="queryForFlowingEquipList"
             resultType="com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto">

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

@@ -232,4 +232,17 @@ public class JgChangeRegistrationUnitController extends BaseController {
         return ResponseHelper.buildResponse(businessType.equals("1") ? "单位变更" : "注销" + "业务，" + "申请单号：" + applyNos + "数据修改成功");
     }
 
+    /**
+     * 处理单位变更流程结束，业务未结束单子问题
+     * @param applyNo 申请单号
+     * @return s
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/handleChangeRegistrationUnitWrongData")
+    @ApiOperation(httpMethod = "POST", value = "处理单位变更流程结束，业务未结束单子问题", notes = "处理单位变更流程结束，业务未结束单子问题")
+    public ResponseModel<Object> handleChangeRegistrationUnitWrongData(@RequestParam("applyNo") String applyNo) {
+        jgChangeRegistrationUnitServiceImpl.handleChangeRegistrationUnitWrongData(applyNo);
+        return ResponseHelper.buildResponse("ok");
+    }
+
 }

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

@@ -2501,9 +2501,11 @@ public class CommonServiceImpl implements ICommonService {
             wrapper.eq(TzBaseEnterpriseInfo::getUseUnitCode, formData.getString("estateUnitName").split("_")[0]);
             //产权单位联系电话
             TzBaseEnterpriseInfo tzBaseEnterpriseInfo = enterpriseInfoMapper.selectOne(wrapper);
-            String contactPhone = tzBaseEnterpriseInfo.getContactPhone();
-            if (StringUtils.isNotEmpty(contactPhone)) {
-                formData.put("estatePhone", contactPhone);
+            if (!ValidationUtil.isEmpty(tzBaseEnterpriseInfo)) {
+                String contactPhone = tzBaseEnterpriseInfo.getContactPhone();
+                if (StringUtils.isNotEmpty(contactPhone)) {
+                    formData.put("estatePhone", contactPhone);
+                }
             }
             formData.put("CQUnitCode", formData.getString("estateUnitName").split("_")[0]);
             formData.put("estateUnitName", formData.getString("estateUnitName").split("_")[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/ElevatorDataTransactionService.java

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import io.seata.spring.annotation.GlobalTransactional;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Map;
+
+@Service
+public class ElevatorDataTransactionService {
+
+    private final DataDockServiceImpl dataDockService;
+
+    @Autowired
+    public ElevatorDataTransactionService(@Lazy DataDockServiceImpl dataDockService) {
+        this.dataDockService = dataDockService;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
+    public Object saveSingleElevatorData(Map<String, Object> equ) {
+        return dataDockService.saveElevatorDataInTransaction(equ, "jg_his_xa", null);
+    }
+}

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

@@ -31,7 +31,7 @@ public class IdxBizJgInspectionDetectionInfoServiceImpl extends BaseService<IdxB
     public IdxBizJgInspectionDetectionInfo queryNewestDetailByRecord(String record) {
         IdxBizJgInspectionDetectionInfo result = new IdxBizJgInspectionDetectionInfo();
         QueryWrapper<IdxBizJgInspectionDetectionInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(IdxBizJgInspectionDetectionInfo::getRecord,record).orderByDesc(IdxBizJgInspectionDetectionInfo::getInspectDate);
+        queryWrapper.lambda().eq(IdxBizJgInspectionDetectionInfo::getRecord,record).orderByDesc(IdxBizJgInspectionDetectionInfo::getInspectDate, IdxBizJgInspectionDetectionInfo::getRecDate);
         List<IdxBizJgInspectionDetectionInfo> inspectionDetectionInfoList = list(queryWrapper);
         if (!ValidationUtil.isEmpty(inspectionDetectionInfoList)) {
             BeanUtils.copyProperties(inspectionDetectionInfoList.get(0), result);

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

@@ -523,14 +523,13 @@ public class IdxBizJgProjectContraptionServiceImplService extends BaseEntityServ
         return getCheckResultMap(projectContraptionIdList, resultMap, inUseTimeMap);
     }
 
-    private Map<String, Boolean> getCheckResultMap(List<Long> projectContraptionIdList, Map<String, Boolean> resultMap, List<Map<String, Integer>> inUseTimeMap) {
+    private Map<String, Boolean> getCheckResultMap(List<Long> projectContraptionIdList,Map<String, Boolean> resultMap,List<Map<String, Integer>> inUseTimeMap) {
         for (Long projectContraptionId : projectContraptionIdList) {
             Optional<Integer> inUseCountOpt = inUseTimeMap.stream()
-                    .filter(map -> projectContraptionId.toString().equals(map.get("project_contraption_id")))
+                    .filter(map -> String.valueOf(projectContraptionId)
+                            .equals(String.valueOf(map.get("project_contraption_id"))))
                     .map(map -> map.get("inUseNumber"))
-                    .filter(Objects::nonNull)
                     .findFirst();
-
             Integer inUseCount = inUseCountOpt.orElse(0);
             resultMap.put(String.valueOf(projectContraptionId), inUseCount <= 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/IdxBizJgRegisterInfoServiceImpl.java

@@ -1231,10 +1231,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             esEquipmentCategoryDto.setSEQUENCE_NBR(recordList.toString());
             list.add(esEquipmentCategoryDto);
         }
-        // 删除校验，被引用时不可删除。管道不做是否引用校验，直接删除已有管道
-        if(!PipelineEnum.PRESSURE_PIPELINE.getCode().equals(map.get("equList"))) {
-            this.checkForDelete(records);
-        }
+        // 删除校验，被引用时不可删除。管道不做是否引用校验，直接删除已有管道(20251121注释，管道引用不能删除)
+        //if(!PipelineEnum.PRESSURE_PIPELINE.getCode().equals(map.get("equList"))) {
+            //this.checkForDelete(records);
+        //}
+        this.checkForDelete(records);
         if (CollUtil.isNotEmpty(records)) {
             // 删除涉及的19张表的数据
             superviseInfoMapper.deleteDataAll(records);

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

@@ -82,6 +82,8 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
     public static final String IDX_BIZ_VIEW_JG_ALL = "idx_biz_view_jg_all";
     public static final String equUseAddress = "equUseAddress";
     public static final String useRegistrationCode = "useRegistrationCode";
+    public static final String whetherVehicleCylinder = "WHETHER_VEHICLE_CYLINDER";
+    public static final String manageType = "manageType";
     public static final String USE_ORG_CODE = "USE_ORG_CODE";
     public static final String STATUS = "STATUS";
     public static final String record = "record";
@@ -809,6 +811,9 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
         JSONObject result = new JSONObject();
         result.put("applyNo", applyNo);
         result.put("useUnitName", jsonObject.getString("useUnitName"));
+        result.put("manageType", Objects.toString(jsonObject.get(manageType),"set"));
+        result.put("whetherVehicleCylinder", Objects.toString(jsonObject.get(whetherVehicleCylinder),"0"));
+        result.put("equCategoryCode", jsonObject.getString("equCategoryCode"));
         result.put("equUseAddress", jsonObject.getString("equUseAddress"));
         result.put("applicationReason", jsonObject.getString("applicationReason"));
         result.put("lossDamageTime", jsonObject.getString("lossDamageTime").substring(0, 10));
@@ -834,15 +839,24 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
      * @return
      */
     public Map<String, Object> queryEquByCertSeq(String sequenceNbr) {
-        JgUseRegistrationManage registrationManage = registrationManageService.getBaseMapper().selectOne(new LambdaQueryWrapper<JgUseRegistrationManage>().eq(JgUseRegistrationManage::getSequenceNbr, sequenceNbr).eq(JgUseRegistrationManage::getIsDelete, 0).select(JgUseRegistrationManage::getUseRegistrationCode, JgUseRegistrationManage::getEquUseAddress));
+        JgUseRegistrationManage registrationManage = registrationManageService.getBaseMapper()
+                .selectOne(new LambdaQueryWrapper<JgUseRegistrationManage>()
+                        .eq(JgUseRegistrationManage::getSequenceNbr, sequenceNbr)
+                        .eq(JgUseRegistrationManage::getIsDelete, 0)
+                        .select(JgUseRegistrationManage::getUseRegistrationCode,JgUseRegistrationManage::getUseUnitAddress,
+                                JgUseRegistrationManage::getEquUseAddress,JgUseRegistrationManage::getManageType));
         HashMap<String, Object> result = new HashMap<>();
         if (ValidationUtil.isEmpty(registrationManage)) {
             return result;
         }
-        List<JSONObject> equipmentLists = this.queryEquByCert(registrationManage.getUseRegistrationCode());
-        result.put(EQU_LISTS, equipmentLists);
+        List<JSONObject> list = queryEquByCert(registrationManage.getUseRegistrationCode());
+        result.put(EQU_LISTS, list);
+        result.put("whetherVehicleCylinder", list.stream().findFirst().map(j -> j.get(whetherVehicleCylinder))
+                .orElse("0"));
         result.put(useRegistrationCode, registrationManage.getUseRegistrationCode());
-        result.put(equUseAddress, StringUtils.isEmpty(registrationManage.getEquUseAddress())?  "" : registrationManage.getEquUseAddress());
+        result.put(manageType, registrationManage.getManageType());
+        result.put(equUseAddress, "unit".equals(registrationManage.getManageType())
+                        ? registrationManage.getUseUnitAddress() : registrationManage.getEquUseAddress());
         return result;
     }
 

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

@@ -652,7 +652,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      */
     @Override
     @ResultFieldMapping({
-            @ResultFieldMapping.ResultFieldMap(sourceField = "changeRegistrationTransfer.transferUseInfo",
+            @ResultFieldMapping.ResultFieldMap(sourceField = "changeRegistrationTransfer.estateUnitCode",
                     targetField = "changeRegistrationTransfer.estateUnitSeq",
                     serviceClass = CommonServiceImpl.class,
                     queryMethod = "queryTcmUnitSeqByCreditCode",

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ComprehensiveStatisticalAnalysisServiceImpl.java

@@ -1005,13 +1005,21 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                     }
                     dto.put("INFORMATION_SITUATION", informationSituation);
                 }
-                if (!ValidationUtil.isEmpty(dto.getString("CYLINDER_CATEGORY"))) {
+                Optional.ofNullable(dto.getJSONArray("inspections"))
+                        .ifPresent(arr -> arr.forEach(o -> {
+                            JSONObject j = (JSONObject) o;
+                            String v = j.getString("inspectReportNo");
+                            j.put("inspectReportNo", (v == null || "null".equalsIgnoreCase(v)) ? "" : v);
+                        }));
+                if (!ValidationUtil.isEmpty(dto.getString("CYLINDER_CATEGORY")) && dto.getString("EQU_CATEGORY_CODE").equals("2300")) {
                     String cylinderCategory = dto.getString("CYLINDER_CATEGORY");
                     boolean integer = isInteger(cylinderCategory);
                     if (integer) {
                         cylinderCategory = CylinderCategoryEnum.getName(cylinderCategory);
                     }
                     dto.put("CYLINDER_CATEGORY", cylinderCategory);
+                }else{
+                    dto.put("CYLINDER_CATEGORY", "");
                 }
                 dto.put("inspectStatus", inspectStatus);
                 list.add(dto);

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/CylinderOpenApiServiceImpl.java

@@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.rdbms.annotation.Condition;
 import org.typroject.tyboot.core.rdbms.annotation.Operator;
 
-@DS("cyl")
+@DS("openapi")
 @Service
 public class CylinderOpenApiServiceImpl {
 

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/ThreeSystemsMapper.xml

@@ -30,6 +30,7 @@
                 LEFT JOIN ${staticTableName} psd ON ei.use_code = psd.unit_code
         where
             ei.is_delete = '0'
+            and ei.data_sources = '陕西省内企业'
         GROUP BY
             ei.use_code
     </select>

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzsUserInfoMapper.xml

@@ -229,6 +229,7 @@
           AND pc.org_code IS NOT NULL
           AND tzei.is_delete = '0'
           AND pc.is_deleted = 'f'
+          and tzei.data_sources = '陕西省内企业'
           AND (tzei.unit_type <![CDATA[<>]]> '检验机构' OR tzei.unit_type <![CDATA[<>]]> '检测机构')
           AND tui.amos_user_id IN  (SELECT USER_ID FROM privilege_group_user WHERE GROUP_SEQ = #{groupId})
     </select>

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

@@ -105,7 +105,7 @@
         LEFT JOIN tzs_jg_use_registration ur
         ON ur.project_contraption_id = pl.project_contraption_id
         AND ur.is_delete = 0
-        AND ur.project_contraption_id != null
+        AND ur.project_contraption_id IS NOT NULL
         AND ur.status NOT IN ('使用单位待提交','一级受理已驳回','使用单位已撤回','已作废')
         LEFT JOIN tzs_jg_installation_notice ins
         ON ins.project_contraption_id = pl.project_contraption_id
@@ -382,7 +382,7 @@
         WITH target_use AS MATERIALIZED (
         SELECT "RECORD", project_contraption_id
         FROM idx_biz_jg_use_info
-        WHERE project_contraption_id != null and
+        WHERE project_contraption_id is not null and
         project_contraption_id IN
         <foreach collection="projectContraptionIdList" item="id" index="index" open="(" close=")" separator=",">
             #{id}

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

@@ -298,6 +298,7 @@
 			AND tjoa.status = '已完成'
 			and tjoa.open_biz_type = #{openBizType}
 			and tjoa.agency_classify != 'JYJGFL_ZJJG'
+		    and info.is_delete = '0'
 		<if test="list !=null and list.size()>0">
 			AND info.use_code in
 			<foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
@@ -414,6 +415,7 @@
 		<include refid="unit-list-info" />
 		where
 			 info.use_code = #{unitCode}
+			 and info.is_delete = '0'
 			 and exists (SELECT 1 from tz_jyjc_opening_application where unit_code = #{unitCode} and status = '已完成' and open_biz_type = #{openBizType})
 	</select>
 </mapper>