guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

隐患汇总增加内容并优化

0927cmt
zhaoyu 2024-05-07 11:26:03 +08:00
parent 6dc35668e7
commit bb6c7d8361
4 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java
View File

@ -1771,10 +1771,23 @@ public class HiddenApiController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
if (pd.get("YEAR").equals("")){ if (pd.get("YEAR").equals("")){
pd.put("YEAR","2024"); String year = DateUtil.getYear();
pd.put("YEAR",year);
} }
List<PageData> dataList = hiddenApiService.goSummaryTable(pd); List<PageData> dataList = hiddenApiService.goSummaryTable(pd);
List<PageData> dataTypeList = hiddenApiService.goSummaryTypeTable(pd);
List<PageData> varList = hiddenApiService.dealData(dataList); List<PageData> varList = hiddenApiService.dealData(dataList);
List<PageData> varTypeList = hiddenApiService.dealData(dataTypeList);
for(PageData pdDate:varList){
for(PageData pdTypeDate:varTypeList){
if(pdDate.getString("MONTH").equals(pdTypeDate.getString("MONTH"))){
pdDate.put("wdbaqztCount",pdTypeDate.getString("wdbaqztCount"));
pdDate.put("gldqxCount",pdTypeDate.getString("gldqxCount"));
pdDate.put("hjdbaqysCount",pdTypeDate.getString("hjdbaqysCount"));
pdDate.put("rdbaqysCount",pdTypeDate.getString("rdbaqysCount"));
}
}
}
map.put("varList", varList); map.put("varList", varList);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;

3
src/main/java/com/zcloud/mapper/datasource/hiddenApi/HiddenApiMapper.java
View File

@ -87,5 +87,8 @@ public interface HiddenApiMapper {
List<PageData> goSummaryTable(PageData pd); List<PageData> goSummaryTable(PageData pd);
List<PageData> listForExcel(PageData pd); List<PageData> listForExcel(PageData pd);
List<PageData> goSummaryTypeTable(PageData pd);
} }

2
src/main/java/com/zcloud/service/hiddenApi/HiddenApiService.java
View File

@ -111,5 +111,7 @@ public interface HiddenApiService {
public List<PageData> dealData (List<PageData> pd) throws Exception; public List<PageData> dealData (List<PageData> pd) throws Exception;
public List<PageData> listForExcel (PageData pd) throws Exception; public List<PageData> listForExcel (PageData pd) throws Exception;
public List<PageData> goSummaryTypeTable (PageData pd) throws Exception;
} }

16
src/main/java/com/zcloud/service/hiddenApi/impl/HiddenApiServiceImpl.java
View File

@ -281,6 +281,17 @@ public class HiddenApiServiceImpl implements HiddenApiService{
return hiddenApiMapper.listForExcel(pd); return hiddenApiMapper.listForExcel(pd);
} }
/**
* 根据类型获取统计数据
* @param pd
* @return
* @throws Exception
*/
@Override
public List<PageData> goSummaryTypeTable(PageData pd) throws Exception {
return hiddenApiMapper.goSummaryTypeTable(pd);
}
public List<PageData> dealData (List<PageData> pdList) throws Exception{ public List<PageData> dealData (List<PageData> pdList) throws Exception{
ArrayList<PageData> varList = new ArrayList<>(); ArrayList<PageData> varList = new ArrayList<>();
PageData pd1 = new PageData(); PageData pd1 = new PageData();
@ -372,6 +383,11 @@ public class HiddenApiServiceImpl implements HiddenApiService{
pd.put("TOTAL_COUNT_OTHER",pageData.getString("TOTAL_COUNT")); pd.put("TOTAL_COUNT_OTHER",pageData.getString("TOTAL_COUNT"));
pd.put("REVISED_COUNT_OTHER",pageData.getString("REVISED_COUNT")); pd.put("REVISED_COUNT_OTHER",pageData.getString("REVISED_COUNT"));
pd.put("COMPLERATE_OTHER",pageData.getString("COMPLERATE")); pd.put("COMPLERATE_OTHER",pageData.getString("COMPLERATE"));
}else {
pd.put("wdbaqztCount",pageData.getString("wdbaqztCount"));
pd.put("gldqxCount",pageData.getString("gldqxCount"));
pd.put("hjdbaqysCount",pageData.getString("hjdbaqysCount"));
pd.put("rdbaqysCount",pageData.getString("rdbaqysCount"));
} }
pd.put("CREATE_MONTH",pageData.getString("CREATE_MONTH")); pd.put("CREATE_MONTH",pageData.getString("CREATE_MONTH"));
return pd; return pd;