Merge branch 'refs/heads/develop_tzs_bugfix' into develop_tzs_register

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

@@ -3,8 +3,10 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.annotation.ResultFieldMapping;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgProjectContraptionServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgProjectContraptionDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionDetectionInfo;
@@ -142,6 +144,9 @@ public class IdxBizJgProjectContraptionController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/detailsNotFormId")
 	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个管道工程装置表", notes = "根据sequenceNbr查询单个管道工程装置表")
+	@ResultFieldMapping({
+			@ResultFieldMapping.ResultFieldMap(sourceField = "result.useUnitCreditCode", targetField = "result.useUnitSeq", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitInfoByCreditCode")
+	})
 	// 传record的原因是前端组件内部写死了，此处是工程装置表seq
 	public ResponseModel<Object> detailsNotFormId(@RequestParam("record") String sequenceNbr) {
 		Map<String, Object> objectMap = idxBizJgProjectContraptionServiceImpl.details(sequenceNbr).get(EQUIP_INFO_FORM_ID);

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

@@ -283,7 +283,7 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getProjectContraption")
     @ApiOperation(httpMethod = "GET", value = "查询当前单位下工程装置信息", notes = "查询当前单位下工程装置信息")
-    public ResponseModel<Object> queryEquipCanUsedByVesselPageHistory() {
+    public ResponseModel<Object> queryEquipCanUsedByVesselPageHistory(@RequestParam(value = "equCategoryCode") String equCategoryCode) {
         ReginParams info = getSelectedOrgInfo();
         CompanyBo companyBo = info.getCompany();
         // 确保公司级别符合要求
@@ -297,7 +297,7 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
         String uscUnitCreditCode = type.contains("安装改造维修单位") ? companyCode : "";
 
         return ResponseHelper.buildResponse(
-                idxBizJgRegisterInfoService.getProjectContraption(uscUnitCreditCode, useUnitCreditCode)
+                idxBizJgRegisterInfoService.getProjectContraption(uscUnitCreditCode, useUnitCreditCode, equCategoryCode)
         );
     }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IIdxBizJgRegisterInfoService.java

@@ -46,7 +46,7 @@ public interface IIdxBizJgRegisterInfoService {
 
     Object savePressureVesselData(Map<String, Object> paramMap);
 
-    Object getProjectContraption(String uscUnitCreditCode, String useUnitCreditCode);
+    Object getProjectContraption(String uscUnitCreditCode, String useUnitCreditCode, String equCategoryCode);
 
     Boolean esSynchronousProjectContraption();
 

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

@@ -2440,15 +2440,15 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             } else if (ValidationUtil.equals(queryType, "GZ_GZ") || ValidationUtil.equals(queryType, "GZ_WX") || ValidationUtil.equals(queryType, "GZ_YZ")) {
                 BoolQueryBuilder syBuilder = QueryBuilders.boolQuery();
                 syBuilder.must(QueryBuilders.existsQuery("EQU_STATE"));
-                syBuilder.must(QueryBuilders.wildcardQuery("USE_ORG_CODE", "*"));
-                boolMust.must(syBuilder);
                 // 设备类别为工业管道（8300）时，用工程装置名称过滤
                 if (!ValidationUtil.isEmpty(map.get(EQU_CATEGORY_CODE)) && ValidationUtil.equals(map.get(EQU_CATEGORY_CODE), "8300")) {
+                    syBuilder.must(QueryBuilders.wildcardQuery("USE_ORG_CODE", "*"));
                     if (ValidationUtil.isEmpty(map.get("projectContraption"))) {
                         throw new BadRequest("请先选择工程装置信息！");
                     }
                     map.put(PROJECT_CONTRAPTION, String.valueOf(map.get("projectContraption")));
                 }
+                boolMust.must(syBuilder);
                 if (ValidationUtil.equals(queryType, "GZ_GZ")) {// 改造告知设备选择 - 业务限制
                     // 设备类别（EQU_CATEGORY）、安装单位（USC_UNIT_CREDIT_CODE）、选择的使用单位（USE_UNIT_CREDIT_CODE）、选择的区县（USE_PLACE_CODE）过滤数据
                     if (ValidationUtil.isEmpty(map.get("useUnitCreditCode")) || ValidationUtil.isEmpty(map.get("county"))) {
@@ -4494,8 +4494,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     }
 
     @Override
-    public Object getProjectContraption(String uscUnitCreditCode, String useUnitCreditCode) {
-        return this.baseMapper.getProjectContraption(uscUnitCreditCode, useUnitCreditCode);
+    public Object getProjectContraption(String uscUnitCreditCode, String useUnitCreditCode,String equCategoryCode) {
+        return this.baseMapper.getProjectContraption(uscUnitCreditCode, useUnitCreditCode, equCategoryCode);
     }
 
     @Override

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

@@ -26,9 +26,9 @@ public interface IdxBizJgRegisterInfoMapper extends BaseMapper<IdxBizJgRegisterI
     @Select("select code as dictDataKey,name as dictDataValue from tz_equipment_category where parent_id = ( SELECT sub.id from tz_equipment_category as sub where sub.code = #{equipCode}) order by dictDataKey desc")
     List<DictionarieValueModel> queryAllEquCategoriesUnderTheEquList(@Param("equipCode") String equipCode);
 
-    @MapKey("uscUnitCreditCode")
     List<Map<String, Object>> getProjectContraption(@Param("uscUnitCreditCode") String uscUnitCreditCode,
-                                          @Param("useUnitCreditCode") String useUnitCreditCode);
+                                                    @Param("useUnitCreditCode") String useUnitCreditCode,
+                                                    @Param("equCategoryCode")String equCategoryCode);
 
     @Select("SELECT SEQUENCE_NBR,REC_DATE,ORG_BRANCH_NAME,ORG_BRANCH_CODE,USE_UNIT_NAME,USE_UNIT_CREDIT_CODE,EQU_LIST_CODE,EQU_LIST,EQU_CATEGORY,EQU_CATEGORY_CODE,USE_ORG_CODE,CODE96333,EQU_CODE,SUPERVISORY_CODE,USE_PLACE,ADDRESS,EQU_STATE,STATUS,USE_INNER_CODE,FACTORY_NUM,PRODUCE_UNIT_NAME,INSPECT_REPORT,NEXT_INSPECT_DATE,CONSTRUCTION_TYPE,USC_UNIT_CREDIT_CODE,USC_UNIT_NAME,EQU_DEFINE,EQU_DEFINE_CODE,PRODUCT_NAME,BRAND_NAME,EQU_TYPE,DATA_SOURCE,IS_INTO_MANAGEMENT,WHETHER_VEHICLE_CYLINDER,WHETHER_SKID_MOUNTED_PRESSURE_VESSEL,DATE_FORMAT(PRODUCE_DATE,'%Y-%m-%d %H:%i:%s')as PRODUCE_DATE,PROJECT_CONTRAPTION from idx_biz_view_jg_all WHERE PROJECT_CONTRAPTION is not null")
     List<Map<String, Object>> esSynchronousProjectContraption();

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

@@ -3,13 +3,17 @@
 <mapper namespace="com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper">
 
 	<select id="getProjectContraption" resultType="java.util.Map">
-		SELECT jui.PROJECT_CONTRAPTION as value
-		FROM idx_biz_jg_construction_info jci
-		LEFT JOIN idx_biz_jg_use_info jui ON jci.RECORD = jui.RECORD
+		SELECT
+		jui.PROJECT_CONTRAPTION AS value
+		FROM idx_biz_jg_project_contraption jui
 		<where>
-			jui.PROJECT_CONTRAPTION IS NOT NULL AND TRIM ( jui.PROJECT_CONTRAPTION ) <![CDATA[ <> ]]> ''
+			jui.PROJECT_CONTRAPTION IS NOT NULL
+			AND TRIM(jui.PROJECT_CONTRAPTION) <![CDATA[ <> ]]> ''
+			<if test="equCategoryCode != null and equCategoryCode == '8300'">
+				AND jui.use_registration_code IS NOT NULL
+			</if>
 			<if test="uscUnitCreditCode != null and !uscUnitCreditCode.isEmpty()">
-				AND jci.USC_UNIT_CREDIT_CODE = #{uscUnitCreditCode}
+				AND jui.USC_UNIT_CREDIT_CODE = #{uscUnitCreditCode}
 			</if>
 			<if test="useUnitCreditCode != null and !useUnitCreditCode.isEmpty()">
 				AND jui.USE_UNIT_CREDIT_CODE = #{useUnitCreditCode}