Skip to content

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

各地市业务办理时效统计修改

parent 2b9594bf
Show whitespace changes
Inline Side-by-side
Showing with 215 additions and 244 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/DPStatisticsMapper.java
View file @ a3335e6c
......@@ -11,31 +11,31 @@ public interface DPStatisticsMapper {
List<Map<String, Object>> maintenanceCountTopTen(@Param("dpFilterParamDto") DPFilterParamDto dpFilterParamDto);
List<Map<String, Object>> maintenanceCount(@Param("dpFilterParamDto") DPFilterParamDto dpFilterParamDto);
List<Map<String, Object>> installCount(@Param("cityCode") String cityCode);
int installCount(@Param("orgCode") String orgCode);
List<Map<String, Object>> maintenanceNoticeCount(@Param("cityCode") String cityCode);
int maintenanceNoticeCount(@Param("orgCode") String orgCode);
List<Map<String, Object>> reformCount(@Param("cityCode") String cityCode);
int reformCount(@Param("orgCode") String orgCode);
List<Map<String, Object>> transferCount(@Param("cityCode") String cityCode);
int transferCount(@Param("orgCode") String orgCode);
List<Map<String, Object>> useCount(@Param("cityCode") String cityCode);
int useCount(@Param("orgCode") String orgCode);
List<Map<String, Object>> vehicleCount(@Param("cityCode") String cityCode);
int vehicleCount(@Param("orgCode") String orgCode);
List<Map<String, Object>> changeNameCount(@Param("cityCode") String cityCode);
int changeNameCount(@Param("orgCode") String orgCode);
List<Map<String, Object>> changeReformCount(@Param("cityCode") String cityCode);
int changeReformCount(@Param("orgCode") String orgCode);
List<Map<String, Object>> changeTransferCount(@Param("cityCode") String cityCode);
int changeTransferCount(@Param("orgCode") String orgCode);
List<Map<String, Object>> changeUnitCount(@Param("cityCode") String cityCode);
int changeUnitCount(@Param("orgCode") String orgCode);
List<Map<String, Object>> changeVehicleCount(@Param("cityCode") String cityCode);
int changeVehicleCount(@Param("orgCode") String orgCode);
List<Map<String, Object>> disableCount(@Param("cityCode") String cityCode);
int disableCount(@Param("orgCode") String orgCode);
List<Map<String, Object>> cancelCount(@Param("cityCode") String cityCode);
int cancelCount(@Param("cityCode") String cityCode);
List<Map<String, Object>> installEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/DPStatisticsMapper.xml
View file @ a3335e6c
......@@ -36,228 +36,153 @@
GROUP BY
sr.region_code
</select>
<select id="installCount" resultType="java.util.Map">
<select id="installCount" resultType="int">
SELECT COUNT
( 1 ),
pc.company_name AS companyName,
sr.region_name AS regionName,
sr.region_code AS regionCode
( 1 )
FROM
privilege_company pc
INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
INNER JOIN tzs_jg_installation_notice T ON T.use_unit_credit_code = bi.use_unit_code and T.notice_status = 6616
INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
tzs_jg_installation_notice T
WHERE
pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
GROUP BY
sr.region_code
T.notice_status = 6616
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</select>
<select id="maintenanceNoticeCount" resultType="java.util.Map">
<select id="maintenanceNoticeCount" resultType="int">
SELECT COUNT
( 1 ),
pc.company_name AS companyName,
sr.region_name AS regionName,
sr.region_code
( 1 )
FROM
privilege_company pc
INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
INNER JOIN tzs_jg_maintain_notice mn ON mn.use_unit_credit_code = bi.use_unit_code
AND mn.notice_status = 6616
INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
tzs_jg_maintain_notice T
WHERE
pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
GROUP BY
sr.region_code
T.notice_status = 6616
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</select>
<select id="reformCount" resultType="java.util.Map">
<select id="reformCount" resultType="int">
SELECT COUNT
( 1 ),
pc.company_name AS companyName,
sr.region_name AS regionName,
sr.region_code
( 1 )
FROM
privilege_company pc
INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
INNER JOIN tzs_jg_reform_notice rm ON rm.use_unit_credit_code = bi.use_unit_code
AND rm.notice_status = 6616
INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
tzs_jg_reform_notice T
WHERE
pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
GROUP BY
sr.region_code
T.notice_status = 6616
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</select>
<select id="transferCount" resultType="java.util.Map">
<select id="transferCount" resultType="int">
SELECT COUNT
( 1 ),
pc.company_name AS companyName,
sr.region_name AS regionName,
sr.region_code
( 1 )
FROM
privilege_company pc
INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
INNER JOIN tzs_jg_transfer_notice tn ON tn.use_unit_credit_code = bi.use_unit_code
AND tn.notice_status = 6616
INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
tzs_jg_transfer_notice T
WHERE
pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
GROUP BY
sr.region_code
T.notice_status = 6616
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</select>
<select id="useCount" resultType="java.util.Map">
<select id="useCount" resultType="int">
SELECT COUNT
( 1 ),
pc.company_name AS companyName,
sr.region_name AS regionName,
sr.region_code
( 1 )
FROM
privilege_company pc
INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
INNER JOIN tzs_jg_use_registration ur ON ur.use_unit_credit_code = bi.use_unit_code
AND ur.audit_status = '已完成'
INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
tzs_jg_use_registration T
WHERE
pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
GROUP BY
sr.region_code
T.audit_status = '已完成'
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</select>
<select id="vehicleCount" resultType="java.util.Map">
<select id="vehicleCount" resultType="int">
SELECT COUNT
( 1 ),
pc.company_name AS companyName,
sr.region_name AS regionName,
sr.region_code
( 1 )
FROM
privilege_company pc
INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
INNER JOIN tzs_jg_vehicle_information vi ON vi.use_unit_credit_code = bi.use_unit_code
AND vi.status = '已完成'
INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
tzs_jg_vehicle_information T
WHERE
pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
GROUP BY
sr.region_code
T.status = '已完成'
AND T.receive_org_code LIKE CONCAT ( #{orgCode}, '%' )
</select>
<select id="changeNameCount" resultType="java.util.Map">
<select id="changeNameCount" resultType="int">
SELECT COUNT
( 1 ),
pc.company_name AS companyName,
sr.region_name AS regionName,
sr.region_code
( 1 )
FROM
(
SELECT
crn.sequence_nbr,
pc.org_code
FROM
privilege_company pc
INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
INNER JOIN tzs_jg_change_registration_name crn ON crn.use_unit_credit_code = bi.use_unit_code
INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code = pc.org_code
INNER JOIN tzs_jg_change_registration_name crn ON bi.office_region LIKE CONCAT ( '%', crn.receive_company_code, '%' )
AND crn.audit_status = '已完成'
INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
WHERE
pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
pc.org_code LIKE concat ( #{orgCode}, '%' )
GROUP BY
sr.region_code
crn.sequence_nbr
)
</select>
<select id="changeReformCount" resultType="java.util.Map">
<select id="changeReformCount" resultType="int">
SELECT COUNT
( 1 ),
pc.company_name AS companyName,
sr.region_name AS regionName,
sr.region_code
( 1 )
FROM
privilege_company pc
INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
INNER JOIN tzs_jg_change_registration_reform t ON t.use_unit_credit_code = bi.use_unit_code
AND t.audit_status = '已完成'
INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
tzs_jg_change_registration_reform T
WHERE
pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
GROUP BY
sr.region_code
T.audit_status = '已完成'
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</select>
<select id="changeTransferCount" resultType="java.util.Map">
<select id="changeTransferCount" resultType="int">
SELECT COUNT
( 1 ),
pc.company_name AS companyName,
sr.region_name AS regionName,
sr.region_code
( 1 )
FROM
privilege_company pc
INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
INNER JOIN tzs_jg_change_registration_transfer t ON t.use_unit_credit_code = bi.use_unit_code
AND t.audit_status = '已完成'
INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
tzs_jg_change_registration_transfer T
WHERE
pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
GROUP BY
sr.region_code
T.audit_status = '已完成'
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</select>
<select id="changeUnitCount" resultType="java.util.Map">
<select id="changeUnitCount" resultType="int">
SELECT COUNT
( 1 ),
pc.company_name AS companyName,
sr.region_name AS regionName,
sr.region_code
( 1 )
FROM
privilege_company pc
INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
INNER JOIN tzs_jg_change_registration_unit t ON t.use_unit_credit_code = bi.use_unit_code
AND t.status = '已完成'
INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
tzs_jg_change_registration_unit T
WHERE
pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
GROUP BY
sr.region_code
T.status = '已完成'
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</select>
<select id="changeVehicleCount" resultType="java.util.Map">
<select id="changeVehicleCount" resultType="int">
SELECT COUNT
( 1 ),
pc.company_name AS companyName,
sr.region_name AS regionName,
sr.region_code
( 1 )
FROM
privilege_company pc
INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
INNER JOIN tzs_jg_change_registration_unit t ON t.use_unit_credit_code = bi.use_unit_code
AND t.status = '已完成'
INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
tzs_jg_change_vehicle_registration_unit T
WHERE
pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
GROUP BY
sr.region_code
T.status = '已完成'
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</select>
<select id="disableCount" resultType="java.util.Map">
<select id="disableCount" resultType="int">
SELECT COUNT
( 1 ),
pc.company_name AS companyName,
sr.region_name AS regionName,
sr.region_code
( 1 )
FROM
(
SELECT
crn.sequence_nbr
FROM
privilege_company pc
INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
INNER JOIN tzs_jg_enable_disable t ON t.use_unit_credit_code = bi.use_unit_code
AND t.audit_status = '已完成'
INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code = pc.org_code
INNER JOIN tzs_jg_enable_disable crn ON bi.office_region LIKE CONCAT ( '%', crn.receive_company_code, '%' )
AND crn.audit_status = '已完成'
WHERE
pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
pc.org_code LIKE concat ( #{orgCode}, '%' )
GROUP BY
sr.region_code
crn.sequence_nbr
)
</select>
<select id="cancelCount" resultType="java.util.Map">
<select id="cancelCount" resultType="int">
SELECT COUNT
( 1 ),
pc.company_name AS companyName,
sr.region_name AS regionName,
sr.region_code
( 1 )
FROM
(
SELECT
crn.sequence_nbr
FROM
privilege_company pc
INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
INNER JOIN tzs_jg_scrap_cancel t ON t.use_unit_code = bi.use_unit_code
AND t.audit_status = '已完成'
INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code = pc.org_code
INNER JOIN tzs_jg_scrap_cancel crn ON bi.office_region LIKE CONCAT ( '%', crn.receive_company_code, '%' )
AND crn.audit_status = '已完成'
WHERE
pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
pc.org_code LIKE concat ( #{cityCode}, '%' )
GROUP BY
sr.region_code
crn.sequence_nbr
)
</select>
<select id="installEquCount" resultType="java.util.Map">
SELECT COUNT
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DPStatisticsServiceImpl.java
View file @ a3335e6c
......@@ -890,128 +890,174 @@ public class DPStatisticsServiceImpl {
}
public Map<String, Object> cityBusinessCount(DPFilterParamDto dpFilterParamDto) {
List<RegionModel> regionModels = setRegionIfRootParent(dpFilterParamDto);
Map<String, Object> resultMap = new HashMap<>();
/**
* 业务类型0告知管理，1使用登记，2变更登记，3停用启用，4注销报废
*/
if ("0".equals(dpFilterParamDto.getBusinessKey())) {
resultMap = noticeCount(resultMap, dpFilterParamDto.getCityCode());
resultMap = noticeCount(resultMap, regionModels);
} else if ("1".equals(dpFilterParamDto.getBusinessKey())) {
resultMap = useCount(resultMap, dpFilterParamDto.getCityCode());
resultMap = useCount(resultMap, regionModels);
} else if ("2".equals(dpFilterParamDto.getBusinessKey())) {
resultMap = changeCount(resultMap, dpFilterParamDto.getCityCode());
resultMap = changeCount(resultMap, regionModels);
} else if ("3".equals(dpFilterParamDto.getBusinessKey())) {
resultMap = disableCount(resultMap, dpFilterParamDto.getCityCode());
resultMap = disableCount(resultMap, regionModels);
} else if ("4".equals(dpFilterParamDto.getBusinessKey())) {
resultMap = cancelCount(resultMap, dpFilterParamDto.getCityCode());
resultMap = cancelCount(resultMap, regionModels);
}
return resultMap;
}
private Map<String, Object> cancelCount(Map<String, Object> resultMap, String cityCode) {
Map<String, Integer> countMap = new HashMap<>();
//注销报废
List<Map<String, Object>> cancelList = dpStatisticsMapper.cancelCount(cityCode);
countByMap(countMap, cancelList);
private Map<String, Object> cancelCount(Map<String, Object> resultMap, List<RegionModel> regionModelList) {
List<Object> xDataList = new ArrayList<>();
List<Object> yDataList = new ArrayList<>();
countMap.forEach((k, v) -> {
xDataList.add(k);
yDataList.add(v);
});
for(int i = 0; i < regionModelList.size(); i++) {
String orgCode = regionCodeOrgCodeMap.get(regionModelList.get(i).getRegionCode());
if (orgCode == null) {
orgCode = commonMapper.getOrgCodeByCompanyCode(regionModelList.get(i).getRegionCode() + "");
if (orgCode != null) {
regionCodeOrgCodeMap.put(regionModelList.get(i).getRegionCode() + "", orgCode);
}
}
if(orgCode != null) {
//注销报废
int cancelCoount = dpStatisticsMapper.cancelCount(orgCode);
xDataList.add(regionModelList.get(i).getRegionName());
yDataList.add(cancelCoount);
}else {
xDataList.add(regionModelList.get(i).getRegionName());
yDataList.add(0);
}
}
resultMap.put("xdata", xDataList);
resultMap.put("ydata", yDataList);
return resultMap;
}
private Map<String, Object> disableCount(Map<String, Object> resultMap, String cityCode) {
Map<String, Integer> countMap = new HashMap<>();
//启用停用
List<Map<String, Object>> disableList = dpStatisticsMapper.disableCount(cityCode);
countByMap(countMap, disableList);
private Map<String, Object> disableCount(Map<String, Object> resultMap, List<RegionModel> regionModelList) {
List<Object> xDataList = new ArrayList<>();
List<Object> yDataList = new ArrayList<>();
countMap.forEach((k, v) -> {
xDataList.add(k);
yDataList.add(v);
});
for(int i = 0; i < regionModelList.size(); i++) {
String orgCode = regionCodeOrgCodeMap.get(regionModelList.get(i).getRegionCode());
if (orgCode == null) {
orgCode = commonMapper.getOrgCodeByCompanyCode(regionModelList.get(i).getRegionCode() + "");
if (orgCode != null) {
regionCodeOrgCodeMap.put(regionModelList.get(i).getRegionCode() + "", orgCode);
}
}
if(orgCode != null) {
//启用停用
int disableCount = dpStatisticsMapper.disableCount(orgCode);
xDataList.add(regionModelList.get(i).getRegionName());
yDataList.add(disableCount);
}else{
xDataList.add(regionModelList.get(i).getRegionName());
yDataList.add(0);
}
}
resultMap.put("xdata", xDataList);
resultMap.put("ydata", yDataList);
return resultMap;
}
private Map<String, Object> changeCount(Map<String, Object> resultMap, String cityCode) {
Map<String, Integer> countMap = new HashMap<>();
private Map<String, Object> changeCount(Map<String, Object> resultMap, List<RegionModel> regionModelList) {
List<Object> xDataList = new ArrayList<>();
List<Object> yDataList = new ArrayList<>();
for(int i = 0; i < regionModelList.size(); i++) {
String orgCode = regionCodeOrgCodeMap.get(regionModelList.get(i).getRegionCode());
if (orgCode == null) {
orgCode = commonMapper.getOrgCodeByCompanyCode(regionModelList.get(i).getRegionCode() + "");
if (orgCode != null) {
regionCodeOrgCodeMap.put(regionModelList.get(i).getRegionCode() + "", orgCode);
}
}
if(orgCode != null) {
//更名变更登记
List<Map<String, Object>> changeNameList = dpStatisticsMapper.changeNameCount(cityCode);
countByMap(countMap, changeNameList);
int changeNameList = dpStatisticsMapper.changeNameCount(orgCode);
//改造变更登记
List<Map<String, Object>> reformList = dpStatisticsMapper.changeReformCount(cityCode);
countByMap(countMap, reformList);
int reformList = dpStatisticsMapper.changeReformCount(orgCode);
//移装变更登记
List<Map<String, Object>> transferList = dpStatisticsMapper.changeTransferCount(cityCode);
countByMap(countMap, transferList);
int transferList = dpStatisticsMapper.changeTransferCount(orgCode);
//单位变更登记
List<Map<String, Object>> unitList = dpStatisticsMapper.changeUnitCount(cityCode);
countByMap(countMap, unitList);
int unitList = dpStatisticsMapper.changeUnitCount(orgCode);
//单位变更登记
List<Map<String, Object>> vehicleList = dpStatisticsMapper.changeVehicleCount(cityCode);
countByMap(countMap, vehicleList);
int vehicleList = dpStatisticsMapper.changeVehicleCount(orgCode);
List<Object> xDataList = new ArrayList<>();
List<Object> yDataList = new ArrayList<>();
countMap.forEach((k, v) -> {
xDataList.add(k);
yDataList.add(v);
});
xDataList.add(regionModelList.get(i).getRegionName());
yDataList.add(changeNameList + reformList + transferList + unitList + vehicleList);
}else{
xDataList.add(regionModelList.get(i).getRegionName());
yDataList.add(0);
}
}
resultMap.put("xdata", xDataList);
resultMap.put("ydata", yDataList);
return resultMap;
}
private Map<String, Object> useCount(Map<String, Object> resultMap, String cityCode) {
Map<String, Integer> countMap = new HashMap<>();
private Map<String, Object> useCount(Map<String, Object> resultMap, List<RegionModel> regionModelList) {
List<Object> xDataList = new ArrayList<>();
List<Object> yDataList = new ArrayList<>();
for(int i = 0; i < regionModelList.size(); i++) {
String orgCode = regionCodeOrgCodeMap.get(regionModelList.get(i).getRegionCode());
if (orgCode == null) {
orgCode = commonMapper.getOrgCodeByCompanyCode(regionModelList.get(i).getRegionCode()+"");
if(orgCode != null) {
regionCodeOrgCodeMap.put(regionModelList.get(i).getRegionCode() + "", orgCode);
}
}
if(orgCode != null) {
//使用登记
List<Map<String, Object>> useList = dpStatisticsMapper.useCount(cityCode);
countByMap(countMap, useList);
int useCount = dpStatisticsMapper.useCount(orgCode);
//气瓶登记
List<Map<String, Object>> vehicleList = dpStatisticsMapper.vehicleCount(cityCode);
countByMap(countMap, vehicleList);
int vehicleCount = dpStatisticsMapper.vehicleCount(orgCode);
List<Object> xDataList = new ArrayList<>();
List<Object> yDataList = new ArrayList<>();
countMap.forEach((k, v) -> {
xDataList.add(k);
yDataList.add(v);
});
xDataList.add(regionModelList.get(i).getRegionName());
yDataList.add(useCount + vehicleCount);
}else{
xDataList.add(regionModelList.get(i).getRegionName());
yDataList.add(0);
}
}
resultMap.put("xdata", xDataList);
resultMap.put("ydata", yDataList);
return resultMap;
}
private Map<String, Object> noticeCount(Map<String, Object> resultMap, String cityCode) {
Map<String, Integer> countMap = new HashMap<>();
private Map<String, Object> noticeCount(Map<String, Object> resultMap, List<RegionModel> regionModelList) {
List<Object> xDataList = new ArrayList<>();
List<Object> yDataList = new ArrayList<>();
for(int i = 0; i < regionModelList.size(); i++) {
String orgCode = regionCodeOrgCodeMap.get(regionModelList.get(i).getRegionCode());
if (orgCode == null) {
orgCode = commonMapper.getOrgCodeByCompanyCode(regionModelList.get(i).getRegionCode()+"");
if(orgCode != null) {
regionCodeOrgCodeMap.put(regionModelList.get(i).getRegionCode() + "", orgCode);
}
}
if(orgCode != null) {
//安装告知
List<Map<String, Object>> installlist = dpStatisticsMapper.installCount(cityCode);
countByMap(countMap, installlist);
int installCount = dpStatisticsMapper.installCount(orgCode);
//维修告知
List<Map<String, Object>> maintenancelist = dpStatisticsMapper.maintenanceNoticeCount(cityCode);
countByMap(countMap, maintenancelist);
int maintenanceCount = dpStatisticsMapper.maintenanceNoticeCount(orgCode);
//改造告知
List<Map<String, Object>> reformlist = dpStatisticsMapper.reformCount(cityCode);
countByMap(countMap, reformlist);
int reformCount = dpStatisticsMapper.reformCount(orgCode);
//移装告知
List<Map<String, Object>> transferlist = dpStatisticsMapper.transferCount(cityCode);
countByMap(countMap, transferlist);
List<Object> xDataList = new ArrayList<>();
List<Object> yDataList = new ArrayList<>();
countMap.forEach((k, v) -> {
xDataList.add(k);
yDataList.add(v);
});
int transferCount = dpStatisticsMapper.transferCount(orgCode);
xDataList.add(regionModelList.get(i).getRegionName());
yDataList.add(installCount + maintenanceCount + reformCount + transferCount);
}else{
xDataList.add(regionModelList.get(i).getRegionName());
yDataList.add(0);
}
}
resultMap.put("xdata", xDataList);
resultMap.put("ydata", yDataList);
return resultMap;
......
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