Skip to content

A
amos-boot-biz
Commit 6f9f6179 authored by suhuiguang's avatar suhuiguang
Browse files
Options

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

parent 79c5067f
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 27 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationReformMapper.xml
View file @ 6f9f6179
...@@ -241,31 +241,60 @@ ...@@ -241,31 +241,60 @@
<select id="getDetailById" resultType="java.util.Map"> <select id="getDetailById" resultType="java.util.Map">
select ur.sequence_nbr as sequenceNbr, <choose>
ur.audit_status as auditStatus, <when test='equListCode != null and equListCode == "8000"'>
ur.use_unit_name as useUnitName, select ur.sequence_nbr as sequenceNbr,
ur.use_registration_code as useRegistrationCode, ur.audit_status as auditStatus,
ur.status, ur.use_unit_name as useUnitName,
ur.receive_org_name as receiveOrgName, ur.use_registration_code as useRegistrationCode,
DATE_FORMAT(ur.reg_date,'%Y-%m-%d') as regDate, ur.status,
DATE_FORMAT(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate, ur.receive_org_name as receiveOrgName,
(SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory, DATE_FORMAT(ur.reg_date,'%Y-%m-%d') as regDate,
jri.PRODUCT_NAME as productName, DATE_FORMAT(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
jri.EQU_CODE as equCode, pc.equ_category_name as equCategory,
use.USE_INNER_CODE as innerCode, pc.project_contraption as productName,
concat(use.PROVINCE_NAME,use.CITY_NAME,use.COUNTY_NAME,use.STREET_NAME,use.ADDRESS) as place, pc.equ_code as equCode,
ifnull(ur.instance_id, '') as instanceId, concat_ws('',pc.PROVINCE_NAME,pc.CITY_NAME,pc.COUNTY_NAME,pc.STREET_NAME, pc."ADDRESS") as place,
re.equ_id as equipId, ifnull(ur.instance_id, '') as instanceId,
ur.apply_no as applyNo, ur.apply_no as applyNo,
ifnull(ur.next_executor_ids,'') as nextExecutorIds, ifnull(ur.next_executor_ids,'') as nextExecutorIds,
ur.promoter, ur.promoter,
ur.supervisory_code as supervisoryCode, ur.supervisory_code as supervisoryCode,
ur.next_execute_user_ids as nextExecuteUserIds ur.next_execute_user_ids as nextExecuteUserIds
from tzs_jg_change_registration_reform ur from tzs_jg_change_registration_reform ur,
LEFT JOIN tzs_jg_change_registration_reform_eq re on ur.sequence_nbr = re.equip_transfer_id idx_biz_jg_project_contraption pc
LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD where
LEFT JOIN idx_biz_jg_use_info use on re.equ_id = use.RECORD ur.project_contraption_id = pc.sequence_nbr
where ur.sequence_nbr = #{id} 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>
<select id="queryForFlowingEquipList" <select id="queryForFlowingEquipList"
resultType="com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto"> 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
View file @ 6f9f6179
...@@ -336,7 +336,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR ...@@ -336,7 +336,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
commonServiceImpl.buildTaskModel(taskModelDtoList); commonServiceImpl.buildTaskModel(taskModelDtoList);
} }
} }
return this.getBaseMapper().getDetailById(jgChangeRegistrationReform.getSequenceNbr()); return this.getBaseMapper().getDetailById(jgChangeRegistrationReform.getSequenceNbr(), null);
} else { } else {
List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) map.get("equipmentLists"); List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) map.get("equipmentLists");
if (CollectionUtils.isEmpty(equipmentLists)) { if (CollectionUtils.isEmpty(equipmentLists)) {
...@@ -434,7 +434,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR ...@@ -434,7 +434,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
commonServiceImpl.buildTaskModel(taskModelDtoList); commonServiceImpl.buildTaskModel(taskModelDtoList);
} }
} }
return this.getBaseMapper().getDetailById(jgChangeRegistrationReform.getSequenceNbr()); return this.getBaseMapper().getDetailById(jgChangeRegistrationReform.getSequenceNbr(), "8000");
} }
} catch (BadRequest | } catch (BadRequest |
LocalBadRequest e) { LocalBadRequest e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment