diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/AssessController.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/AssessController.java index bb76e88..6147964 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/AssessController.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/AssessController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.common.service.IExpandComponentService; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.core.util.Convert; import com.casic.missiles.modular.assess.dto.*; import com.casic.missiles.modular.assess.enums.AssessExportEnum; import com.casic.missiles.modular.assess.model.AssessFactor; @@ -797,9 +798,21 @@ return ResponseData.success(overviewDTO); } + /** + * 案卷情况统计 + */ + @RequestMapping(value = "/case/overview") + @ResponseBody + public Object caseOverview(String beginDate,String endDate) { + OverviewDTO overviewDTO =null; + overviewDTO = overview(beginDate, endDate,null); + Map map = new HashMap<>(); + map.put("report",Convert.toInt(overviewDTO.getQuickReport())+Convert.toInt(overviewDTO.getNormalReport())); + map.put("register",Convert.toInt(overviewDTO.getRegister())); + map.put("process",Convert.toInt(overviewDTO.getProcess())); - - + return ResponseData.success(map); + } /** diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/AssessController.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/AssessController.java index bb76e88..6147964 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/AssessController.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/AssessController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.common.service.IExpandComponentService; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.core.util.Convert; import com.casic.missiles.modular.assess.dto.*; import com.casic.missiles.modular.assess.enums.AssessExportEnum; import com.casic.missiles.modular.assess.model.AssessFactor; @@ -797,9 +798,21 @@ return ResponseData.success(overviewDTO); } + /** + * 案卷情况统计 + */ + @RequestMapping(value = "/case/overview") + @ResponseBody + public Object caseOverview(String beginDate,String endDate) { + OverviewDTO overviewDTO =null; + overviewDTO = overview(beginDate, endDate,null); + Map map = new HashMap<>(); + map.put("report",Convert.toInt(overviewDTO.getQuickReport())+Convert.toInt(overviewDTO.getNormalReport())); + map.put("register",Convert.toInt(overviewDTO.getRegister())); + map.put("process",Convert.toInt(overviewDTO.getProcess())); - - + return ResponseData.success(map); + } /** diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 2d67c8a..c76e82f 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -29,7 +29,7 @@ case: cancelNodes: 30303,30302,30304 #允许撤销的节点key config: - export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\ + export-path: D:\casic\export\smartwell\export\ config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\ office: maxRowsExcel: 65536