Skip to content

A
amos-boot-biz
Commit c1b909b8 authored by 刘林's avatar 刘林
Browse files
Options

fix(大屏):大屏接口修改

parent 3c636f98
Show whitespace changes
Inline Side-by-side
Showing with 489 additions and 171 deletions
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/JGStatisticsMapper.java
View file @ c1b909b8
......@@ -54,11 +54,11 @@ public interface JGStatisticsMapper {
Long over15yearsCount(@Param("orgCode") String orgCode, @Param("time") String time);
Long constructionNoticeCount(@Param("orgCode") String orgCode);
Long constructionNoticeCount(@Param("dto") DPFilterParamDto dto);
Long changeCountByOrgCode(@Param("orgCode") String orgCode);
Long changeCountByOrgCode(@Param("dto") DPFilterParamDto dto);
List<Map<String, Object>> selectNoticeList(@Param("orgCode") String orgCode, @Param("time") String time);
List<Map<String, Object>> selectNoticeList(@Param("orgCode") String orgCode, @Param("time") String time, @Param("dto") DPFilterParamDto dto);
Page<Map<String, Object>> selectNoticeDetailList(@Param("page") Page<Map<String, Object>> page, @Param("orgCode") String orgCode, @Param("time") String time, @Param("dto") DPFilterParamForDetailDto dpFilterParamDto);
......@@ -70,7 +70,7 @@ public interface JGStatisticsMapper {
Page<Map<String, Object>> selectYZNoticeDetailList(@Param("page") Page<Map<String, Object>> page, @Param("orgCode") String orgCode, @Param("time") String time, @Param("dto") DPFilterParamForDetailDto dpFilterParamDto);
List<Map<String, Object>> selectNoticeCountTopTen(@Param("orgCode") String orgCode, @Param("time") String time);
List<Map<String, Object>> selectNoticeCountTopTen(@Param("orgCode") String orgCode, @Param("time") String time, @Param("dto") DPFilterParamDto dto);
/**
* 告知类业务平均办理时效，统计维度：接收机构所在的行政区域;
......@@ -100,9 +100,9 @@ public interface JGStatisticsMapper {
Page<Map<String, Object>> countBizFinishedNumForDPListAll(@Param("page") Page<Map<String, Object>> page, @Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto filterParamDto, @Param("treeValue") String treeValue);
Long getNoticeCountTopChart(@Param("dpFilterParamForDetailDto") DPFilterParamForDetailDto dpFilterParamForDetailDto);
Long getNoticeCountTopChart(@Param("dto") DPFilterParamForDetailDto dto);
Page<Map<String, Object>> noticeCountTopPageNew(@Param("page") Page<Map<String, Object>> page, @Param("dpFilterParamForDetailDto") DPFilterParamForDetailDto dpFilterParamForDetailDto);
List<Map<String, Object>> noticeCountTopPageByUseUnitCode(@Param("unitCodeList") List<String> unitCodeList, @Param("dpFilterParamForDetailDto") DPFilterParamForDetailDto dpFilterParamForDetailDto);
List<Map<String, Object>> noticeCountTopPageByUseUnitCode(@Param("unitCodeList") List<String> unitCodeList, @Param("dto") DPFilterParamForDetailDto dto);
}
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/JGStatisticsMapper.xml
View file @ c1b909b8
......@@ -402,81 +402,98 @@
AND ibjsi."ORG_BRANCH_CODE" LIKE CONCAT ( #{orgCode}, '%' );
]]></select>
<select id="constructionNoticeCount" resultType="java.lang.Long">
SELECT SUM
( T.COUNT )
SELECT SUM ( T.COUNT )
FROM
(
SELECT COUNT
( 1 )
SELECT COUNT( 1 )
FROM
tzs_jg_installation_notice T
WHERE
T.notice_status = 6616
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION all
SELECT COUNT
( 1 )
<include refid="companyConditionForNotice"/>
UNION ALL
SELECT COUNT( 1 )
FROM
tzs_jg_maintain_notice T
WHERE
T.notice_status = 6616
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION all
SELECT COUNT
( 1 )
<include refid="companyCondition"/>
UNION ALL
SELECT COUNT ( 1 )
FROM
tzs_jg_reform_notice T
WHERE
T.notice_status = 6616
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION all
SELECT COUNT
( 1 )
<include refid="companyCondition"/>
UNION ALL
SELECT COUNT ( 1 )
FROM
tzs_jg_transfer_notice T
WHERE
T.notice_status = 6616
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
<include refid="companyCondition"/>
) T
</select>
<!-- 公共条件：根据 cityCode 或 companyCodes 生成过滤条件 -->
<sql id="companyCondition">
<if test='dto.cityCode != "610000"'>
<if test="dto.companyCodes != null and dto.companyCodes.size() > 0">
AND T.receive_company_code IN
<foreach collection="dto.companyCodes" item="code" open="(" separator="," close=")">
#{code}
</foreach>
</if>
</if>
</sql>
<sql id="companyConditionForNotice">
<if test='dto.cityCode != "610000"'>
<if test="dto.companyCodes != null and dto.companyCodes.size() > 0">
AND T.receive_org_credit_code IN
<foreach collection="dto.companyCodes" item="code" open="(" separator="," close=")">
#{code}
</foreach>
</if>
</if>
</sql>
<select id="changeCountByOrgCode" resultType="java.lang.Long">
SELECT SUM
( T.COUNT )
SELECT SUM( T.COUNT )
FROM
(
SELECT COUNT
( 1 )
SELECT COUNT( 1 )
FROM
tzs_jg_change_registration_name crn left join privilege_company pc
ON crn.receive_org_code = pc.company_code
AND crn.audit_status = '已完成'
tzs_jg_change_registration_name T
WHERE
pc.org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION ALL
SELECT COUNT
( 1 )
T.audit_status = '已完成'
<include refid="companyCondition"/>
UNION ALL
SELECT COUNT( 1 )
FROM
tzs_jg_change_registration_reform T
WHERE
T.audit_status = '已完成'
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION ALL
SELECT COUNT
( 1 )
<include refid="companyCondition"/>
UNION ALL
SELECT COUNT( 1 )
FROM
tzs_jg_change_registration_transfer T
WHERE
T.audit_status = '已完成'
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION ALL
SELECT COUNT
( 1 )
<include refid="companyCondition"/>
UNION ALL
SELECT COUNT( 1 )
FROM
tzs_jg_change_registration_unit T
WHERE
T.status = '已完成'
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION ALL
SELECT COUNT
( 1 )
<include refid="companyCondition"/>
UNION ALL
SELECT COUNT ( 1 )
FROM
tzs_jg_change_vehicle_registration_unit T
WHERE
T.status = '已完成'
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
<include refid="companyCondition"/>
) T
</select>
<select id="selectNoticeList" resultType="java.util.Map">
......@@ -494,7 +511,8 @@
WHERE
handle_date &gt;= #{time}
and notice_status != 6617
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION ALL
<include refid="companyConditionForNotice"/>
UNION ALL
SELECT
CONCAT ( T.city_name, T.county_name ) AS location,
T.install_unit_name AS constructionCompany,
......@@ -506,7 +524,8 @@
WHERE
accept_date &gt;= #{time}
and notice_status != 6617
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION ALL
<include refid="companyCondition"/>
UNION ALL
SELECT
CONCAT ( T.city_name, T.county_name ) AS location,
T.install_unit_name AS constructionCompany,
......@@ -518,7 +537,8 @@
WHERE
accept_date &gt;= #{time}
and notice_status != 6617
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION ALL
<include refid="companyCondition"/>
UNION ALL
SELECT
CONCAT ( T.city_name, T.county_name ) AS location,
T.install_unit_name AS constructionCompany,
......@@ -530,7 +550,8 @@
WHERE
handle_date &gt;= #{time}
and notice_status != 6617
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )) A
<include refid="companyCondition"/>
) A
ORDER BY A."constructionDate" DESC
</select>
......@@ -554,7 +575,8 @@
<if test="dto.address != null and dto.address != ''">
AND (T.city_name like CONCAT(#{dto.address},'%') or T.county_name like CONCAT(#{dto.address},'%'))
</if>
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION ALL
<include refid="companyConditionForNotice"/>
UNION ALL
SELECT
CONCAT ( T.city_name, T.county_name ) AS location,
T.install_unit_name AS constructionCompany,
......@@ -571,7 +593,8 @@
<if test="dto.address != null and dto.address != ''">
AND (T.city_name like CONCAT(#{dto.address},'%') or T.county_name like CONCAT(#{dto.address},'%'))
</if>
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION ALL
<include refid="companyCondition"/>
UNION ALL
SELECT
CONCAT ( T.city_name, T.county_name ) AS location,
T.install_unit_name AS constructionCompany,
......@@ -588,7 +611,8 @@
<if test="dto.address != null and dto.address != ''">
AND (T.city_name like CONCAT(#{dto.address},'%') or T.county_name like CONCAT(#{dto.address},'%'))
</if>
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION ALL
<include refid="companyCondition"/>
UNION ALL
SELECT
CONCAT ( T.city_name, T.county_name ) AS location,
T.install_unit_name AS constructionCompany,
......@@ -605,13 +629,13 @@
<if test="dto.address != null and dto.address != ''">
AND (T.city_name like CONCAT(#{dto.address},'%') or T.county_name like CONCAT(#{dto.address},'%'))
</if>
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )) A
<include refid="companyCondition"/>
) A
ORDER BY A."constructionDate" DESC
</select>
<select id="selectNoticeCountTopTen" resultType="java.util.Map">
SELECT SUM( T.num ) AS count,
T.company
SELECT SUM( T.num ) AS count,T.company
FROM
(
SELECT COUNT
......@@ -622,9 +646,10 @@
tzs_jg_installation_notice T
WHERE
install_start_date &gt;= #{time}
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
<include refid="companyConditionForNotice"/>
GROUP BY
T.install_unit_credit_code UNION ALL
T.install_unit_credit_code
UNION ALL
SELECT COUNT
( 1 ) AS num,
T.install_unit_name AS company,
......@@ -633,9 +658,10 @@
tzs_jg_maintain_notice T
WHERE
plan_date &gt;= #{time}
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
<include refid="companyCondition"/>
GROUP BY
T.install_unit_credit_code UNION ALL
T.install_unit_credit_code
UNION ALL
SELECT
( 1 ) AS num,
T.install_unit_name AS company,
......@@ -644,9 +670,10 @@
tzs_jg_reform_notice T
WHERE
plan_date &gt;= #{time}
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
<include refid="companyCondition"/>
GROUP BY
T.install_unit_credit_code UNION ALL
T.install_unit_credit_code
UNION ALL
SELECT
( 1 ) AS num,
T.install_unit_name AS company,
......@@ -655,7 +682,7 @@
tzs_jg_transfer_notice T
WHERE
plan_date &gt;= #{time}
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
<include refid="companyCondition"/>
GROUP BY
T.install_unit_credit_code
) T
......@@ -1098,7 +1125,7 @@
<if test="dto.address != null and dto.address != ''">
AND (T.city_name like CONCAT(#{dto.address},'%') or T.county_name like CONCAT(#{dto.address},'%'))
</if>
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
<include refid="companyConditionForNotice"/>
order by T.install_start_date desc
</select>
<select id="selectWXNoticeDetailList" resultType="java.util.Map">
......@@ -1118,7 +1145,7 @@
<if test="dto.address != null and dto.address != ''">
AND (T.city_name like CONCAT(#{dto.address},'%') or T.county_name like CONCAT(#{dto.address},'%'))
</if>
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
<include refid="companyCondition"/>
order by T.plan_date desc
</select>
<select id="selectGZNoticeDetailList" resultType="java.util.Map">
......@@ -1138,7 +1165,7 @@
<if test="dto.address != null and dto.address != ''">
AND (T.city_name like CONCAT(#{dto.address},'%') or T.county_name like CONCAT(#{dto.address},'%'))
</if>
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
<include refid="companyCondition"/>
order by T.plan_date desc
</select>
<select id="selectYZNoticeDetailList" resultType="java.util.Map">
......@@ -1158,7 +1185,7 @@
<if test="dto.address != null and dto.address != ''">
AND (T.city_name like CONCAT(#{dto.address},'%') or T.county_name like CONCAT(#{dto.address},'%'))
</if>
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
<include refid="companyCondition"/>
order by T.plan_date desc
</select>
<select id="countBizFinishedNumForDPListSGGZ" resultType="java.util.Map">
......@@ -1181,9 +1208,22 @@
END AS status
FROM
"tzs_jg_installation_notice" tjin
WHERE
receive_company_org_code like CONCAT(#{orgCode}, '%')
and notice_status != 6617
WHERE notice_status != 6617
<choose>
<when test='dto.cityCode != null and dto.cityCode == "610000"'>
and 1=1
</when>
<otherwise>
<if test="dto.companyCodes != null and dto.companyCodes.size > 0">
and tjin.receive_org_credit_code =
ANY(ARRAY[
<foreach collection="dto.companyCodes" item="companyCode" separator=",">
#{companyCode}
</foreach>
])
</if>
</otherwise>
</choose>
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(handle_date as date),#{dto.beginDate})
</if>
......@@ -1231,9 +1271,22 @@
END AS status
FROM
"tzs_jg_maintain_notice" tjmn
WHERE
receive_company_org_code like CONCAT(#{orgCode}, '%')
and notice_status != 6617
WHERE notice_status != 6617
<choose>
<when test='dto.cityCode != null and dto.cityCode == "610000"'>
and 1=1
</when>
<otherwise>
<if test="dto.companyCodes != null and dto.companyCodes.size > 0">
and tjmn.receive_company_code =
ANY(ARRAY[
<foreach collection="dto.companyCodes" item="companyCode" separator=",">
#{companyCode}
</foreach>
])
</if>
</otherwise>
</choose>
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(accept_date as date),#{dto.beginDate})
</if>
......@@ -1281,9 +1334,22 @@
END AS status
FROM
"tzs_jg_reform_notice" tjrn
WHERE
receive_company_org_code like CONCAT(#{orgCode}, '%')
and notice_status != 6617
WHERE notice_status != 6617
<choose>
<when test='dto.cityCode != null and dto.cityCode == "610000"'>
and 1=1
</when>
<otherwise>
<if test="dto.companyCodes != null and dto.companyCodes.size > 0">
and tjrn.receive_company_code =
ANY(ARRAY[
<foreach collection="dto.companyCodes" item="companyCode" separator=",">
#{companyCode}
</foreach>
])
</if>
</otherwise>
</choose>
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(accept_date as date),#{dto.beginDate})
</if>
......@@ -1333,9 +1399,22 @@
tzs_jg_transfer_notice tn
LEFT JOIN tzs_jg_transfer_notice_eq tne ON tn.sequence_nbr = tne.equip_transfer_id
LEFT JOIN idx_biz_jg_register_info ri ON tne.equ_id = ri.RECORD
WHERE
receive_company_org_code like CONCAT(#{orgCode}, '%')
and notice_status != 6617
WHERE tn.notice_status != 6617
<choose>
<when test='dto.cityCode != null and dto.cityCode == "610000"'>
and 1=1
</when>
<otherwise>
<if test="dto.companyCodes != null and dto.companyCodes.size > 0">
and tn.receive_company_code =
ANY(ARRAY[
<foreach collection="dto.companyCodes" item="companyCode" separator=",">
#{companyCode}
</foreach>
])
</if>
</otherwise>
</choose>
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(handle_date as date),#{dto.beginDate})
</if>
......@@ -1389,10 +1468,23 @@
LEFT JOIN idx_biz_jg_register_info ri ON tne.equ_id = ri.RECORD
LEFT JOIN equipment_category ec_equ_list ON ec_equ_list.code = ri.EQU_LIST
LEFT JOIN equipment_category ec_equ_category ON ec_equ_category.code = ri.EQU_CATEGORY
WHERE
receive_company_org_code LIKE CONCAT(#{orgCode}, '%')
AND tjur.status != '已作废'
WHERE tjur.status != '已作废'
AND tjur.is_delete = 0
<choose>
<when test='dto.cityCode != null and dto.cityCode == "610000"'>
and 1=1
</when>
<otherwise>
<if test="dto.companyCodes != null and dto.companyCodes.size > 0">
and tjur.receive_company_code =
ANY(ARRAY[
<foreach collection="dto.companyCodes" item="companyCode" separator=",">
#{companyCode}
</foreach>
])
</if>
</otherwise>
</choose>
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if>
......@@ -1441,9 +1533,22 @@
LEFT JOIN idx_biz_jg_register_info ri ON tjvie.equ_id = ri.RECORD
LEFT JOIN equipment_category ec_equ_list ON ec_equ_list.code = ri.EQU_LIST
LEFT JOIN equipment_category ec_equ_category ON ec_equ_category.code = ri.EQU_CATEGORY
WHERE
tjvi.org_branch_code LIKE CONCAT(#{orgCode}, '%')
AND tjvi.status != '已作废'
WHERE tjvi.status != '已作废'
<choose>
<when test='dto.cityCode != null and dto.cityCode == "610000"'>
and 1=1
</when>
<otherwise>
<if test="dto.companyCodes != null and dto.companyCodes.size > 0">
and tjvi.receive_company_code =
ANY(ARRAY[
<foreach collection="dto.companyCodes" item="companyCode" separator=",">
#{companyCode}
</foreach>
])
</if>
</otherwise>
</choose>
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if>
......@@ -1493,9 +1598,22 @@
tzs_jg_change_registration_reform tjcrr
LEFT JOIN tzs_jg_change_registration_reform_eq tjcrre ON tjcrr.sequence_nbr = tjcrre.equip_transfer_id
LEFT JOIN idx_biz_jg_register_info ri ON tjcrre.equ_id = ri.RECORD
WHERE
tjcrr.receive_company_org_code like CONCAT(#{orgCode}, '%')
and tjcrr.audit_status != '已作废'
WHERE tjcrr.audit_status != '已作废'
<choose>
<when test='dto.cityCode != null and dto.cityCode == "610000"'>
and 1=1
</when>
<otherwise>
<if test="dto.companyCodes != null and dto.companyCodes.size > 0">
and tjcrr.receive_company_code =
ANY(ARRAY[
<foreach collection="dto.companyCodes" item="companyCode" separator=",">
#{companyCode}
</foreach>
])
</if>
</otherwise>
</choose>
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if>
......@@ -1544,9 +1662,22 @@
tzs_jg_change_registration_transfer tjcrt
LEFT JOIN tzs_jg_change_registration_transfer_eq tjcrte ON tjcrt.sequence_nbr = tjcrte.equip_transfer_id
LEFT JOIN idx_biz_jg_register_info ri ON tjcrte.equ_id = ri.RECORD
WHERE
tjcrt.receive_company_org_code like CONCAT( #{orgCode}, '%')
and tjcrt.audit_status != '已作废'
WHERE tjcrt.audit_status != '已作废'
<choose>
<when test='dto.cityCode != null and dto.cityCode == "610000"'>
and 1=1
</when>
<otherwise>
<if test="dto.companyCodes != null and dto.companyCodes.size > 0">
and tjcrt.receive_company_code =
ANY(ARRAY[
<foreach collection="dto.companyCodes" item="companyCode" separator=",">
#{companyCode}
</foreach>
])
</if>
</otherwise>
</choose>
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if>
......@@ -1595,9 +1726,22 @@
tzs_jg_change_registration_unit tjcru
LEFT JOIN tzs_jg_change_registration_unit_eq tjcrue ON tjcru.sequence_nbr = tjcrue.unit_change_registration_id
LEFT JOIN idx_biz_jg_register_info ri ON tjcrue.equ_id = ri.RECORD
WHERE
tjcru.receive_company_org_code like CONCAT(#{orgCode}, '%')
and tjcru.status != '已作废'
WHERE tjcru.status != '已作废'
<choose>
<when test='dto.cityCode != null and dto.cityCode == "610000"'>
and 1=1
</when>
<otherwise>
<if test="dto.companyCodes != null and dto.companyCodes.size > 0">
and tjcru.receive_company_code =
ANY(ARRAY[
<foreach collection="dto.companyCodes" item="companyCode" separator=",">
#{companyCode}
</foreach>
])
</if>
</otherwise>
</choose>
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if>
......@@ -1644,10 +1788,22 @@
END AS status
FROM
tzs_jg_change_registration_name tjcrn
LEFT JOIN privilege_company pc ON pc.company_code = tjcrn.receive_org_code
WHERE
pc.org_code LIKE CONCAT ( #{orgCode}, '%' )
AND tjcrn.audit_status != '已作废'
WHERE tjcrn.audit_status != '已作废'
<choose>
<when test='dto.cityCode != null and dto.cityCode == "610000"'>
and 1=1
</when>
<otherwise>
<if test="dto.companyCodes != null and dto.companyCodes.size > 0">
and tjcrn.receive_company_code =
ANY(ARRAY[
<foreach collection="dto.companyCodes" item="companyCode" separator=",">
#{companyCode}
</foreach>
])
</if>
</otherwise>
</choose>
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if>
......@@ -1945,9 +2101,22 @@
END AS status
FROM
"tzs_jg_installation_notice" tjin
WHERE
receive_company_org_code like CONCAT(#{orgCode}, '%')
and notice_status != 6617
WHERE notice_status != 6617
<choose>
<when test='dto.cityCode != null and dto.cityCode == "610000"'>
and 1=1
</when>
<otherwise>
<if test="dto.companyCodes != null and dto.companyCodes.size > 0">
and tjin.receive_org_credit_code =
ANY(ARRAY[
<foreach collection="dto.companyCodes" item="companyCode" separator=",">
#{companyCode}
</foreach>
])
</if>
</otherwise>
</choose>
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(handle_date as date),#{dto.beginDate})
</if>
......@@ -1993,9 +2162,22 @@
END AS status
FROM
"tzs_jg_maintain_notice" tjmn
WHERE
receive_company_org_code like CONCAT(#{orgCode}, '%')
and notice_status != 6617
WHERE notice_status != 6617
<choose>
<when test='dto.cityCode != null and dto.cityCode == "610000"'>
and 1=1
</when>
<otherwise>
<if test="dto.companyCodes != null and dto.companyCodes.size > 0">
and tjmn.receive_company_code =
ANY(ARRAY[
<foreach collection="dto.companyCodes" item="companyCode" separator=",">
#{companyCode}
</foreach>
])
</if>
</otherwise>
</choose>
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(accept_date as date),#{dto.beginDate})
</if>
......@@ -2041,9 +2223,22 @@
END AS status
FROM
"tzs_jg_reform_notice" tjrn
WHERE
receive_company_org_code like CONCAT(#{orgCode}, '%')
and notice_status != 6617
WHERE notice_status != 6617
<choose>
<when test='dto.cityCode != null and dto.cityCode == "610000"'>
and 1=1
</when>
<otherwise>
<if test="dto.companyCodes != null and dto.companyCodes.size > 0">
and tjrn.receive_company_code =
ANY(ARRAY[
<foreach collection="dto.companyCodes" item="companyCode" separator=",">
#{companyCode}
</foreach>
])
</if>
</otherwise>
</choose>
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(accept_date as date),#{dto.beginDate})
</if>
......@@ -2091,9 +2286,22 @@
tzs_jg_transfer_notice tn
LEFT JOIN tzs_jg_transfer_notice_eq tne ON tn.sequence_nbr = tne.equip_transfer_id
LEFT JOIN idx_biz_jg_register_info ri ON tne.equ_id = ri.RECORD
WHERE
receive_company_org_code like CONCAT(#{orgCode}, '%')
and notice_status != 6617
WHERE notice_status != 6617
<choose>
<when test='dto.cityCode != null and dto.cityCode == "610000"'>
and 1=1
</when>
<otherwise>
<if test="dto.companyCodes != null and dto.companyCodes.size > 0">
and tn.receive_company_code =
ANY(ARRAY[
<foreach collection="dto.companyCodes" item="companyCode" separator=",">
#{companyCode}
</foreach>
])
</if>
</otherwise>
</choose>
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(handle_date as date),#{dto.beginDate})
</if>
......@@ -2142,9 +2350,22 @@
tzs_jg_use_registration tjur
LEFT JOIN tzs_jg_use_registration_eq tne ON tjur.sequence_nbr = tne.equip_transfer_id
LEFT JOIN idx_biz_jg_register_info ri ON tne.equ_id = ri.RECORD
WHERE
receive_company_org_code like CONCAT(#{orgCode}, '%')
and tjur.status != '已作废' and tjur.is_delete = 0
WHERE tjur.status != '已作废' and tjur.is_delete = 0
<choose>
<when test='dto.cityCode != null and dto.cityCode == "610000"'>
and 1=1
</when>
<otherwise>
<if test="dto.companyCodes != null and dto.companyCodes.size > 0">
and tjur.receive_company_code =
ANY(ARRAY[
<foreach collection="dto.companyCodes" item="companyCode" separator=",">
#{companyCode}
</foreach>
])
</if>
</otherwise>
</choose>
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if>
......@@ -2192,9 +2413,22 @@
tzs_jg_vehicle_information tjvi
LEFT JOIN tzs_jg_vehicle_information_eq tjvie ON tjvi.sequence_nbr = tjvie.vehicle_id
LEFT JOIN idx_biz_jg_register_info ri ON tjvie.equ_id = ri.RECORD
WHERE
tjvi.org_branch_code like CONCAT(#{orgCode}, '%')
and tjvi.status != '已作废'
WHERE tjvi.status != '已作废'
<choose>
<when test='dto.cityCode != null and dto.cityCode == "610000"'>
and 1=1
</when>
<otherwise>
<if test="dto.companyCodes != null and dto.companyCodes.size > 0">
and tjvi.receive_company_code =
ANY(ARRAY[
<foreach collection="dto.companyCodes" item="companyCode" separator=",">
#{companyCode}
</foreach>
])
</if>
</otherwise>
</choose>
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if>
......@@ -2243,9 +2477,22 @@
tzs_jg_change_registration_reform tjcrr
LEFT JOIN tzs_jg_change_registration_reform_eq tjcrre ON tjcrr.sequence_nbr = tjcrre.equip_transfer_id
LEFT JOIN idx_biz_jg_register_info ri ON tjcrre.equ_id = ri.RECORD
WHERE
tjcrr.receive_company_org_code like CONCAT(#{orgCode}, '%')
and tjcrr.audit_status != '已作废'
WHERE tjcrr.audit_status != '已作废'
<choose>
<when test='dto.cityCode != null and dto.cityCode == "610000"'>
and 1=1
</when>
<otherwise>
<if test="dto.companyCodes != null and dto.companyCodes.size > 0">
and tjcrr.receive_company_code =
ANY(ARRAY[
<foreach collection="dto.companyCodes" item="companyCode" separator=",">
#{companyCode}
</foreach>
])
</if>
</otherwise>
</choose>
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if>
......@@ -2294,9 +2541,22 @@
tzs_jg_change_registration_transfer tjcrt
LEFT JOIN tzs_jg_change_registration_transfer_eq tjcrte ON tjcrt.sequence_nbr = tjcrte.equip_transfer_id
LEFT JOIN idx_biz_jg_register_info ri ON tjcrte.equ_id = ri.RECORD
WHERE
tjcrt.receive_company_org_code like CONCAT( #{orgCode}, '%')
and tjcrt.audit_status != '已作废'
WHERE tjcrt.audit_status != '已作废'
<choose>
<when test='dto.cityCode != null and dto.cityCode == "610000"'>
and 1=1
</when>
<otherwise>
<if test="dto.companyCodes != null and dto.companyCodes.size > 0">
and tjcrt.receive_company_code =
ANY(ARRAY[
<foreach collection="dto.companyCodes" item="companyCode" separator=",">
#{companyCode}
</foreach>
])
</if>
</otherwise>
</choose>
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if>
......@@ -2345,9 +2605,22 @@
tzs_jg_change_registration_unit tjcru
LEFT JOIN tzs_jg_change_registration_unit_eq tjcrue ON tjcru.sequence_nbr = tjcrue.unit_change_registration_id
LEFT JOIN idx_biz_jg_register_info ri ON tjcrue.equ_id = ri.RECORD
WHERE
tjcru.receive_company_org_code like CONCAT(#{orgCode}, '%')
and tjcru.status != '已作废'
WHERE tjcru.status != '已作废'
<choose>
<when test='dto.cityCode != null and dto.cityCode == "610000"'>
and 1=1
</when>
<otherwise>
<if test="dto.companyCodes != null and dto.companyCodes.size > 0">
and tjcru.receive_company_code =
ANY(ARRAY[
<foreach collection="dto.companyCodes" item="companyCode" separator=",">
#{companyCode}
</foreach>
])
</if>
</otherwise>
</choose>
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if>
......@@ -2394,10 +2667,22 @@
END AS status
FROM
tzs_jg_change_registration_name tjcrn
LEFT JOIN privilege_company pc ON pc.company_code = tjcrn.receive_org_code
WHERE
pc.org_code LIKE CONCAT ( #{orgCode}, '%' )
AND tjcrn.audit_status != '已作废'
WHERE tjcrn.audit_status != '已作废'
<choose>
<when test='dto.cityCode != null and dto.cityCode == "610000"'>
and 1=1
</when>
<otherwise>
<if test="dto.companyCodes != null and dto.companyCodes.size > 0">
and tjcrn.receive_company_code =
ANY(ARRAY[
<foreach collection="dto.companyCodes" item="companyCode" separator=",">
#{companyCode}
</foreach>
])
</if>
</otherwise>
</choose>
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if>
......@@ -2449,10 +2734,22 @@
tzs_jg_enable_disable tjed
LEFT JOIN tzs_jg_enable_disable_eq tjede ON tjed.sequence_nbr = tjede.enable_disable_apply_id
LEFT JOIN idx_biz_jg_register_info ri ON tjede.equ_id = ri.RECORD
LEFT JOIN privilege_company pc ON pc.company_code = tjed.receive_company_code
WHERE
pc.org_code LIKE CONCAT ( #{orgCode}, '%' )
AND tjed.audit_status != '已作废'
WHERE tjed.audit_status != '已作废'
<choose>
<when test='dto.cityCode != null and dto.cityCode == "610000"'>
and 1=1
</when>
<otherwise>
<if test="dto.companyCodes != null and dto.companyCodes.size > 0">
and tjed.receive_company_code =
ANY(ARRAY[
<foreach collection="dto.companyCodes" item="companyCode" separator=",">
#{companyCode}
</foreach>
])
</if>
</otherwise>
</choose>
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if>
......@@ -2504,10 +2801,22 @@
tzs_jg_scrap_cancel tjsc
LEFT JOIN tzs_jg_scrap_cancel_eq tjsce ON tjsc.sequence_nbr = tjsce.equip_transfer_id
LEFT JOIN idx_biz_jg_register_info ri ON tjsce.equ_id = ri.RECORD
LEFT JOIN privilege_company pc ON pc.company_code = tjsc.receive_org_code
WHERE
pc.org_code LIKE CONCAT ( #{orgCode}, '%' )
AND tjsc.audit_status != '已作废'
WHERE tjsc.audit_status != '已作废'
<choose>
<when test='dto.cityCode != null and dto.cityCode == "610000"'>
and 1=1
</when>
<otherwise>
<if test="dto.companyCodes != null and dto.companyCodes.size > 0">
and tjsc.receive_company_code =
ANY(ARRAY[
<foreach collection="dto.companyCodes" item="companyCode" separator=",">
#{companyCode}
</foreach>
])
</if>
</otherwise>
</choose>
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if>
......@@ -2536,8 +2845,7 @@
</if>
</select>
<select id="getNoticeCountTopChart" resultType="java.lang.Long">
SELECT SUM
( T.num ) AS COUNT
SELECT SUM( T.num ) AS COUNT
FROM
(
SELECT COUNT
......@@ -2546,42 +2854,43 @@
T.install_unit_credit_code
FROM
tzs_jg_installation_notice T
WHERE
T.receive_company_org_code LIKE CONCAT ( #{dpFilterParamForDetailDto.orgCode}, '%' )
WHERE 1 = 1 <include refid="companyConditionForNotice"/>
GROUP BY
T.install_unit_credit_code UNION ALL
T.install_unit_credit_code
UNION ALL
SELECT COUNT
( 1 ) AS num,
T.install_unit_name AS company,
T.install_unit_credit_code
FROM
tzs_jg_maintain_notice T
WHERE
T.receive_company_org_code LIKE CONCAT ( #{dpFilterParamForDetailDto.orgCode}, '%' )
WHERE 1 = 1
<include refid="companyCondition"/>
GROUP BY
T.install_unit_credit_code UNION ALL
T.install_unit_credit_code
UNION ALL
SELECT
( 1 ) AS num,
T.install_unit_name AS company,
T.install_unit_credit_code
FROM
tzs_jg_reform_notice T
WHERE
T.receive_company_org_code LIKE CONCAT ( #{dpFilterParamForDetailDto.orgCode}, '%' )
WHERE 1 = 1
<include refid="companyCondition"/>
GROUP BY
T.install_unit_credit_code UNION ALL
T.install_unit_credit_code
UNION ALL
SELECT
( 1 ) AS num,
T.install_unit_name AS company,
T.install_unit_credit_code
FROM
tzs_jg_transfer_notice T
WHERE
T.receive_company_org_code LIKE CONCAT ( #{dpFilterParamForDetailDto.orgCode}, '%' )
WHERE 1 = 1
<include refid="companyCondition"/>
GROUP BY
T.install_unit_credit_code
) T
</select>
<select id="noticeCountTopPageNew" resultType="java.util.Map">
SELECT
......@@ -2650,38 +2959,37 @@
T.install_unit_credit_code
FROM
tzs_jg_installation_notice T
WHERE
T.receive_company_org_code LIKE CONCAT ( #{dpFilterParamForDetailDto.orgCode}, '%' )
WHERE 1 = 1 <include refid="companyConditionForNotice"/>
GROUP BY
T.install_unit_credit_code UNION ALL
T.install_unit_credit_code
UNION ALL
SELECT COUNT
( 1 ) AS num,
T.install_unit_name AS company,
T.install_unit_credit_code
FROM
tzs_jg_maintain_notice T
WHERE
T.receive_company_org_code LIKE CONCAT ( #{dpFilterParamForDetailDto.orgCode}, '%' )
WHERE 1 = 1 <include refid="companyCondition"/>
GROUP BY
T.install_unit_credit_code UNION ALL
T.install_unit_credit_code
UNION ALL
SELECT
( 1 ) AS num,
T.install_unit_name AS company,
T.install_unit_credit_code
FROM
tzs_jg_reform_notice T
WHERE
T.receive_company_org_code LIKE CONCAT ( #{dpFilterParamForDetailDto.orgCode}, '%' )
WHERE 1 = 1 <include refid="companyCondition"/>
GROUP BY
T.install_unit_credit_code UNION ALL
T.install_unit_credit_code
UNION ALL
SELECT
( 1 ) AS num,
T.install_unit_name AS company,
T.install_unit_credit_code
FROM
tzs_jg_transfer_notice T
WHERE
T.receive_company_org_code LIKE CONCAT ( #{dpFilterParamForDetailDto.orgCode}, '%' )
WHERE 1 = 1 <include refid="companyCondition"/>
GROUP BY
T.install_unit_credit_code
) T
......
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/JGDPStatisticsServiceImpl.java
View file @ c1b909b8
......@@ -1839,7 +1839,9 @@ public class JGDPStatisticsServiceImpl {
return resultList;
}
@FieldMapping({
@FieldMapping.FieldMap(sourceField = "cityCode", targetField = "companyCodes", serviceClass = StCommonServiceImpl.class, queryMethod = "getCompanyCodesByRegionCode"),
})
public Map<String, Object> JGCenterMapCountForGlobal(DPFilterParamDto dpFilterParamDto) {
Map<String, Object> result = new HashMap<>();
String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
......@@ -1865,20 +1867,19 @@ public class JGDPStatisticsServiceImpl {
// 6.使用登记办理量
this.staticsCenterMapCountDataForUseReg(result, orgCode);
// 7.施工告知办理量
this.staticsCenterMapCountDataForConstructionNotice(result, orgCode);
this.staticsCenterMapCountDataForConstructionNotice(result, dpFilterParamDto);
// 8.变更办理量
this.staticsCenterMapCountDataForChange(result, orgCode);
this.staticsCenterMapCountDataForChange(result, dpFilterParamDto);
return result;
}
private void staticsCenterMapCountDataForChange(Map<String, Object> result, String orgCode) {
Long num = jgStatisticsMapper.changeCountByOrgCode(orgCode);
private void staticsCenterMapCountDataForChange(Map<String, Object> result, DPFilterParamDto dpFilterParamDto) {
Long num = jgStatisticsMapper.changeCountByOrgCode(dpFilterParamDto);
result.put(DPMapStatisticsItemEnum.CHANGE_COUNT.getCode(), num);
}
private void staticsCenterMapCountDataForConstructionNotice(Map<String, Object> result, String orgCode) {
Long num = jgStatisticsMapper.constructionNoticeCount(orgCode);
private void staticsCenterMapCountDataForConstructionNotice(Map<String, Object> result, DPFilterParamDto dpFilterParamDto) {
Long num = jgStatisticsMapper.constructionNoticeCount(dpFilterParamDto);
result.put(DPMapStatisticsItemEnum.CONSTRUCTION_NOTICE_COUNT.getCode(), num);
}
......@@ -1916,34 +1917,39 @@ public class JGDPStatisticsServiceImpl {
}).collect(Collectors.toList());
}
@FieldMapping({
@FieldMapping.FieldMap(sourceField = "cityCode", targetField = "companyCodes", serviceClass = StCommonServiceImpl.class, queryMethod = "getCompanyCodesByRegionCode"),
})
public List<Map<String, Object>> noticeList(DPFilterParamDto dpFilterParamDto) {
String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
if (orgCode == null) {
return new ArrayList<>();
}
String time = LocalDate.now().minusDays(29).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
return jgStatisticsMapper.selectNoticeList(orgCode, time);
return jgStatisticsMapper.selectNoticeList(orgCode, time, dpFilterParamDto);
}
@FieldMapping({
@FieldMapping.FieldMap(sourceField = "cityCode", targetField = "companyCodes", serviceClass = StCommonServiceImpl.class, queryMethod = "getCompanyCodesByRegionCode"),
})
public List<Map<String, Object>> noticeCountTop(DPFilterParamDto dpFilterParamDto) {
String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
if (orgCode == null) {
return new ArrayList<>();
}
String time = LocalDate.now().minusDays(29).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
return jgStatisticsMapper.selectNoticeCountTopTen(orgCode, time);
return jgStatisticsMapper.selectNoticeCountTopTen(orgCode, time, dpFilterParamDto);
}
@FieldMapping({
@FieldMapping.FieldMap(sourceField = "cityCode", targetField = "companyCodes", serviceClass = StCommonServiceImpl.class, queryMethod = "getCompanyCodesByRegionCode"),
})
public Map<String, Object> noticeCountTopChart(DPFilterParamForDetailDto dpFilterParamForDetailDto) {
List<RegionModel> regionModels = stCommonService.setRegionIfRootParent(dpFilterParamForDetailDto.getCityCode());
List<Map<String, Object>> result = regionModels.parallelStream().map(r -> {
String orgCode = stCommonService.getAndSetOrgCode(r.getRegionCode() + "");
DPFilterParamForDetailDto dpFilterParamForDetailDtoForSearch = new DPFilterParamForDetailDto();
dpFilterParamForDetailDtoForSearch.setOrgCode(orgCode);
dpFilterParamForDetailDtoForSearch.setCityCode(r.getRegionCode() + "");
Map<String, Object> itemResult = new HashMap<>();
itemResult.put("xdata", r.getRegionName());
getNoticeCountTopChart(itemResult, dpFilterParamForDetailDtoForSearch);
getNoticeCountTopChart(itemResult, dpFilterParamForDetailDto);
return itemResult;
}).collect(Collectors.toList());
......@@ -1970,6 +1976,7 @@ public class JGDPStatisticsServiceImpl {
return returnMap;
}
@FieldMapping({@FieldMapping.FieldMap(sourceField = "cityCode", paramIndex = 1, targetField = "companyCodes", serviceClass = StCommonServiceImpl.class, queryMethod = "getCompanyCodesByRegionCode"),})
public Page<Map<String, Object>> noticeCountTopPage(Page<Map<String, Object>> page, DPFilterParamForDetailDto dpFilterParamForDetailDto) {
String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamForDetailDto.getCityCode());
dpFilterParamForDetailDto.setOrgCode(orgCode);
......@@ -2166,6 +2173,9 @@ public class JGDPStatisticsServiceImpl {
return result;
}
@FieldMapping({
@FieldMapping.FieldMap(sourceField = "cityCode", paramIndex = 1, targetField = "companyCodes", serviceClass = StCommonServiceImpl.class, queryMethod = "getCompanyCodesByRegionCode"),
})
public Page<Map<String, Object>> noticeDetailList(Page<Map<String, Object>> page, DPFilterParamForDetailDto dpFilterParamDto) {
String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
if (orgCode == null) {
......
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