Skip to content

A
amos-boot-biz
Commit 1c186d22 authored by suhuiguang's avatar suhuiguang
Browse files
Options

1.设备编辑校验已完成的流程可以编辑设备

2.单位变更详情历史回显不完整bug
parent 7ae4e3d1
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 16 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml
View file @ 1c186d22
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
where where
a.sequence_nbr = b.equip_transfer_id a.sequence_nbr = b.equip_transfer_id
and b.equ_id = #{record} and b.equ_id = #{record}
and (a.status <![CDATA[ <> ]]> '使用单位待提交' and a.status <![CDATA[ <> ]]> '一级受理已驳回' and a.status <![CDATA[ <> ]]> '使用单位已撤回') and (a.status <![CDATA[ <> ]]> '使用单位待提交' and a.status <![CDATA[ <> ]]> '一级受理已驳回' and a.status <![CDATA[ <> ]]> '使用单位已撤回' and a.status <![CDATA[ <> ]]> '已完成')
UNION UNION
select select
count(1) as inUseNumber count(1) as inUseNumber
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
where where
a.sequence_nbr = b.equip_transfer_id a.sequence_nbr = b.equip_transfer_id
and b.equ_id = #{record} and b.equ_id = #{record}
and (a.audit_status <![CDATA[ <> ]]> '使用单位待提交' and a.audit_status <![CDATA[ <> ]]> '一级受理已驳回' and a.audit_status <![CDATA[ <> ]]> '使用单位已撤回') and (a.audit_status <![CDATA[ <> ]]> '使用单位待提交' and a.audit_status <![CDATA[ <> ]]> '一级受理已驳回' and a.audit_status <![CDATA[ <> ]]> '使用单位已撤回' and a.audit_status <![CDATA[ <> ]]> '已完成')
UNION UNION
select select
count(1) as inUseNumber count(1) as inUseNumber
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
where where
a.sequence_nbr = b.equip_transfer_id a.sequence_nbr = b.equip_transfer_id
and b.equ_id = #{record} and b.equ_id = #{record}
and (a.audit_status <![CDATA[ <> ]]> '使用单位待提交' and a.audit_status <![CDATA[ <> ]]> '一级受理已驳回' and a.audit_status <![CDATA[ <> ]]> '使用单位已撤回') and (a.audit_status <![CDATA[ <> ]]> '使用单位待提交' and a.audit_status <![CDATA[ <> ]]> '一级受理已驳回' and a.audit_status <![CDATA[ <> ]]> '使用单位已撤回' and a.audit_status <![CDATA[ <> ]]> '已完成')
UNION UNION
select select
count(1) as inUseNumber count(1) as inUseNumber
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
where where
a.sequence_nbr = b.unit_change_registration_id a.sequence_nbr = b.unit_change_registration_id
and b.equ_id = #{record} and b.equ_id = #{record}
and (a.status <![CDATA[ <> ]]> '使用单位待提交' and a.status <![CDATA[ <> ]]> '一级受理已驳回' and a.status <![CDATA[ <> ]]> '使用单位已撤回') and (a.status <![CDATA[ <> ]]> '使用单位待提交' and a.status <![CDATA[ <> ]]> '一级受理已驳回' and a.status <![CDATA[ <> ]]> '使用单位已撤回' and a.status <![CDATA[ <> ]]> '已完成')
UNION UNION
select select
count(1) as inUseNumber count(1) as inUseNumber
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
where where
a.sequence_nbr = b.enable_disable_apply_id a.sequence_nbr = b.enable_disable_apply_id
and b.equ_id = #{record} and b.equ_id = #{record}
and (a.audit_status <![CDATA[ <> ]]> '已驳回' and a.audit_status <![CDATA[ <> ]]> '已撤回' and a.audit_status <![CDATA[ <> ]]> '待提交') and (a.audit_status <![CDATA[ <> ]]> '已驳回' and a.audit_status <![CDATA[ <> ]]> '已撤回' and a.audit_status <![CDATA[ <> ]]> '待提交' and a.audit_status <![CDATA[ <> ]]> '已完成')
UNION UNION
select select
count(1) as inUseNumber count(1) as inUseNumber
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
where where
a.sequence_nbr = b.equip_transfer_id a.sequence_nbr = b.equip_transfer_id
and b.equ_id = #{record} and b.equ_id = #{record}
and (a.apply_status <![CDATA[ <> ]]> '6614' and a.apply_status <![CDATA[ <> ]]> '6615' and a.apply_status <![CDATA[ <> ]]> '6610') and (a.apply_status <![CDATA[ <> ]]> '6614' and a.apply_status <![CDATA[ <> ]]> '6615' and a.apply_status <![CDATA[ <> ]]> '6610' and a.apply_status <![CDATA[ <> ]]> '6616')
UNION UNION
select select
count(1) as inUseNumber count(1) as inUseNumber
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
where where
a.sequence_nbr = b.equip_transfer_id a.sequence_nbr = b.equip_transfer_id
and b.equ_id = #{record} and b.equ_id = #{record}
and (a.notice_status <![CDATA[ <> ]]> '6614' and a.notice_status <![CDATA[ <> ]]> '6615' and a.notice_status <![CDATA[ <> ]]> '6610') and (a.notice_status <![CDATA[ <> ]]> '6614' and a.notice_status <![CDATA[ <> ]]> '6615' and a.notice_status <![CDATA[ <> ]]> '6610' and a.notice_status <![CDATA[ <> ]]> '6616' )
UNION UNION
select select
count(1) as inUseNumber count(1) as inUseNumber
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
where where
a.sequence_nbr = b.equip_transfer_id a.sequence_nbr = b.equip_transfer_id
and b.equ_id = #{record} and b.equ_id = #{record}
and (a.notice_status <![CDATA[ <> ]]> '6614' and a.notice_status <![CDATA[ <> ]]> '6615' and a.notice_status <![CDATA[ <> ]]> '6610') and (a.notice_status <![CDATA[ <> ]]> '6614' and a.notice_status <![CDATA[ <> ]]> '6615' and a.notice_status <![CDATA[ <> ]]> '6610' and a.notice_status <![CDATA[ <> ]]> '6616')
UNION UNION
select select
count(1) as inUseNumber count(1) as inUseNumber
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
where where
a.sequence_nbr = b.equip_transfer_id a.sequence_nbr = b.equip_transfer_id
and b.equ_id = #{record} and b.equ_id = #{record}
and (a.status <![CDATA[ <> ]]> '维保单位已驳回' and a.status <![CDATA[ <> ]]> '使用单位已撤回' and a.status <![CDATA[ <> ]]> '使用单位待提交') and (a.status <![CDATA[ <> ]]> '维保单位已驳回' and a.status <![CDATA[ <> ]]> '使用单位已撤回' and a.status <![CDATA[ <> ]]> '使用单位待提交' and a.status <![CDATA[ <> ]]> '已完成')
UNION UNION
select select
count(1) as inUseNumber count(1) as inUseNumber
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
where where
a.sequence_nbr = b.equip_transfer_id a.sequence_nbr = b.equip_transfer_id
and b.equ_id = #{record} and b.equ_id = #{record}
and (a.notice_status <![CDATA[ <> ]]> '6614' and a.notice_status <![CDATA[ <> ]]> '6615' and a.notice_status <![CDATA[ <> ]]> '6610') and (a.notice_status <![CDATA[ <> ]]> '6614' and a.notice_status <![CDATA[ <> ]]> '6615' and a.notice_status <![CDATA[ <> ]]> '6610' and a.notice_status <![CDATA[ <> ]]> '6616')
UNION UNION
select select
count(1) as inUseNumber count(1) as inUseNumber
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
where where
a.sequence_nbr = b.equip_transfer_id a.sequence_nbr = b.equip_transfer_id
and b.equ_id = #{record} and b.equ_id = #{record}
and (a.audit_status <![CDATA[ <> ]]> '使用单位已撤回' and a.audit_status <![CDATA[ <> ]]> '一级受理已驳回' and a.audit_status <![CDATA[ <> ]]> '使用单位待提交') and (a.audit_status <![CDATA[ <> ]]> '使用单位已撤回' and a.audit_status <![CDATA[ <> ]]> '一级受理已驳回' and a.audit_status <![CDATA[ <> ]]> '使用单位待提交' and a.audit_status <![CDATA[ <> ]]> '已完成')
UNION UNION
select select
count(1) as inUseNumber count(1) as inUseNumber
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
where where
a.sequence_nbr = b.equip_transfer_id a.sequence_nbr = b.equip_transfer_id
and b.equ_id = #{record} and b.equ_id = #{record}
and (a.notice_status <![CDATA[ <> ]]> '6614' and a.notice_status <![CDATA[ <> ]]> '6615' and a.notice_status <![CDATA[ <> ]]> '6610') and (a.notice_status <![CDATA[ <> ]]> '6614' and a.notice_status <![CDATA[ <> ]]> '6615' and a.notice_status <![CDATA[ <> ]]> '6610' and a.notice_status <![CDATA[ <> ]]> '6616')
) )
</select> </select>
<select id="countEquipInUseTimesForDel" resultType="java.lang.Integer"> <select id="countEquipInUseTimesForDel" resultType="java.lang.Integer">
......
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/JgChangeRegistrationUnitServiceImpl.java
View file @ 1c186d22
...@@ -143,7 +143,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg ...@@ -143,7 +143,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
if (Objects.isNull(notice)) { if (Objects.isNull(notice)) {
return null; return null;
} }
Map<String, Object> changeInfo = BeanUtil.beanToMap(notice); Map<String, Object> changeInfo = BeanUtil.beanToMap(notice, false ,true);
if (!ValidationUtil.isEmpty(notice.getReceiveOrgCode()) && !ValidationUtil.isEmpty(notice.getReceiveOrgName())) { if (!ValidationUtil.isEmpty(notice.getReceiveOrgCode()) && !ValidationUtil.isEmpty(notice.getReceiveOrgName())) {
changeInfo.put("receiveOrgCode", notice.getReceiveOrgCode() + "_" + notice.getReceiveOrgName()); changeInfo.put("receiveOrgCode", notice.getReceiveOrgCode() + "_" + notice.getReceiveOrgName());
...@@ -154,8 +154,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg ...@@ -154,8 +154,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
if (!ValidationUtil.isEmpty(notice.getNewUseUnitCreditCode()) && !ValidationUtil.isEmpty(notice.getNewUseUnitName())) { if (!ValidationUtil.isEmpty(notice.getNewUseUnitCreditCode()) && !ValidationUtil.isEmpty(notice.getNewUseUnitName())) {
changeInfo.put("newUseUnitCreditCode", notice.getNewUseUnitCreditCode() + "_" + notice.getNewUseUnitName()); changeInfo.put("newUseUnitCreditCode", notice.getNewUseUnitCreditCode() + "_" + notice.getNewUseUnitName());
} }
changeInfo.put("changeCertificateList", notice.getChangeCertificate()); changeInfo.put("changeCertificateList", JSON.parse(notice.getChangeCertificate()));
changeInfo.put("otherAccessoriesList", notice.getOtherAccessories()); changeInfo.put("otherAccessoriesList", JSON.parse(notice.getOtherAccessories()));
return new HashMap<String, Map<String, Object>>() {{ return new HashMap<String, Map<String, Object>>() {{
this.put("changeRegisInfo", fillEquipInfoWithRuntimeOrHistoryData(notice, changeInfo)); this.put("changeRegisInfo", fillEquipInfoWithRuntimeOrHistoryData(notice, changeInfo));
}}; }};
...@@ -170,6 +170,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg ...@@ -170,6 +170,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
return getEquipInfo(notice.getSequenceNbr(), changeInfo); return getEquipInfo(notice.getSequenceNbr(), changeInfo);
} }
CommonServiceImpl.formatTime2StrDateForEquip(his); CommonServiceImpl.formatTime2StrDateForEquip(his);
his.putAll(changeInfo);
return his; return his;
} }
// 非完成状态返回实时设备数据 // 非完成状态返回实时设备数据
......
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/JgMaintainNoticeServiceImpl.java
View file @ 1c186d22
...@@ -127,7 +127,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto ...@@ -127,7 +127,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
if (Objects.isNull(notice)) { if (Objects.isNull(notice)) {
return null; return null;
} }
Map<String, Object> maintainInfo = BeanUtil.beanToMap(notice); Map<String, Object> maintainInfo = BeanUtil.beanToMap(notice, false, true);
maintainInfo.put("powerOfAttorneyList", JSON.parse(notice.getPowerOfAttorney())); maintainInfo.put("powerOfAttorneyList", JSON.parse(notice.getPowerOfAttorney()));
maintainInfo.put("constructionContractList", JSON.parse(notice.getConstructionContract())); maintainInfo.put("constructionContractList", JSON.parse(notice.getConstructionContract()));
maintainInfo.put("province", notice.getProvince() + "_" + notice.getProvinceName()); maintainInfo.put("province", notice.getProvince() + "_" + notice.getProvinceName());
......
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