1.压力管道改造变更登记开发，作废

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

@@ -241,31 +241,60 @@
 
 
     <select id="getDetailById" resultType="java.util.Map">
-        select ur.sequence_nbr as sequenceNbr,
-        ur.audit_status as auditStatus,
-        ur.use_unit_name as useUnitName,
-        ur.use_registration_code as useRegistrationCode,
-        ur.status,
-        ur.receive_org_name as receiveOrgName,
-        DATE_FORMAT(ur.reg_date,'%Y-%m-%d') as regDate,
-        DATE_FORMAT(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
-        (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
-        jri.PRODUCT_NAME as productName,
-        jri.EQU_CODE as equCode,
-        use.USE_INNER_CODE as innerCode,
-        concat(use.PROVINCE_NAME,use.CITY_NAME,use.COUNTY_NAME,use.STREET_NAME,use.ADDRESS) as place,
-        ifnull(ur.instance_id, '') as instanceId,
-        re.equ_id as equipId,
-        ur.apply_no as applyNo,
-        ifnull(ur.next_executor_ids,'') as nextExecutorIds,
-        ur.promoter,
-        ur.supervisory_code  as supervisoryCode,
-        ur.next_execute_user_ids as nextExecuteUserIds
-        from tzs_jg_change_registration_reform ur
-        LEFT JOIN tzs_jg_change_registration_reform_eq re on ur.sequence_nbr = re.equip_transfer_id
-        LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD
-        LEFT JOIN idx_biz_jg_use_info use on re.equ_id = use.RECORD
-        where ur.sequence_nbr = #{id}
+       <choose>
+           <when test='equListCode != null and equListCode == "8000"'>
+               select ur.sequence_nbr as sequenceNbr,
+               ur.audit_status as auditStatus,
+               ur.use_unit_name as useUnitName,
+               ur.use_registration_code as useRegistrationCode,
+               ur.status,
+               ur.receive_org_name as receiveOrgName,
+               DATE_FORMAT(ur.reg_date,'%Y-%m-%d') as regDate,
+               DATE_FORMAT(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
+               pc.equ_category_name as equCategory,
+               pc.project_contraption as productName,
+               pc.equ_code as equCode,
+               concat_ws('',pc.PROVINCE_NAME,pc.CITY_NAME,pc.COUNTY_NAME,pc.STREET_NAME, pc."ADDRESS") as place,
+               ifnull(ur.instance_id, '') as instanceId,
+               ur.apply_no as applyNo,
+               ifnull(ur.next_executor_ids,'') as nextExecutorIds,
+               ur.promoter,
+               ur.supervisory_code  as supervisoryCode,
+               ur.next_execute_user_ids as nextExecuteUserIds
+               from tzs_jg_change_registration_reform ur,
+               idx_biz_jg_project_contraption pc
+               where
+               ur.project_contraption_id = pc.sequence_nbr
+               and ur.sequence_nbr = #{id}
+           </when>
+          <otherwise>
+              select ur.sequence_nbr as sequenceNbr,
+              ur.audit_status as auditStatus,
+              ur.use_unit_name as useUnitName,
+              ur.use_registration_code as useRegistrationCode,
+              ur.status,
+              ur.receive_org_name as receiveOrgName,
+              DATE_FORMAT(ur.reg_date,'%Y-%m-%d') as regDate,
+              DATE_FORMAT(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
+              (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
+              jri.PRODUCT_NAME as productName,
+              jri.EQU_CODE as equCode,
+              use.USE_INNER_CODE as innerCode,
+              concat(use.PROVINCE_NAME,use.CITY_NAME,use.COUNTY_NAME,use.STREET_NAME,use.ADDRESS) as place,
+              ifnull(ur.instance_id, '') as instanceId,
+              re.equ_id as equipId,
+              ur.apply_no as applyNo,
+              ifnull(ur.next_executor_ids,'') as nextExecutorIds,
+              ur.promoter,
+              ur.supervisory_code  as supervisoryCode,
+              ur.next_execute_user_ids as nextExecuteUserIds
+              from tzs_jg_change_registration_reform ur
+              LEFT JOIN tzs_jg_change_registration_reform_eq re on ur.sequence_nbr = re.equip_transfer_id
+              LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD
+              LEFT JOIN idx_biz_jg_use_info use on re.equ_id = use.RECORD
+              where ur.sequence_nbr = #{id}
+          </otherwise>
+       </choose>
     </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/service/impl/JgChangeRegistrationReformServiceImpl.java

@@ -336,7 +336,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                         commonServiceImpl.buildTaskModel(taskModelDtoList);
                     }
                 }
-                return this.getBaseMapper().getDetailById(jgChangeRegistrationReform.getSequenceNbr());
+                return this.getBaseMapper().getDetailById(jgChangeRegistrationReform.getSequenceNbr(), null);
             } else {
                 List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) map.get("equipmentLists");
                 if (CollectionUtils.isEmpty(equipmentLists)) {
@@ -434,7 +434,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                         commonServiceImpl.buildTaskModel(taskModelDtoList);
                     }
                 }
-                return this.getBaseMapper().getDetailById(jgChangeRegistrationReform.getSequenceNbr());
+                return this.getBaseMapper().getDetailById(jgChangeRegistrationReform.getSequenceNbr(), "8000");
             }
         } catch (BadRequest |
                 LocalBadRequest e) {