Skip to content

A
amos-boot-biz
Commit 2b352f2a authored by 麻笑宇's avatar 麻笑宇
Browse files
Options

1.大屏业务模块详情代码提交

parent db4397c7
Hide whitespace changes
Inline Side-by-side
Showing with 511 additions and 90 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/StringUtils.java
View file @ 2b352f2a
...@@ -30,7 +30,7 @@ public class StringUtils { ...@@ -30,7 +30,7 @@ public class StringUtils {
* @param map * @param map
* @return * @return
*/ */
public static String transMap2UrlParam(Map<String, Object> map) { public static String transMap2UrlParam(String url,Map<String, Object> map) {
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
for (Map.Entry entry : map.entrySet()) { for (Map.Entry entry : map.entrySet()) {
...@@ -39,11 +39,12 @@ public class StringUtils { ...@@ -39,11 +39,12 @@ public class StringUtils {
continue; continue;
try { try {
stringBuilder.append("&").append(entry.getKey()).append("=").append(URLEncoder.encode(entry.getValue().toString(), "UTF-8")); stringBuilder.append("&").append(entry.getKey()).append("=").append(URLEncoder.encode(entry.getValue().toString(), "UTF-8"));
url = url.replaceAll("\\{"+entry.getKey()+"}",entry.getValue()+"");
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
return stringBuilder.toString(); return url + stringBuilder.toString();
} }
/** /**
...@@ -52,16 +53,17 @@ public class StringUtils { ...@@ -52,16 +53,17 @@ public class StringUtils {
* @param list * @param list
* @return * @return
*/ */
public static String transList2UrlParam(List<Map<String, Object>> list) { public static String transList2UrlParam(String url,List<Map<String, Object>> list) {
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
list.forEach(x -> { list.forEach(x -> {
Map<String, Object> map = JSONObject.parseObject(JSON.toJSONString(x)); Map<String, Object> map = JSONObject.parseObject(JSON.toJSONString(x));
try { try {
stringBuilder.append("&").append(map.get("key")).append("=").append(URLEncoder.encode(map.get("value").toString(), "UTF-8")); stringBuilder.append("&").append(map.get("key")).append("=").append(URLEncoder.encode(map.get("value").toString(), "UTF-8"));
url.replaceAll("{"+map.get("key")+"}",map.get("value")+"");
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
e.printStackTrace(); e.printStackTrace();
} }
}); });
return stringBuilder.toString(); return url + stringBuilder.toString();
} }
} }
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml
View file @ 2b352f2a
...@@ -1271,7 +1271,7 @@ ...@@ -1271,7 +1271,7 @@
</select> </select>
<select id="countBizFinishedNumForDPList" resultType="java.util.Map"> <select id="countBizFinishedNumForDPList" resultType="java.util.Map">
SELECT * FROM (SELECT sequence_nbr as sequenceNbr,install_unit_name as unitName,receive_org_name as SELECT * FROM (SELECT sequence_nbr as sequenceNbr,install_unit_name as unitName,receive_org_name as
receiveOrgName,create_date as createDate,handle_date as handleDate, receiveOrgName,create_date as createDate,handle_date as handleDate,'azgz' as tplType,'azgz' as bType,
CASE when notice_status = 0 then '已完成' CASE when notice_status = 0 then '已完成'
ELSE '进行中' ELSE '进行中'
END as status END as status
...@@ -1292,7 +1292,7 @@ ...@@ -1292,7 +1292,7 @@
</if> </if>
union all union all
SELECT sequence_nbr as sequenceNbr,install_unit_name as unitName,receive_org_name as SELECT sequence_nbr as sequenceNbr,install_unit_name as unitName,receive_org_name as
receiveOrgName,create_date as createDate,handle_date as handleDate, receiveOrgName,create_date as createDate,handle_date as handleDate,'azgz' as tplType,'azgz' as bType,
CASE when notice_status = 0 then '已完成' CASE when notice_status = 0 then '已完成'
ELSE '进行中' ELSE '进行中'
END as status FROM "tzs_jg_installation_notice" where receive_company_org_code like CONCAT(#{orgCode}, '%') and notice_status != '6610' and notice_status != '6615' and notice_status != '6617' and notice_status != '6616' END as status FROM "tzs_jg_installation_notice" where receive_company_org_code like CONCAT(#{orgCode}, '%') and notice_status != '6610' and notice_status != '6615' and notice_status != '6617' and notice_status != '6616'
...@@ -1312,7 +1312,7 @@ ...@@ -1312,7 +1312,7 @@
union all union all
SELECT SELECT
a.sequence_nbr as sequenceNbr,application_unit_name as unitName,inspection_unit_name as a.sequence_nbr as sequenceNbr,application_unit_name as unitName,inspection_unit_name as
receiveOrgName,application_date as createDate,accept_date as handleDate, receiveOrgName,application_date as createDate,accept_date as handleDate,'jdjy' as tplType,'jdjy' as bType,
CASE when a.status = 0 then '已完成' CASE when a.status = 0 then '已完成'
ELSE '进行中' ELSE '进行中'
END as status END as status
...@@ -1338,7 +1338,7 @@ ...@@ -1338,7 +1338,7 @@
union all union all
SELECT SELECT
a.sequence_nbr as sequenceNbr,application_unit_name as unitName,inspection_unit_name as a.sequence_nbr as sequenceNbr,application_unit_name as unitName,inspection_unit_name as
receiveOrgName,application_date as createDate,accept_date as handleDate, receiveOrgName,application_date as createDate,accept_date as handleDate,'jdjy' as tplType,'jdjy' as bType,
CASE when a.status = 0 then '已完成' CASE when a.status = 0 then '已完成'
ELSE '进行中' ELSE '进行中'
END as status END as status
...@@ -1365,7 +1365,7 @@ ...@@ -1365,7 +1365,7 @@
union all union all
SELECT * FROM ( SELECT * FROM (
SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status = '已完成' and is_delete = 0 SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status,'sydj' as tplType,'sydj' as bType FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status = '已完成' and is_delete = 0
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if> </if>
...@@ -1380,7 +1380,7 @@ ...@@ -1380,7 +1380,7 @@
and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%') and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%')
</if> </if>
union all union all
SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status FROM "tzs_jg_vehicle_information" where org_branch_code like CONCAT(#{orgCode}, '%') and status = '已完成' SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status,'sydj' as tplType,'vehicle' as bType FROM "tzs_jg_vehicle_information" where org_branch_code like CONCAT(#{orgCode}, '%') and status = '已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if> </if>
...@@ -1396,7 +1396,7 @@ ...@@ -1396,7 +1396,7 @@
) )
union all union all
SELECT * FROM ( SELECT * FROM (
SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成' and is_delete = 0 SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status,'sydj' as tplType,'sydj' as bType FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成' and is_delete = 0
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(reg_date as date),#{dto.beginDate}) and date_ge(CAST(reg_date as date),#{dto.beginDate})
</if> </if>
...@@ -1410,7 +1410,7 @@ ...@@ -1410,7 +1410,7 @@
and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%') and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%')
</if> </if>
union all union all
SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status FROM "tzs_jg_vehicle_information" where org_branch_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成' SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status,'sydj' as tplType,'vehicle' as bType FROM "tzs_jg_vehicle_information" where org_branch_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(reg_date as date),#{dto.beginDate}) and date_ge(CAST(reg_date as date),#{dto.beginDate})
</if> </if>
...@@ -1428,6 +1428,7 @@ ...@@ -1428,6 +1428,7 @@
union all union all
SELECT SELECT
a.sequence_nbr as sequenceNbr,application_unit_name as unitName,inspection_unit_name as receiveOrgName,application_date as createDate,accept_date as handleDate, a.sequence_nbr as sequenceNbr,application_unit_name as unitName,inspection_unit_name as receiveOrgName,application_date as createDate,accept_date as handleDate,
'dqjy' as tplType,'dqjy' as bType,
CASE when a.status = 0 then '已完成' CASE when a.status = 0 then '已完成'
ELSE '进行中' ELSE '进行中'
END as status END as status
...@@ -1453,6 +1454,7 @@ ...@@ -1453,6 +1454,7 @@
union all union all
SELECT SELECT
a.sequence_nbr as sequenceNbr,application_unit_name as unitName,inspection_unit_name as receiveOrgName,application_date as createDate,accept_date as handleDate, a.sequence_nbr as sequenceNbr,application_unit_name as unitName,inspection_unit_name as receiveOrgName,application_date as createDate,accept_date as handleDate,
'dqjy' as tplType,'dqjy' as bType,
CASE when a.status = 0 then '已完成' CASE when a.status = 0 then '已完成'
ELSE '进行中' ELSE '进行中'
END as status END as status
...@@ -1478,7 +1480,7 @@ ...@@ -1478,7 +1480,7 @@
</if> </if>
union all union all
SELECT * FROM ( SELECT * FROM (
SELECT a.sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,a.audit_status as status FROM tzs_jg_change_registration_name a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status ='已完成' SELECT a.sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,a.audit_status as status,'bgdj' as tplType,'gm' as bType FROM tzs_jg_change_registration_name a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status ='已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(a.audit_pass_date as date),#{dto.beginDate}) and date_ge(CAST(a.audit_pass_date as date),#{dto.beginDate})
</if> </if>
...@@ -1492,7 +1494,7 @@ ...@@ -1492,7 +1494,7 @@
and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%') and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%')
</if> </if>
union all union all
SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,audit_status as status FROM "tzs_jg_change_registration_reform" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status ='已完成' SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,audit_status as status,'bgdj' as tplType,'gz' as bType FROM "tzs_jg_change_registration_reform" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status ='已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if> </if>
...@@ -1506,7 +1508,7 @@ ...@@ -1506,7 +1508,7 @@
and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%') and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%')
</if> </if>
union all union all
SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,audit_status as status FROM "tzs_jg_change_registration_transfer" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status ='已完成' SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,audit_status as status,'bgdj' as tplType,'yz' as bType FROM "tzs_jg_change_registration_transfer" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status ='已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if> </if>
...@@ -1520,7 +1522,7 @@ ...@@ -1520,7 +1522,7 @@
and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%') and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%')
</if> </if>
union all union all
SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status FROM "tzs_jg_change_registration_unit" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status ='已完成' SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status,'bgdj' as tplType,'dw' as bType FROM "tzs_jg_change_registration_unit" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status ='已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if> </if>
...@@ -1534,7 +1536,7 @@ ...@@ -1534,7 +1536,7 @@
and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%') and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%')
</if> </if>
union all union all
SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status FROM "tzs_jg_change_vehicle_registration_unit" where org_branch_code like CONCAT(#{orgCode}, '%') and status ='已完成' SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status,'bgdj' as tplType,'cyqp' as bType FROM "tzs_jg_change_vehicle_registration_unit" where org_branch_code like CONCAT(#{orgCode}, '%') and status ='已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if> </if>
...@@ -1550,7 +1552,7 @@ ...@@ -1550,7 +1552,7 @@
) )
union all union all
select * from ( select * from (
select a.sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,a.audit_status as status from tzs_jg_change_registration_name a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status != '使用单位已撤回' and a.audit_status != '使用单位待提交' and a.audit_status !='已作废' and a.audit_status !='已完成' select a.sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,a.audit_status as status,'bgdj' as tplType,'gm' as bType from tzs_jg_change_registration_name a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status != '使用单位已撤回' and a.audit_status != '使用单位待提交' and a.audit_status !='已作废' and a.audit_status !='已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(a.apply_date as date),#{dto.beginDate}) and date_ge(CAST(a.apply_date as date),#{dto.beginDate})
</if> </if>
...@@ -1564,7 +1566,7 @@ ...@@ -1564,7 +1566,7 @@
and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%') and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%')
</if> </if>
union all union all
SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,audit_status as status FROM "tzs_jg_change_registration_reform" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status != '使用单位待提交' and audit_status != '使用单位已撤回' and audit_status != '已作废' and audit_status != '已完成' SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,audit_status as status,'bgdj' as tplType,'gz' as bType FROM "tzs_jg_change_registration_reform" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status != '使用单位待提交' and audit_status != '使用单位已撤回' and audit_status != '已作废' and audit_status != '已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(reg_date as date),#{dto.beginDate}) and date_ge(CAST(reg_date as date),#{dto.beginDate})
</if> </if>
...@@ -1578,7 +1580,7 @@ ...@@ -1578,7 +1580,7 @@
and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%') and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%')
</if> </if>
union all union all
SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,audit_status as status FROM "tzs_jg_change_registration_transfer" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status != '使用单位待提交' and audit_status != '使用单位已撤回' and audit_status != '已作废' and audit_status != '已完成' SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,audit_status as status,'bgdj' as tplType,'yz' as bType FROM "tzs_jg_change_registration_transfer" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status != '使用单位待提交' and audit_status != '使用单位已撤回' and audit_status != '已作废' and audit_status != '已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(reg_date as date),#{dto.beginDate}) and date_ge(CAST(reg_date as date),#{dto.beginDate})
</if> </if>
...@@ -1592,7 +1594,7 @@ ...@@ -1592,7 +1594,7 @@
and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%') and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%')
</if> </if>
union all union all
SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status FROM "tzs_jg_change_registration_unit" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成' SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status,'bgdj' as tplType,'dw' as bType FROM "tzs_jg_change_registration_unit" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(apply_date as date),#{dto.beginDate}) and date_ge(CAST(apply_date as date),#{dto.beginDate})
</if> </if>
...@@ -1607,7 +1609,7 @@ ...@@ -1607,7 +1609,7 @@
</if> </if>
union all union all
SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status FROM "tzs_jg_change_vehicle_registration_unit" where org_branch_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成' SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status,'bgdj' as tplType,'cyqp' as bType FROM "tzs_jg_change_vehicle_registration_unit" where org_branch_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(apply_date as date),#{dto.beginDate}) and date_ge(CAST(apply_date as date),#{dto.beginDate})
</if> </if>
...@@ -1623,7 +1625,7 @@ ...@@ -1623,7 +1625,7 @@
) )
union all union all
select a.sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,a.status as status from tzs_jg_scrap_cancel a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status = '已完成' select a.sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,a.status as status,'zxbf' as tplType,'zxbf' as bType from tzs_jg_scrap_cancel a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status = '已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(a.audit_pass_date as date),#{dto.beginDate}) and date_ge(CAST(a.audit_pass_date as date),#{dto.beginDate})
</if> </if>
...@@ -1637,7 +1639,7 @@ ...@@ -1637,7 +1639,7 @@
and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%') and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%')
</if> </if>
union all union all
select a.sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,a.status as status from tzs_jg_scrap_cancel a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status != '使用单位待提交' and a.audit_status != '使用单位已撤回' and a.audit_status != '已作废' and a.audit_status != '已完成' select a.sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,a.status as status,'zxbf' as tplType,'zxbf' as bType from tzs_jg_scrap_cancel a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status != '使用单位待提交' and a.audit_status != '使用单位已撤回' and a.audit_status != '已作废' and a.audit_status != '已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(a.create_date as date),#{dto.beginDate}) and date_ge(CAST(a.create_date as date),#{dto.beginDate})
</if> </if>
...@@ -1886,7 +1888,7 @@ ...@@ -1886,7 +1888,7 @@
</select> </select>
<select id="countBizFinishedNumForDPListAZGZ" resultType="java.util.Map"> <select id="countBizFinishedNumForDPListAZGZ" resultType="java.util.Map">
SELECT sequence_nbr as sequenceNbr,install_unit_name as unitName,receive_org_name as SELECT sequence_nbr as sequenceNbr,install_unit_name as unitName,receive_org_name as
receiveOrgName,create_date as createDate,handle_date as handleDate, receiveOrgName,create_date as createDate,handle_date as handleDate,'azgz' as tplType,'azgz' as bType,
CASE when notice_status = 0 then '已完成' CASE when notice_status = 0 then '已完成'
ELSE '进行中' ELSE '进行中'
END as status END as status
...@@ -1907,7 +1909,7 @@ ...@@ -1907,7 +1909,7 @@
</if> </if>
union all union all
SELECT sequence_nbr as sequenceNbr,install_unit_name as unitName,receive_org_name as SELECT sequence_nbr as sequenceNbr,install_unit_name as unitName,receive_org_name as
receiveOrgName,create_date as createDate,handle_date as handleDate, receiveOrgName,create_date as createDate,handle_date as handleDate,'azgz' as tplType,'azgz' as bType,
CASE when notice_status = 0 then '已完成' CASE when notice_status = 0 then '已完成'
ELSE '进行中' ELSE '进行中'
END as status FROM "tzs_jg_installation_notice" where receive_company_org_code like CONCAT(#{orgCode}, '%') and notice_status != '6610' and notice_status != '6615' and notice_status != '6617' and notice_status != '6616' END as status FROM "tzs_jg_installation_notice" where receive_company_org_code like CONCAT(#{orgCode}, '%') and notice_status != '6610' and notice_status != '6615' and notice_status != '6617' and notice_status != '6616'
...@@ -1927,7 +1929,7 @@ ...@@ -1927,7 +1929,7 @@
<select id="countBizFinishedNumForDPListJDJY" resultType="java.util.Map"> <select id="countBizFinishedNumForDPListJDJY" resultType="java.util.Map">
SELECT SELECT
a.sequence_nbr as sequenceNbr,application_unit_name as unitName,inspection_unit_name as a.sequence_nbr as sequenceNbr,application_unit_name as unitName,inspection_unit_name as
receiveOrgName,application_date as createDate,accept_date as handleDate, receiveOrgName,application_date as createDate,accept_date as handleDate,'jdjy' as tplType,'jdjy' as bType,
CASE when a.status = 0 then '已完成' CASE when a.status = 0 then '已完成'
ELSE '进行中' ELSE '进行中'
END as status END as status
...@@ -1953,7 +1955,7 @@ ...@@ -1953,7 +1955,7 @@
union all union all
SELECT SELECT
a.sequence_nbr as sequenceNbr,application_unit_name as unitName,inspection_unit_name as a.sequence_nbr as sequenceNbr,application_unit_name as unitName,inspection_unit_name as
receiveOrgName,application_date as createDate,accept_date as handleDate, receiveOrgName,application_date as createDate,accept_date as handleDate,'jdjy' as tplType,'jdjy' as bType,
CASE when a.status = 0 then '已完成' CASE when a.status = 0 then '已完成'
ELSE '进行中' ELSE '进行中'
END as status END as status
...@@ -1980,7 +1982,7 @@ ...@@ -1980,7 +1982,7 @@
</select> </select>
<select id="countBizFinishedNumForDPListSYDJ" resultType="java.util.Map"> <select id="countBizFinishedNumForDPListSYDJ" resultType="java.util.Map">
SELECT * FROM ( SELECT * FROM (
SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status = '已完成' and is_delete = 0 SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status,'sydj' as tplType,'sydj' as bType FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status = '已完成' and is_delete = 0
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if> </if>
...@@ -1995,7 +1997,7 @@ ...@@ -1995,7 +1997,7 @@
and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%') and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%')
</if> </if>
union all union all
SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status FROM "tzs_jg_vehicle_information" where org_branch_code like CONCAT(#{orgCode}, '%') and status = '已完成' SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status,'sydj' as tplType,'vehicle' as bType FROM "tzs_jg_vehicle_information" where org_branch_code like CONCAT(#{orgCode}, '%') and status = '已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if> </if>
...@@ -2011,7 +2013,7 @@ ...@@ -2011,7 +2013,7 @@
) )
union all union all
SELECT * FROM ( SELECT * FROM (
SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成' and is_delete = 0 SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status,'sydj' as tplType,'sydj' as bType FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成' and is_delete = 0
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(reg_date as date),#{dto.beginDate}) and date_ge(CAST(reg_date as date),#{dto.beginDate})
</if> </if>
...@@ -2025,7 +2027,7 @@ ...@@ -2025,7 +2027,7 @@
and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%') and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%')
</if> </if>
union all union all
SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status FROM "tzs_jg_vehicle_information" where org_branch_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成' SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status,'sydj' as tplType,'vehicle' as bType FROM "tzs_jg_vehicle_information" where org_branch_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(reg_date as date),#{dto.beginDate}) and date_ge(CAST(reg_date as date),#{dto.beginDate})
</if> </if>
...@@ -2043,6 +2045,7 @@ ...@@ -2043,6 +2045,7 @@
<select id="countBizFinishedNumForDPListDQJY" resultType="java.util.Map"> <select id="countBizFinishedNumForDPListDQJY" resultType="java.util.Map">
SELECT SELECT
a.sequence_nbr as sequenceNbr,application_unit_name as unitName,inspection_unit_name as receiveOrgName,application_date as createDate,accept_date as handleDate, a.sequence_nbr as sequenceNbr,application_unit_name as unitName,inspection_unit_name as receiveOrgName,application_date as createDate,accept_date as handleDate,
'dqjy' as tplType,'dqjy' as bType,
CASE when a.status = 0 then '已完成' CASE when a.status = 0 then '已完成'
ELSE '进行中' ELSE '进行中'
END as status END as status
...@@ -2068,6 +2071,7 @@ ...@@ -2068,6 +2071,7 @@
union all union all
SELECT SELECT
a.sequence_nbr as sequenceNbr,application_unit_name as unitName,inspection_unit_name as receiveOrgName,application_date as createDate,accept_date as handleDate, a.sequence_nbr as sequenceNbr,application_unit_name as unitName,inspection_unit_name as receiveOrgName,application_date as createDate,accept_date as handleDate,
'dqjy' as tplType,'dqjy' as bType,
CASE when a.status = 0 then '已完成' CASE when a.status = 0 then '已完成'
ELSE '进行中' ELSE '进行中'
END as status END as status
...@@ -2094,7 +2098,7 @@ ...@@ -2094,7 +2098,7 @@
</select> </select>
<select id="countBizFinishedNumForDPListBGDJ" resultType="java.util.Map"> <select id="countBizFinishedNumForDPListBGDJ" resultType="java.util.Map">
SELECT * FROM ( SELECT * FROM (
SELECT a.sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,a.audit_status as status FROM tzs_jg_change_registration_name a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status ='已完成' SELECT a.sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,a.audit_status as status,'bgdj' as tplType,'gm' as bType FROM tzs_jg_change_registration_name a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status ='已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(a.audit_pass_date as date),#{dto.beginDate}) and date_ge(CAST(a.audit_pass_date as date),#{dto.beginDate})
</if> </if>
...@@ -2108,7 +2112,7 @@ ...@@ -2108,7 +2112,7 @@
and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%') and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%')
</if> </if>
union all union all
SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,audit_status as status FROM "tzs_jg_change_registration_reform" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status ='已完成' SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,audit_status as status,'bgdj' as tplType,'gz' as bType FROM "tzs_jg_change_registration_reform" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status ='已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if> </if>
...@@ -2122,7 +2126,7 @@ ...@@ -2122,7 +2126,7 @@
and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%') and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%')
</if> </if>
union all union all
SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,audit_status as status FROM "tzs_jg_change_registration_transfer" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status ='已完成' SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,audit_status as status,'bgdj' as tplType,'yz' as bType FROM "tzs_jg_change_registration_transfer" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status ='已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if> </if>
...@@ -2136,7 +2140,7 @@ ...@@ -2136,7 +2140,7 @@
and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%') and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%')
</if> </if>
union all union all
SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status FROM "tzs_jg_change_registration_unit" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status ='已完成' SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status,'bgdj' as tplType,'dw' as bType FROM "tzs_jg_change_registration_unit" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status ='已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if> </if>
...@@ -2150,7 +2154,7 @@ ...@@ -2150,7 +2154,7 @@
and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%') and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%')
</if> </if>
union all union all
SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status FROM "tzs_jg_change_vehicle_registration_unit" where org_branch_code like CONCAT(#{orgCode}, '%') and status ='已完成' SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status,'bgdj' as tplType,'cyqp' as bType FROM "tzs_jg_change_vehicle_registration_unit" where org_branch_code like CONCAT(#{orgCode}, '%') and status ='已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if> </if>
...@@ -2166,7 +2170,7 @@ ...@@ -2166,7 +2170,7 @@
) )
union all union all
select * from ( select * from (
select a.sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,a.audit_status as status from tzs_jg_change_registration_name a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status != '使用单位已撤回' and a.audit_status != '使用单位待提交' and a.audit_status !='已作废' and a.audit_status !='已完成' select a.sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,a.audit_status as status,'bgdj' as tplType,'gm' as bType from tzs_jg_change_registration_name a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status != '使用单位已撤回' and a.audit_status != '使用单位待提交' and a.audit_status !='已作废' and a.audit_status !='已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(a.apply_date as date),#{dto.beginDate}) and date_ge(CAST(a.apply_date as date),#{dto.beginDate})
</if> </if>
...@@ -2180,7 +2184,7 @@ ...@@ -2180,7 +2184,7 @@
and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%') and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%')
</if> </if>
union all union all
SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,audit_status as status FROM "tzs_jg_change_registration_reform" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status != '使用单位待提交' and audit_status != '使用单位已撤回' and audit_status != '已作废' and audit_status != '已完成' SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,audit_status as status,'bgdj' as tplType,'gz' as bType FROM "tzs_jg_change_registration_reform" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status != '使用单位待提交' and audit_status != '使用单位已撤回' and audit_status != '已作废' and audit_status != '已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(reg_date as date),#{dto.beginDate}) and date_ge(CAST(reg_date as date),#{dto.beginDate})
</if> </if>
...@@ -2194,7 +2198,7 @@ ...@@ -2194,7 +2198,7 @@
and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%') and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%')
</if> </if>
union all union all
SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,audit_status as status FROM "tzs_jg_change_registration_transfer" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status != '使用单位待提交' and audit_status != '使用单位已撤回' and audit_status != '已作废' and audit_status != '已完成' SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,audit_status as status,'bgdj' as tplType,'yz' as bType FROM "tzs_jg_change_registration_transfer" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status != '使用单位待提交' and audit_status != '使用单位已撤回' and audit_status != '已作废' and audit_status != '已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(reg_date as date),#{dto.beginDate}) and date_ge(CAST(reg_date as date),#{dto.beginDate})
</if> </if>
...@@ -2208,7 +2212,7 @@ ...@@ -2208,7 +2212,7 @@
and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%') and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%')
</if> </if>
union all union all
SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status FROM "tzs_jg_change_registration_unit" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成' SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status,'bgdj' as tplType,'dw' as bType FROM "tzs_jg_change_registration_unit" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(apply_date as date),#{dto.beginDate}) and date_ge(CAST(apply_date as date),#{dto.beginDate})
</if> </if>
...@@ -2223,7 +2227,7 @@ ...@@ -2223,7 +2227,7 @@
</if> </if>
union all union all
SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status FROM "tzs_jg_change_vehicle_registration_unit" where org_branch_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成' SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status,'bgdj' as tplType,'cyqp' as bType FROM "tzs_jg_change_vehicle_registration_unit" where org_branch_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(apply_date as date),#{dto.beginDate}) and date_ge(CAST(apply_date as date),#{dto.beginDate})
</if> </if>
...@@ -2239,7 +2243,7 @@ ...@@ -2239,7 +2243,7 @@
) )
</select> </select>
<select id="countBizFinishedNumForDPListZXBX" resultType="java.util.Map"> <select id="countBizFinishedNumForDPListZXBX" resultType="java.util.Map">
select a.sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,a.status as status from tzs_jg_scrap_cancel a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status = '已完成' select a.sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,a.status as status,'zxbf' as tplType,'zxbf' as bType from tzs_jg_scrap_cancel a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status = '已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(a.audit_pass_date as date),#{dto.beginDate}) and date_ge(CAST(a.audit_pass_date as date),#{dto.beginDate})
</if> </if>
...@@ -2253,7 +2257,7 @@ ...@@ -2253,7 +2257,7 @@
and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%') and receive_org_name like CONCAT('%', #{dto.superviseUnitName}, '%')
</if> </if>
union all union all
select a.sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,a.status as status from tzs_jg_scrap_cancel a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status != '使用单位待提交' and a.audit_status != '使用单位已撤回' and a.audit_status != '已作废' and a.audit_status != '已完成' select a.sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,a.status as status,'zxbf' as tplType,'zxbf' as bType from tzs_jg_scrap_cancel a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status != '使用单位待提交' and a.audit_status != '使用单位已撤回' and a.audit_status != '已作废' and a.audit_status != '已完成'
<if test="dto.beginDate != null and dto.beginDate != ''"> <if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(a.create_date as date),#{dto.beginDate}) and date_ge(CAST(a.create_date as date),#{dto.beginDate})
</if> </if>
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/DPSubController.java
View file @ 2b352f2a
...@@ -77,6 +77,22 @@ public class DPSubController { ...@@ -77,6 +77,22 @@ public class DPSubController {
} else if(template.equals("inspection")) { // 报检 } else if(template.equals("inspection")) { // 报检
template = template + "_" + param.get("equListCode"); template = template + "_" + param.get("equListCode");
Assert.notNull(param.get("sequenceNbr"), "sequenceNbr不能为空"); Assert.notNull(param.get("sequenceNbr"), "sequenceNbr不能为空");
} else if(template.equals("sydj")){
Assert.notNull(param.get("sequenceNbr"), "sequenceNbr不能为空");
if("vehicle".equals(param.get("bType"))){
template = template + "_" + param.get("bType");
}
} else if(template.equals("azgz")){
Assert.notNull(param.get("sequenceNbr"), "sequenceNbr不能为空");
} else if(template.equals("jdjy")){
Assert.notNull(param.get("sequenceNbr"), "sequenceNbr不能为空");
} else if(template.equals("dqjy")){
Assert.notNull(param.get("sequenceNbr"), "sequenceNbr不能为空");
} else if(template.equals("bgdj")){
Assert.notNull(param.get("sequenceNbr"), "sequenceNbr不能为空");
template = template + "_" + param.get("bType");
} else if(template.equals("zxbf")){
Assert.notNull(param.get("sequenceNbr"), "sequenceNbr不能为空");
} else { } else {
throw new RuntimeException("暂无模板"); throw new RuntimeException("暂无模板");
} }
......
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/DPSubServiceImpl.java
View file @ 2b352f2a
package com.yeejoin.amos.boot.module.statistcs.biz.service.impl; package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
...@@ -22,6 +23,7 @@ import org.springframework.http.HttpHeaders; ...@@ -22,6 +23,7 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import org.typroject.tyboot.core.foundation.context.RequestContext; import org.typroject.tyboot.core.foundation.context.RequestContext;
...@@ -100,9 +102,11 @@ public class DPSubServiceImpl { ...@@ -100,9 +102,11 @@ public class DPSubServiceImpl {
Object api = JsonValueUtils.getValueByKey(jsonObject, "dataConfig", "dataConfig.api"); Object api = JsonValueUtils.getValueByKey(jsonObject, "dataConfig", "dataConfig.api");
String renderType = jsonObject.getString("renderType"); String renderType = jsonObject.getString("renderType");
Object apiResult = null; Object apiResult = null;
ResponseModel responseModel = this.getApiResult((JSONObject) api, !ValidationUtil.isEmpty(resultConvert) ? resultConvert.toString() : null); ResponseModel responseModel = this.getApiResult((JSONObject) api, !ValidationUtil.isEmpty(resultConvert) ? resultConvert.toString() : null ,null);
if (!ValidationUtil.isEmpty(responseModel.getResult())) { if (!ValidationUtil.isEmpty(responseModel.getResult())) {
apiResult = responseModel.getResult(); apiResult = responseModel.getResult();
}else{
apiResult = new JSONObject();
} }
if ("timeline".equals(renderType)){ if ("timeline".equals(renderType)){
return apiResult; return apiResult;
...@@ -128,6 +132,7 @@ public class DPSubServiceImpl { ...@@ -128,6 +132,7 @@ public class DPSubServiceImpl {
String renderType = tab.getString("renderType"); String renderType = tab.getString("renderType");
Object resultConvert = JsonValueUtils.getValueByKey(tab, "dataConfig", "dataConfig.resultConvert"); Object resultConvert = JsonValueUtils.getValueByKey(tab, "dataConfig", "dataConfig.resultConvert");
Object api = JsonValueUtils.getValueByKey(tab, "dataConfig", "dataConfig.api"); Object api = JsonValueUtils.getValueByKey(tab, "dataConfig", "dataConfig.api");
JSONArray subResultParams = tab.getJSONArray("subResultParams");
tab.put("param", param); tab.put("param", param);
JSONObject map = content.getJSONObject(tab.getString("key")); JSONObject map = content.getJSONObject(tab.getString("key"));
...@@ -138,9 +143,21 @@ public class DPSubServiceImpl { ...@@ -138,9 +143,21 @@ public class DPSubServiceImpl {
if (!ValidationUtil.isEmpty(api)) { if (!ValidationUtil.isEmpty(api)) {
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
ResponseModel responseModel = this.getApiResult((JSONObject) api, !ValidationUtil.isEmpty(resultConvert) ? resultConvert.toString() : null); ResponseModel responseModel = this.getApiResult((JSONObject) api, !ValidationUtil.isEmpty(resultConvert) ? resultConvert.toString() : null,null);
if (!ValidationUtil.isEmpty(responseModel.getResult())) { if (!ValidationUtil.isEmpty(responseModel.getResult())) {
apiResult = responseModel.getResult(); apiResult = responseModel.getResult();
if(!CollectionUtils.isEmpty(subResultParams)){
for(Object subParam : subResultParams) {
if(StrUtil.isNotBlank(((JSONObject) apiResult).getString(subParam + ""))) {
String[] s1 = ((JSONObject) apiResult).getString(subParam + "").split("_");
if(s1.length > 1) {
((JSONObject) apiResult).put(subParam + "", s1[1]);
}
}
}
}
}else{
apiResult = new JSONObject();
} }
long e = System.currentTimeMillis(); long e = System.currentTimeMillis();
log.info("{}tab页获取详情接口，共耗时：{} 毫秒", tab.get("displayName"), (e - s)); log.info("{}tab页获取详情接口，共耗时：{} 毫秒", tab.get("displayName"), (e - s));
...@@ -329,13 +346,15 @@ public class DPSubServiceImpl { ...@@ -329,13 +346,15 @@ public class DPSubServiceImpl {
private JSONArray processShowHideRules(JSONArray children, Object showHideRules, Object apiResult) { private JSONArray processShowHideRules(JSONArray children, Object showHideRules, Object apiResult) {
JSONObject result = JSONObject.parseObject(apiResult.toString()); JSONObject result = JSONObject.parseObject(apiResult.toString());
Map<String,String> relationMap = new HashMap<>();
relationMap.put("and","&&");
relationMap.put("or","||");
if (!ValidationUtil.isEmpty(showHideRules)) { if (!ValidationUtil.isEmpty(showHideRules)) {
((JSONArray) showHideRules).stream().forEach(x -> { ((JSONArray) showHideRules).stream().forEach(x -> {
JSONObject xObj = (JSONObject) x; JSONObject xObj = (JSONObject) x;
boolean hide = true; boolean hide = true;
JSONArray conditions = xObj.getJSONArray("condition"); JSONArray conditions = xObj.getJSONArray("condition");
String relation = null; String relation = "";
boolean lastConditionResult = false;
for (int i = 0; i < conditions.size(); i++) { for (int i = 0; i < conditions.size(); i++) {
JSONObject conditionObj = conditions.getJSONObject(i); JSONObject conditionObj = conditions.getJSONObject(i);
String value = conditionObj.getString("value"); String value = conditionObj.getString("value");
...@@ -343,32 +362,26 @@ public class DPSubServiceImpl { ...@@ -343,32 +362,26 @@ public class DPSubServiceImpl {
JSONObject item = this.findByEid(children, JsonValueUtils.getValueByKey(conditionObj, "name", "name.key").toString()); JSONObject item = this.findByEid(children, JsonValueUtils.getValueByKey(conditionObj, "name", "name.key").toString());
Object fieldvalue = result.get(JsonValueUtils.getValueByKey(item, "visualParams", "visualParams.fieldKey")); Object fieldvalue = result.get(JsonValueUtils.getValueByKey(item, "visualParams", "visualParams.fieldKey"));
if (ValidationUtil.isEmpty(relation)) { if (condition.equals("notUndefined")) {
if (condition.equals("notUndefined") && !ValidationUtil.isEmpty(fieldvalue)) { relation += !ValidationUtil.isEmpty(fieldvalue);
lastConditionResult = !ValidationUtil.isEmpty(fieldvalue); } else if (condition.equals("unequal")) {
hide = false; relation += !value.equals(fieldvalue);
} else if (condition.equals("unequal") && !ValidationUtil.isEmpty(fieldvalue) && !fieldvalue.equals(value)) { } else if (condition.equals("equal")) {
lastConditionResult = !fieldvalue.equals(value); relation += value.equals(fieldvalue);
hide = false; } else if (condition.equals("inList")){
} else if (condition.equals("equal") && !ValidationUtil.isEmpty(fieldvalue) && fieldvalue.equals(value)) { relation += value.contains(fieldvalue+"");
lastConditionResult = fieldvalue.equals(value); } else if (condition.equals("unList")) {
hide = false; relation += !value.contains(fieldvalue+"");
}
} else {
if (lastConditionResult && condition.equals("notUndefined") && !ValidationUtil.isEmpty(fieldvalue)) {
lastConditionResult = !ValidationUtil.isEmpty(fieldvalue);
hide = false;
} else if (lastConditionResult && condition.equals("unequal") && !ValidationUtil.isEmpty(fieldvalue) && !fieldvalue.equals(value)) {
lastConditionResult = !fieldvalue.equals(value);
hide = false;
} else if (lastConditionResult && condition.equals("equal") && !ValidationUtil.isEmpty(fieldvalue) && fieldvalue.equals(value)) {
lastConditionResult = fieldvalue.equals(value);
hide = false;
} else {
hide = true;
}
} }
relation = conditionObj.getString("relation"); relation += relationMap.getOrDefault(conditionObj.getString("relation"),"");
}
// 获取 JavaScript 引擎
ScriptEngine engine = new ScriptEngineManager().getEngineByName("javascript");
try {
// 将结果转换为布尔值
hide = !(Boolean) engine.eval(relation);
} catch (Exception e) {
hide = true;
} }
if (hide) { if (hide) {
...@@ -508,12 +521,31 @@ public class DPSubServiceImpl { ...@@ -508,12 +521,31 @@ public class DPSubServiceImpl {
Object displayName = JsonValueUtils.getValueByKey(yObj, "visualParams", "visualParams.title"); Object displayName = JsonValueUtils.getValueByKey(yObj, "visualParams", "visualParams.title");
subObj.put("displayName", displayName); subObj.put("displayName", displayName);
subObj.put("renderType", "basic"); subObj.put("renderType", "basic");
subObj.put("columns", columnsArray.size()); subObj.put("columns", columnsArray.size()> 4 ? 4 : columnsArray.size());
JSONArray datas = new JSONArray(); JSONArray datas = new JSONArray();
mergedArray.stream().forEach(x -> { mergedArray.stream().forEach(x -> {
Object fieldKey = JsonValueUtils.getValueByKey(x, "visualParams", "visualParams.fieldKey"); Object fieldKey = JsonValueUtils.getValueByKey(x, "visualParams", "visualParams.fieldKey");
if (!ValidationUtil.isEmpty(fieldKey)) { Object componentKey = JsonValueUtils.getValueByKey(x, "componentKey", null);
if("tableToTable".equals(componentKey+"")){
JSONArray children1 = (JSONArray) JsonValueUtils.getValueByKey(x, "visualParams", "visualParams.tableColumns");
List<JSONObject> columns = children1.stream().map(t -> {
JSONObject xObj = (JSONObject) t;
JSONObject jsonObject = new JSONObject();
jsonObject.put("key", xObj.get("key"));
jsonObject.put("dataIndex", xObj.get("dataIndex"));
jsonObject.put("title", xObj.get("title"));
return jsonObject;
}).collect(Collectors.toList());
subObj.put("renderType", "table");
subObj.put("displayName", JsonValueUtils.getValueByKey(x, "visualParams", "visualParams.label"));
subObj.put("rowKey", "key");
subObj.put("showPage", false);
subObj.put("columns",columns);
Object o = JSONObject.parseObject(apiResult.toString()).get(fieldKey);
subObj.put("dataList",o);
} else if (!ValidationUtil.isEmpty(fieldKey)) {
this.processWidgets(tab, datas, x, displayName, fieldKey.toString(), JSONObject.parseObject(apiResult.toString()), matinfo); this.processWidgets(tab, datas, x, displayName, fieldKey.toString(), JSONObject.parseObject(apiResult.toString()), matinfo);
subObj.put("datas", datas); subObj.put("datas", datas);
} }
...@@ -613,7 +645,7 @@ public class DPSubServiceImpl { ...@@ -613,7 +645,7 @@ public class DPSubServiceImpl {
} }
} else if ("attachmentUpload".equals(xObj.getString("componentKey"))) { } else if ("attachmentUpload".equals(xObj.getString("componentKey"))) {
JSONArray attachmentUploadDatas = matinfo.getJSONArray("datas"); JSONArray attachmentUploadDatas = matinfo.getJSONArray("datas");
if (!ValidationUtil.isEmpty(value)) { if (!ValidationUtil.isEmpty(value) && !"null".equals(value)) {
JSONObject attachmentUploadDatasObj = new JSONObject(); JSONObject attachmentUploadDatasObj = new JSONObject();
log.info("附件数据：{}", value); log.info("附件数据：{}", value);
((JSONArray)value).stream().forEach(y -> { ((JSONArray)value).stream().forEach(y -> {
...@@ -667,22 +699,33 @@ public class DPSubServiceImpl { ...@@ -667,22 +699,33 @@ public class DPSubServiceImpl {
} }
} else if ("checkbox".equals(xObj.getString("componentKey"))) { } else if ("checkbox".equals(xObj.getString("componentKey"))) {
ResponseModel checkboxResult = this.getApiResult(visualParams.getJSONObject("api"), null); if (!ValidationUtil.isEmpty(visualParams.getJSONObject("api"))){
if (!ValidationUtil.isEmpty(checkboxResult) && checkboxResult.getStatus() == 200 && !ValidationUtil.isEmpty(value)) { ResponseModel checkboxResult = this.getApiResult(visualParams.getJSONObject("api"), null,apiResult);
List<Object> collect = ((JSONArray) checkboxResult.getResult()).stream().filter(y -> ((JSONArray) value).contains(JsonValueUtils.getValueByKey(y, "valueKey", "valueKey"))).collect(Collectors.toList()); if (!ValidationUtil.isEmpty(checkboxResult) && checkboxResult.getStatus() == 200 && !ValidationUtil.isEmpty(value)) {
String nameKey = collect.stream().map(item -> ((JSONObject) item).getString("nameKey")).collect(Collectors.joining("、")); List<Object> collect = ((JSONArray) checkboxResult.getResult()).stream().filter(y -> ((JSONArray) value).contains(JsonValueUtils.getValueByKey(y, "valueKey", "valueKey"))).collect(Collectors.toList());
jsonObject.put("value", nameKey); String nameKey = collect.stream().map(item -> ((JSONObject) item).getString("nameKey")).collect(Collectors.joining("、"));
jsonObject.put("value", nameKey);
}
} }
} else if ("select".equals(xObj.getString("componentKey"))) { } else if ("select".equals(xObj.getString("componentKey"))) {
ResponseModel selectResult = this.getApiResult(visualParams.getJSONObject("api"), null); if (!ValidationUtil.isEmpty(visualParams.getJSONObject("api")) && StrUtil.isNotEmpty(visualParams.getJSONObject("api").getString("apiPath"))){
if (!ValidationUtil.isEmpty(selectResult) && selectResult.getStatus() == 200 && !ValidationUtil.isEmpty(value)) { ResponseModel selectResult = this.getApiResult(visualParams.getJSONObject("api"), null,apiResult);
((JSONArray) selectResult.getResult()).stream().filter(y -> value.equals(JsonValueUtils.getValueByKey(y, "valueKey", "valueKey"))).findFirst().ifPresent(z -> { if (!ValidationUtil.isEmpty(selectResult) && selectResult.getStatus() == 200 && !ValidationUtil.isEmpty(value)) {
jsonObject.put("value", ((JSONObject) z).getString("nameKey")); ((JSONArray) selectResult.getResult()).stream().filter(y -> value.equals(JsonValueUtils.getValueByKey(y, "valueKey", "valueKey")+"")).findFirst().ifPresent(z -> {
}); jsonObject.put("value", ((JSONObject) z).getString("nameKey"));
});
}
} else if(!CollectionUtils.isEmpty(visualParams.getJSONArray("data"))){
for(int i=0;i<visualParams.getJSONArray("data").size();i++){
if(visualParams.getJSONArray("data").getJSONObject(i).getString("value").equals(apiResult.getString(visualParams.getString("fieldKey")))){
jsonObject.put("value",visualParams.getJSONArray("data").getJSONObject(i).getString("name"));
break;
}
}
} }
} else if ("radio".equals(xObj.getString("componentKey"))) { } else if ("radio".equals(xObj.getString("componentKey"))) {
if (!ValidationUtil.isEmpty(visualParams.getJSONObject("api"))){ if (!ValidationUtil.isEmpty(visualParams.getJSONObject("api"))){
ResponseModel checkboxResult = this.getApiResult(visualParams.getJSONObject("api"), null); ResponseModel checkboxResult = this.getApiResult(visualParams.getJSONObject("api"), null,apiResult);
if (!ValidationUtil.isEmpty(checkboxResult) && checkboxResult.getStatus() == 200 && !ValidationUtil.isEmpty(value)) { if (!ValidationUtil.isEmpty(checkboxResult) && checkboxResult.getStatus() == 200 && !ValidationUtil.isEmpty(value)) {
List<Object> collect = ((JSONArray) checkboxResult.getResult()).stream().filter(y -> ((JSONArray) value).contains(JsonValueUtils.getValueByKey(y, "valueKey", "valueKey"))).collect(Collectors.toList()); List<Object> collect = ((JSONArray) checkboxResult.getResult()).stream().filter(y -> ((JSONArray) value).contains(JsonValueUtils.getValueByKey(y, "valueKey", "valueKey"))).collect(Collectors.toList());
String nameKey = collect.stream().map(item -> ((JSONObject) item).getString("nameKey")).collect(Collectors.joining("、")); String nameKey = collect.stream().map(item -> ((JSONObject) item).getString("nameKey")).collect(Collectors.joining("、"));
...@@ -698,6 +741,8 @@ public class DPSubServiceImpl { ...@@ -698,6 +741,8 @@ public class DPSubServiceImpl {
)); ));
jsonObject.put("value", fieldMap.get(value)); jsonObject.put("value", fieldMap.get(value));
} }
} else if("tableToTable".equals(xObj.getString("componentKey"))){
} }
} }
if (!("upload".equals(xObj.getString("componentKey")) || "attachmentUpload".equals(xObj.getString("componentKey")))){ if (!("upload".equals(xObj.getString("componentKey")) || "attachmentUpload".equals(xObj.getString("componentKey")))){
...@@ -740,8 +785,11 @@ public class DPSubServiceImpl { ...@@ -740,8 +785,11 @@ public class DPSubServiceImpl {
return map; return map;
} }
public ResponseModel getApiResult(JSONObject apiObj, String resultConvert) { public ResponseModel getApiResult(JSONObject apiObj, String resultConvert, JSONObject detailResult) {
String url = apiObj.getString("apiPath"); String url = apiObj.getString("apiPath");
if(ValidationUtil.isEmpty(url)){
return null;
}
String reqType = !ValidationUtil.isEmpty(apiObj.getString("httpMethod")) ? apiObj.getString("httpMethod") : "GET"; String reqType = !ValidationUtil.isEmpty(apiObj.getString("httpMethod")) ? apiObj.getString("httpMethod") : "GET";
Object params = apiObj.get("params"); Object params = apiObj.get("params");
if (ValidationUtil.isEmpty(params) && !ValidationUtil.isEmpty(apiObj.get("queryParams"))){ if (ValidationUtil.isEmpty(params) && !ValidationUtil.isEmpty(apiObj.get("queryParams"))){
...@@ -751,6 +799,8 @@ public class DPSubServiceImpl { ...@@ -751,6 +799,8 @@ public class DPSubServiceImpl {
JSONObject xObj = (JSONObject) x; JSONObject xObj = (JSONObject) x;
if ("staticValue".equals(JsonValueUtils.getValueByKey(x, "value", "value.source"))){ if ("staticValue".equals(JsonValueUtils.getValueByKey(x, "value", "value.source"))){
queryParam.put(xObj.getString("name"), xObj.getJSONObject("value").getString("value")); queryParam.put(xObj.getString("name"), xObj.getJSONObject("value").getString("value"));
}else if ("sketchProps".equals(JsonValueUtils.getValueByKey(x, "value", "value.source"))){
queryParam.put(xObj.getString("name"), detailResult.getString(xObj.getJSONObject("value").getString("value")));
} }
}); });
if (!ValidationUtil.isEmpty(queryParam)){ if (!ValidationUtil.isEmpty(queryParam)){
...@@ -842,9 +892,9 @@ public class DPSubServiceImpl { ...@@ -842,9 +892,9 @@ public class DPSubServiceImpl {
url += "?"; url += "?";
} }
if (params instanceof Map) { if (params instanceof Map) {
url = url + StringUtils.transMap2UrlParam((Map) params); url = StringUtils.transMap2UrlParam(url, (Map) params);
} else if (params instanceof List) { } else if (params instanceof List) {
url = url + StringUtils.transList2UrlParam((List) params); url = StringUtils.transList2UrlParam(url, (List) params);
} }
return url.replace("?&", "?"); return url.replace("?&", "?");
} }
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/azgz.json 0 → 100644
View file @ 2b352f2a
{
"name": "安装告知",
"tabs": [
{
"key": "basic",
"displayName": "安装告知详情",
"renderType": "basic",
"formSeq": "1734107811517853698",
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/jg-installation-notice/details",
"params": {
"sequenceNbr": "{sequenceNbr}"
},
"ruleData": {
"responseSuccess": "data.result.installationInfo"
}
}
},
"subResultParams": ["province","city","county","orgBranchCode","factoryUseSiteStreet","installLeaderId",
"useUnitCreditCode","propertyUnitName"]
}
],
"content": {
"basic": {
"columns": 4,
"datas": [],
"subs": []
}
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/bgdj_cyqp.json 0 → 100644
View file @ 2b352f2a
{
"name": "车用气瓶变更",
"tabs": [
{
"key": "basic",
"displayName": "车用气瓶变更详情",
"renderType": "basic",
"formSeq": "1811232965410189314",
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/jg-change-vehicle-registration-unit/details",
"params": {
"sequenceNbr": "{sequenceNbr}"
},
"ruleData": {
"responseSuccess": "data.result"
}
}
},
"subResultParams": ["useUnitCreditCode","receiveOrgCode","orgBranchCode"]
}
],
"content": {
"basic": {
"columns": 4,
"datas": [],
"subs": []
}
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/bgdj_dw.json 0 → 100644
View file @ 2b352f2a
{
"name": "单位变更",
"tabs": [
{
"key": "basic",
"displayName": "单位变更详情",
"renderType": "basic",
"formSeq": "1738022519656443905",
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/jg-change-registration-unit/details",
"params": {
"sequenceNbr": "{sequenceNbr}"
},
"ruleData": {
"responseSuccess": "data.result.changeRegisInfo"
}
}
},
"subResultParams": ["useUnitCreditCode","receiveOrgCode","newUseUnitName"]
}
],
"content": {
"basic": {
"columns": 4,
"datas": [],
"subs": []
}
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/bgdj_gm.json 0 → 100644
View file @ 2b352f2a
{
"name": "更名变更",
"tabs": [
{
"key": "basic",
"displayName": "更名变更详情",
"renderType": "basic",
"formSeq": "1739185443716493313",
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/jg-change-registration-name/details",
"params": {
"sequenceNbr": "{sequenceNbr}"
},
"ruleData": {
"responseSuccess": "data.result.jgRegistrationInfo"
}
}
}
}
],
"content": {
"basic": {
"columns": 4,
"datas": [],
"subs": []
}
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/bgdj_gz.json 0 → 100644
View file @ 2b352f2a
{
"name": "改造变更",
"tabs": [
{
"key": "basic",
"displayName": "改造变更详情",
"renderType": "basic",
"formSeq": "1737034262198120450",
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/jg-change-registration-reform/getDetail",
"params": {
"currentDocumentId": "{sequenceNbr}"
},
"ruleData": {
"responseSuccess": "data.result"
}
}
},
"subResultParams": ["receiveCompanyCode"]
}
],
"content": {
"basic": {
"columns": 4,
"datas": [],
"subs": []
}
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/bgdj_yz.json 0 → 100644
View file @ 2b352f2a
{
"name": "移装变更",
"tabs": [
{
"key": "basic",
"displayName": "移装变更详情",
"renderType": "basic",
"formSeq": "1737063574276173826",
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/jg-change-registration-transfer/detail",
"params": {
"sequenceNbr": "{sequenceNbr}"
},
"ruleData": {
"responseSuccess": "data.result.changeRegistrationTransfer"
}
}
},
"subResultParams": ["receiveCompanyCode","transferProvince","transferCity","transferCounty","transferStreet",
"orgBranchCode","transferUseInfo","transferSafetyManager"]
}
],
"content": {
"basic": {
"columns": 4,
"datas": [],
"subs": []
}
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/dqjy.json 0 → 100644
View file @ 2b352f2a
{
"name": "定期检验",
"tabs": [
{
"key": "basic",
"displayName": "定期检验详情",
"renderType": "basic",
"formSeq": "1735144325639073793",
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jyjc/jyjc-inspection-application/{sequenceNbr}",
"params": {
"sequenceNbr": "{sequenceNbr}"
},
"ruleData": {
"responseSuccess": "data.result"
}
}
}
}
],
"content": {
"basic": {
"columns": 4,
"datas": [],
"subs": []
}
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/jdjy.json 0 → 100644
View file @ 2b352f2a
{
"name": "监督检验",
"tabs": [
{
"key": "basic",
"displayName": "监督检验详情",
"renderType": "basic",
"formSeq": "1734854656288387074",
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jyjc/jyjc-inspection-application/{sequenceNbr}",
"params": {
"sequenceNbr": "{sequenceNbr}"
},
"ruleData": {
"responseSuccess": "data.result"
}
}
}
}
],
"content": {
"basic": {
"columns": 4,
"datas": [],
"subs": []
}
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/sydj.json 0 → 100644
View file @ 2b352f2a
{
"name": "使用登记",
"tabs": [
{
"key": "basic",
"displayName": "使用登记详情",
"renderType": "basic",
"formSeq": "1744311337623777282",
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/jg-use-registration/getDetail",
"params": {
"sequenceNbr": "{sequenceNbr}"
},
"ruleData": {
"responseSuccess": "data.result"
}
}
},
"subResultParams": ["orgBranchCode","receiveOrgCode","estateUnitName"]
}
],
"content": {
"basic": {
"columns": 4,
"datas": [],
"subs": []
}
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/sydj_vehicle.json 0 → 100644
View file @ 2b352f2a
{
"name": "使用登记",
"tabs": [
{
"key": "basic",
"displayName": "车用气瓶登记详情",
"renderType": "basic",
"formSeq": "1770000499483897858",
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/jg-vehicle-information/details",
"params": {
"sequenceNbr": "{sequenceNbr}"
},
"ruleData": {
"responseSuccess": "data.result"
}
}
}
}
],
"content": {
"basic": {
"columns": 4,
"datas": [],
"subs": []
}
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/zxbf.json 0 → 100644
View file @ 2b352f2a
{
"name": "注销报废",
"tabs": [
{
"key": "basic",
"displayName": "注销报废详情",
"renderType": "basic",
"formSeq": "1737366819582275586",
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/jg-scrap-cancel/details",
"params": {
"sequenceNbr": "{sequenceNbr}"
},
"ruleData": {
"responseSuccess": "data.result.jgScrapCancelAdd"
}
}
}
}
],
"content": {
"basic": {
"columns": 4,
"datas": [],
"subs": []
}
}
}
\ No newline at end of file
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