diff --git a/src/main/java/com/cm/systemcity/controller/datarelease/DataReleaseController.java b/src/main/java/com/cm/systemcity/controller/datarelease/DataReleaseController.java index 15abba4..a6ef1e5 100644 --- a/src/main/java/com/cm/systemcity/controller/datarelease/DataReleaseController.java +++ b/src/main/java/com/cm/systemcity/controller/datarelease/DataReleaseController.java @@ -141,12 +141,13 @@ public class DataReleaseController extends AbstractController { reqParams.clear(); Map resItem = new HashMap<>(8); resItem.put("name",dictItem.getDictName()); - // 查询该街镇下所有普通案件 + // 查询该街镇下所有普通案件 已完结 + reqParams.put("caseStatus", "6"); reqParams.put("areaId",dictItem.getDictId()); List> normalList = dataReleaseDao.listReportCase(reqParams); // 查询该街镇下所有特殊案件 - List> specialList = dataReleaseDao.listSpecialReportCase(reqParams); - resItem.put("value",normalList.size() + specialList.size()); + /*List> specialList = dataReleaseDao.listSpecialReportCase(reqParams);*/ + resItem.put("value",normalList.size()); resList.add(resItem); } BigDataResult bdr = new BigDataResult(); @@ -172,6 +173,7 @@ public class DataReleaseController extends AbstractController { List columnsList = new ArrayList<>(); columnsList.add(Integer.parseInt(caseTypeItem.get("caseTypeCount").toString())); resItem.put("columns",columnsList); + resItem.put("caseTypeId",caseTypeItem.get("caseTypeId")); resList.add(resItem); } BigDataResult bdr = new BigDataResult(); @@ -404,6 +406,10 @@ public class DataReleaseController extends AbstractController { @GetMapping("list-page-report-case") public SuccessResultList> listPageReportCase(ListPage page) throws SearchException { Map params = requestParams(); + // 为了避免案件类型没传,单独处理 + if(params.get("caseFlowType") == null || "".equals(params.get("caseFlowType").toString().trim())){ + params.put("caseFlowType", "1,2"); + } page.setParams(params); SuccessResultList> resList = reportCaseService.listPageReportCase(page); return resList; diff --git a/src/main/java/com/cm/systemcity/task/SystemTask.java b/src/main/java/com/cm/systemcity/task/SystemTask.java index 08ef2b6..d879b70 100644 --- a/src/main/java/com/cm/systemcity/task/SystemTask.java +++ b/src/main/java/com/cm/systemcity/task/SystemTask.java @@ -44,7 +44,7 @@ public class SystemTask { /** * 每天0点定时任务 */ - @Scheduled(cron = "0 0 0 * * ?") + @Scheduled(cron = "0 0 1 * * ?") public void startTask() { clearSignUsers(); } diff --git a/src/main/resources/mybatis/mapper/datarelease/datarelease-mapper.xml b/src/main/resources/mybatis/mapper/datarelease/datarelease-mapper.xml index 369fea4..00dae19 100644 --- a/src/main/resources/mybatis/mapper/datarelease/datarelease-mapper.xml +++ b/src/main/resources/mybatis/mapper/datarelease/datarelease-mapper.xml @@ -86,9 +86,10 @@ COUNT(t1.case_type_id) caseTypeCount FROM city_report_case t1 - LEFT JOIN city_dict t2 ON t1.case_type_id = t2.dict_id + LEFT JOIN city_dict t2 ON t1.case_type_id = t2.dict_id WHERE t1.is_delete = '0' + AND t1.case_status = '6' GROUP BY t1.case_type_id, t2.dict_name diff --git a/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml b/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml index 677e8f7..ff43e9e 100755 --- a/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml +++ b/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml @@ -283,6 +283,9 @@ LEFT JOIN city_report_case_assign t2 ON t1.report_case_id = t2.case_id WHERE t1.is_delete = 0 + + AND FIND_IN_SET(t1.case_flow_type, #{caseFlowType}) + AND t1.case_number = #{caseNumber} diff --git a/src/main/resources/static/route/bigdata/list-case-info-ajlx.html b/src/main/resources/static/route/bigdata/list-case-info-ajlx.html new file mode 100644 index 0000000..828f4ef --- /dev/null +++ b/src/main/resources/static/route/bigdata/list-case-info-ajlx.html @@ -0,0 +1,432 @@ + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+
+ +
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+
+
+
+
+
+ + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/bigdata/list-case-info-ajlxtop10.html b/src/main/resources/static/route/bigdata/list-case-info-ajlxtop10.html new file mode 100644 index 0000000..b124e12 --- /dev/null +++ b/src/main/resources/static/route/bigdata/list-case-info-ajlxtop10.html @@ -0,0 +1,319 @@ + + + + + + + + + + + + + + + + + + +
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+
+ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/bigdata/list-case-info-gqyajzb.html b/src/main/resources/static/route/bigdata/list-case-info-gqyajzb.html new file mode 100644 index 0000000..540e344 --- /dev/null +++ b/src/main/resources/static/route/bigdata/list-case-info-gqyajzb.html @@ -0,0 +1,424 @@ + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+
+
+
+
+
+ + + + + + + + + + + \ No newline at end of file