diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java index a351fb3..b043d10 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java @@ -285,4 +285,15 @@ fileInputStream.close(); } } + + + /** + * 各街道案卷数量统计 + */ + @RequestMapping(value = "/highCaseEventByStreet") + @ResponseBody + public Object highCaseEventByStreet(String begTime, String endTime, String caseType) { + return ResponseData.success(iDepartmentAssessService.highCaseEventByStreet(begTime, endTime,caseType)); + + } } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java index a351fb3..b043d10 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java @@ -285,4 +285,15 @@ fileInputStream.close(); } } + + + /** + * 各街道案卷数量统计 + */ + @RequestMapping(value = "/highCaseEventByStreet") + @ResponseBody + public Object highCaseEventByStreet(String begTime, String endTime, String caseType) { + return ResponseData.success(iDepartmentAssessService.highCaseEventByStreet(begTime, endTime,caseType)); + + } } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java index 478c3d5..f50ec53 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java @@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** *

@@ -85,5 +86,7 @@ List sourceDictList(); - + List> highCaseEventByStreet(@Param("beg") String beg, + @Param("end") String end, + @Param("caseType") String caseType); } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java index a351fb3..b043d10 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java @@ -285,4 +285,15 @@ fileInputStream.close(); } } + + + /** + * 各街道案卷数量统计 + */ + @RequestMapping(value = "/highCaseEventByStreet") + @ResponseBody + public Object highCaseEventByStreet(String begTime, String endTime, String caseType) { + return ResponseData.success(iDepartmentAssessService.highCaseEventByStreet(begTime, endTime,caseType)); + + } } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java index 478c3d5..f50ec53 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java @@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** *

@@ -85,5 +86,7 @@ List sourceDictList(); - + List> highCaseEventByStreet(@Param("beg") String beg, + @Param("end") String end, + @Param("caseType") String caseType); } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml index db6ebbd..8b03d28 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml @@ -264,4 +264,22 @@ + + diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java index a351fb3..b043d10 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java @@ -285,4 +285,15 @@ fileInputStream.close(); } } + + + /** + * 各街道案卷数量统计 + */ + @RequestMapping(value = "/highCaseEventByStreet") + @ResponseBody + public Object highCaseEventByStreet(String begTime, String endTime, String caseType) { + return ResponseData.success(iDepartmentAssessService.highCaseEventByStreet(begTime, endTime,caseType)); + + } } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java index 478c3d5..f50ec53 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java @@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** *

@@ -85,5 +86,7 @@ List sourceDictList(); - + List> highCaseEventByStreet(@Param("beg") String beg, + @Param("end") String end, + @Param("caseType") String caseType); } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml index db6ebbd..8b03d28 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml @@ -264,4 +264,22 @@ + + diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java index 9395eba..dab5835 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java @@ -9,21 +9,30 @@ import com.casic.missiles.modular.assess.model.DepartmentAssessFactor; import java.util.List; +import java.util.Map; /** *

- * 服务类 + * 服务类 *

* * @author TEST203 * @since 2019-11-11 */ public interface IDepartmentAssessService extends IService { - List list(String beg,String end); + List list(String beg, String end); + List highEventList(String beg, String end); + List highCaseEventList(String beg, String end); + List sourceList(String beg, String end); + List ruleList(); - List caseAccessList(Page page,String beg, String end, + + List caseAccessList(Page page, String beg, String end, String caseType, Long depId); + + List> highCaseEventByStreet(String beg, String end, String caseType); + } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java index a351fb3..b043d10 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java @@ -285,4 +285,15 @@ fileInputStream.close(); } } + + + /** + * 各街道案卷数量统计 + */ + @RequestMapping(value = "/highCaseEventByStreet") + @ResponseBody + public Object highCaseEventByStreet(String begTime, String endTime, String caseType) { + return ResponseData.success(iDepartmentAssessService.highCaseEventByStreet(begTime, endTime,caseType)); + + } } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java index 478c3d5..f50ec53 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java @@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** *

@@ -85,5 +86,7 @@ List sourceDictList(); - + List> highCaseEventByStreet(@Param("beg") String beg, + @Param("end") String end, + @Param("caseType") String caseType); } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml index db6ebbd..8b03d28 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml @@ -264,4 +264,22 @@ + + diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java index 9395eba..dab5835 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java @@ -9,21 +9,30 @@ import com.casic.missiles.modular.assess.model.DepartmentAssessFactor; import java.util.List; +import java.util.Map; /** *

- * 服务类 + * 服务类 *

* * @author TEST203 * @since 2019-11-11 */ public interface IDepartmentAssessService extends IService { - List list(String beg,String end); + List list(String beg, String end); + List highEventList(String beg, String end); + List highCaseEventList(String beg, String end); + List sourceList(String beg, String end); + List ruleList(); - List caseAccessList(Page page,String beg, String end, + + List caseAccessList(Page page, String beg, String end, String caseType, Long depId); + + List> highCaseEventByStreet(String beg, String end, String caseType); + } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java index d77606d..7bfb8e5 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java @@ -18,6 +18,7 @@ import java.util.ArrayList; import java.util.Formatter; import java.util.List; +import java.util.Map; /** *

@@ -378,4 +379,9 @@ sourceDictList.add(caseSourceTotalDTO); return sourceDictList; } + + @Override + public List> highCaseEventByStreet(String beg, String end, String caseType) { + return this.baseMapper.highCaseEventByStreet(beg, end,caseType); + } } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java index a351fb3..b043d10 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java @@ -285,4 +285,15 @@ fileInputStream.close(); } } + + + /** + * 各街道案卷数量统计 + */ + @RequestMapping(value = "/highCaseEventByStreet") + @ResponseBody + public Object highCaseEventByStreet(String begTime, String endTime, String caseType) { + return ResponseData.success(iDepartmentAssessService.highCaseEventByStreet(begTime, endTime,caseType)); + + } } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java index 478c3d5..f50ec53 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java @@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** *

@@ -85,5 +86,7 @@ List sourceDictList(); - + List> highCaseEventByStreet(@Param("beg") String beg, + @Param("end") String end, + @Param("caseType") String caseType); } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml index db6ebbd..8b03d28 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml @@ -264,4 +264,22 @@ + + diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java index 9395eba..dab5835 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java @@ -9,21 +9,30 @@ import com.casic.missiles.modular.assess.model.DepartmentAssessFactor; import java.util.List; +import java.util.Map; /** *

- * 服务类 + * 服务类 *

* * @author TEST203 * @since 2019-11-11 */ public interface IDepartmentAssessService extends IService { - List list(String beg,String end); + List list(String beg, String end); + List highEventList(String beg, String end); + List highCaseEventList(String beg, String end); + List sourceList(String beg, String end); + List ruleList(); - List caseAccessList(Page page,String beg, String end, + + List caseAccessList(Page page, String beg, String end, String caseType, Long depId); + + List> highCaseEventByStreet(String beg, String end, String caseType); + } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java index d77606d..7bfb8e5 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java @@ -18,6 +18,7 @@ import java.util.ArrayList; import java.util.Formatter; import java.util.List; +import java.util.Map; /** *

@@ -378,4 +379,9 @@ sourceDictList.add(caseSourceTotalDTO); return sourceDictList; } + + @Override + public List> highCaseEventByStreet(String beg, String end, String caseType) { + return this.baseMapper.highCaseEventByStreet(beg, end,caseType); + } } diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java index 026bb39..b156d73 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java @@ -933,4 +933,22 @@ return results; } + /** + * 根据案卷状态统计 + */ + @RequestMapping(value = "/statisticByState") + @ResponseBody + public Object statisticByState(String isShopCase) { + return ResponseData.success(cwsCaseService.statisticByState(isShopCase)); + } + + /** + * 三包总览统计 + */ + @RequestMapping(value = "/statisticShop") + @ResponseBody + public Object statisticShop() { + return ResponseData.success(cwsCaseService.statisticShop()); + } + } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java index a351fb3..b043d10 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java @@ -285,4 +285,15 @@ fileInputStream.close(); } } + + + /** + * 各街道案卷数量统计 + */ + @RequestMapping(value = "/highCaseEventByStreet") + @ResponseBody + public Object highCaseEventByStreet(String begTime, String endTime, String caseType) { + return ResponseData.success(iDepartmentAssessService.highCaseEventByStreet(begTime, endTime,caseType)); + + } } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java index 478c3d5..f50ec53 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java @@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** *

@@ -85,5 +86,7 @@ List sourceDictList(); - + List> highCaseEventByStreet(@Param("beg") String beg, + @Param("end") String end, + @Param("caseType") String caseType); } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml index db6ebbd..8b03d28 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml @@ -264,4 +264,22 @@ + + diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java index 9395eba..dab5835 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java @@ -9,21 +9,30 @@ import com.casic.missiles.modular.assess.model.DepartmentAssessFactor; import java.util.List; +import java.util.Map; /** *

- * 服务类 + * 服务类 *

* * @author TEST203 * @since 2019-11-11 */ public interface IDepartmentAssessService extends IService { - List list(String beg,String end); + List list(String beg, String end); + List highEventList(String beg, String end); + List highCaseEventList(String beg, String end); + List sourceList(String beg, String end); + List ruleList(); - List caseAccessList(Page page,String beg, String end, + + List caseAccessList(Page page, String beg, String end, String caseType, Long depId); + + List> highCaseEventByStreet(String beg, String end, String caseType); + } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java index d77606d..7bfb8e5 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java @@ -18,6 +18,7 @@ import java.util.ArrayList; import java.util.Formatter; import java.util.List; +import java.util.Map; /** *

@@ -378,4 +379,9 @@ sourceDictList.add(caseSourceTotalDTO); return sourceDictList; } + + @Override + public List> highCaseEventByStreet(String beg, String end, String caseType) { + return this.baseMapper.highCaseEventByStreet(beg, end,caseType); + } } diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java index 026bb39..b156d73 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java @@ -933,4 +933,22 @@ return results; } + /** + * 根据案卷状态统计 + */ + @RequestMapping(value = "/statisticByState") + @ResponseBody + public Object statisticByState(String isShopCase) { + return ResponseData.success(cwsCaseService.statisticByState(isShopCase)); + } + + /** + * 三包总览统计 + */ + @RequestMapping(value = "/statisticShop") + @ResponseBody + public Object statisticShop() { + return ResponseData.success(cwsCaseService.statisticShop()); + } + } diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/CwsCaseMapper.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/CwsCaseMapper.java index 8be4b8e..70b9065 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/CwsCaseMapper.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/CwsCaseMapper.java @@ -43,4 +43,11 @@ List> completedList(@Param("page") Page page,@Param("actUserId")String actUserId,@Param("queryCondition") QueryCondition queryCondition); @Update("update dcm_cws_case set CASE_STATE = PRE_STATE where id = #{bizId}") void cancelCaseState(String bizId); + + List> statisticByState(@Param("isShopCase") String isShopCase); + + Integer workCount(@Param("isShopCase") String isShopCase); + Integer todayCaseCount(@Param("isShopCase") String isShopCase); + Integer allCaseCount(@Param("isShopCase") String isShopCase); + Integer merchantCount(); } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java index a351fb3..b043d10 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java @@ -285,4 +285,15 @@ fileInputStream.close(); } } + + + /** + * 各街道案卷数量统计 + */ + @RequestMapping(value = "/highCaseEventByStreet") + @ResponseBody + public Object highCaseEventByStreet(String begTime, String endTime, String caseType) { + return ResponseData.success(iDepartmentAssessService.highCaseEventByStreet(begTime, endTime,caseType)); + + } } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java index 478c3d5..f50ec53 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java @@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** *

@@ -85,5 +86,7 @@ List sourceDictList(); - + List> highCaseEventByStreet(@Param("beg") String beg, + @Param("end") String end, + @Param("caseType") String caseType); } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml index db6ebbd..8b03d28 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml @@ -264,4 +264,22 @@ + + diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java index 9395eba..dab5835 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java @@ -9,21 +9,30 @@ import com.casic.missiles.modular.assess.model.DepartmentAssessFactor; import java.util.List; +import java.util.Map; /** *

- * 服务类 + * 服务类 *

* * @author TEST203 * @since 2019-11-11 */ public interface IDepartmentAssessService extends IService { - List list(String beg,String end); + List list(String beg, String end); + List highEventList(String beg, String end); + List highCaseEventList(String beg, String end); + List sourceList(String beg, String end); + List ruleList(); - List caseAccessList(Page page,String beg, String end, + + List caseAccessList(Page page, String beg, String end, String caseType, Long depId); + + List> highCaseEventByStreet(String beg, String end, String caseType); + } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java index d77606d..7bfb8e5 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java @@ -18,6 +18,7 @@ import java.util.ArrayList; import java.util.Formatter; import java.util.List; +import java.util.Map; /** *

@@ -378,4 +379,9 @@ sourceDictList.add(caseSourceTotalDTO); return sourceDictList; } + + @Override + public List> highCaseEventByStreet(String beg, String end, String caseType) { + return this.baseMapper.highCaseEventByStreet(beg, end,caseType); + } } diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java index 026bb39..b156d73 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java @@ -933,4 +933,22 @@ return results; } + /** + * 根据案卷状态统计 + */ + @RequestMapping(value = "/statisticByState") + @ResponseBody + public Object statisticByState(String isShopCase) { + return ResponseData.success(cwsCaseService.statisticByState(isShopCase)); + } + + /** + * 三包总览统计 + */ + @RequestMapping(value = "/statisticShop") + @ResponseBody + public Object statisticShop() { + return ResponseData.success(cwsCaseService.statisticShop()); + } + } diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/CwsCaseMapper.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/CwsCaseMapper.java index 8be4b8e..70b9065 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/CwsCaseMapper.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/CwsCaseMapper.java @@ -43,4 +43,11 @@ List> completedList(@Param("page") Page page,@Param("actUserId")String actUserId,@Param("queryCondition") QueryCondition queryCondition); @Update("update dcm_cws_case set CASE_STATE = PRE_STATE where id = #{bizId}") void cancelCaseState(String bizId); + + List> statisticByState(@Param("isShopCase") String isShopCase); + + Integer workCount(@Param("isShopCase") String isShopCase); + Integer todayCaseCount(@Param("isShopCase") String isShopCase); + Integer allCaseCount(@Param("isShopCase") String isShopCase); + Integer merchantCount(); } diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml index 9ea04b3..bc5c3a2 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml @@ -635,4 +635,61 @@ ORDER BY a.CREATE_TIME DESC + + + + + + + + + diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java index a351fb3..b043d10 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java @@ -285,4 +285,15 @@ fileInputStream.close(); } } + + + /** + * 各街道案卷数量统计 + */ + @RequestMapping(value = "/highCaseEventByStreet") + @ResponseBody + public Object highCaseEventByStreet(String begTime, String endTime, String caseType) { + return ResponseData.success(iDepartmentAssessService.highCaseEventByStreet(begTime, endTime,caseType)); + + } } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java index 478c3d5..f50ec53 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java @@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** *

@@ -85,5 +86,7 @@ List sourceDictList(); - + List> highCaseEventByStreet(@Param("beg") String beg, + @Param("end") String end, + @Param("caseType") String caseType); } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml index db6ebbd..8b03d28 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml @@ -264,4 +264,22 @@ + + diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java index 9395eba..dab5835 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java @@ -9,21 +9,30 @@ import com.casic.missiles.modular.assess.model.DepartmentAssessFactor; import java.util.List; +import java.util.Map; /** *

- * 服务类 + * 服务类 *

* * @author TEST203 * @since 2019-11-11 */ public interface IDepartmentAssessService extends IService { - List list(String beg,String end); + List list(String beg, String end); + List highEventList(String beg, String end); + List highCaseEventList(String beg, String end); + List sourceList(String beg, String end); + List ruleList(); - List caseAccessList(Page page,String beg, String end, + + List caseAccessList(Page page, String beg, String end, String caseType, Long depId); + + List> highCaseEventByStreet(String beg, String end, String caseType); + } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java index d77606d..7bfb8e5 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java @@ -18,6 +18,7 @@ import java.util.ArrayList; import java.util.Formatter; import java.util.List; +import java.util.Map; /** *

@@ -378,4 +379,9 @@ sourceDictList.add(caseSourceTotalDTO); return sourceDictList; } + + @Override + public List> highCaseEventByStreet(String beg, String end, String caseType) { + return this.baseMapper.highCaseEventByStreet(beg, end,caseType); + } } diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java index 026bb39..b156d73 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java @@ -933,4 +933,22 @@ return results; } + /** + * 根据案卷状态统计 + */ + @RequestMapping(value = "/statisticByState") + @ResponseBody + public Object statisticByState(String isShopCase) { + return ResponseData.success(cwsCaseService.statisticByState(isShopCase)); + } + + /** + * 三包总览统计 + */ + @RequestMapping(value = "/statisticShop") + @ResponseBody + public Object statisticShop() { + return ResponseData.success(cwsCaseService.statisticShop()); + } + } diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/CwsCaseMapper.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/CwsCaseMapper.java index 8be4b8e..70b9065 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/CwsCaseMapper.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/CwsCaseMapper.java @@ -43,4 +43,11 @@ List> completedList(@Param("page") Page page,@Param("actUserId")String actUserId,@Param("queryCondition") QueryCondition queryCondition); @Update("update dcm_cws_case set CASE_STATE = PRE_STATE where id = #{bizId}") void cancelCaseState(String bizId); + + List> statisticByState(@Param("isShopCase") String isShopCase); + + Integer workCount(@Param("isShopCase") String isShopCase); + Integer todayCaseCount(@Param("isShopCase") String isShopCase); + Integer allCaseCount(@Param("isShopCase") String isShopCase); + Integer merchantCount(); } diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml index 9ea04b3..bc5c3a2 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml @@ -635,4 +635,61 @@ ORDER BY a.CREATE_TIME DESC + + + + + + + + + diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/ICwsCaseService.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/ICwsCaseService.java index 02ea4e8..825f990 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/ICwsCaseService.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/ICwsCaseService.java @@ -20,29 +20,37 @@ Integer countCaseToday(); boolean createNewPC(CwsCase cwsCase, int isNeedVerify, int isNeedRevisit, int bzhours, int bzminis, Long verifyPersonId); + boolean createNewAPP(CwsCase cwsCase, int isNeedVerify, int isNeedRevisit, int bzhours, int bzminis, Long verifyPersonId); + boolean createNewWeChat(CwsCase cwsCase, int isNeedRevisit); /** * 根据案卷状态查询,可添加是否延期、是否缓办条件 - * */ - List> queryByCondition(Page page, DataScope dataScope,QueryCondition queryCondition); + List> queryByCondition(Page page, DataScope dataScope, QueryCondition queryCondition); - List> queryByCondition(DataScope dataScope,QueryCondition queryCondition); + List> queryByCondition(DataScope dataScope, QueryCondition queryCondition); - List> historyByPhone(Page page, String reporterPhone); - List> caseDetailById(Long id); + List> historyByPhone(Page page, String reporterPhone); - List> workList(Page page,String groupId,String onedeptid,String actUserId, QueryCondition queryCondition); + List> caseDetailById(Long id); - List> completedList(Page page,String actUserId, QueryCondition queryCondition); + List> workList(Page page, String groupId, String onedeptid, String actUserId, QueryCondition queryCondition); + + List> completedList(Page page, String actUserId, QueryCondition queryCondition); /** * 案件撤销 + * * @param bizId */ void cancelCaseState(String bizId); + + Map statisticByState(String isShopCase); + + Map statisticShop(); + } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java index a351fb3..b043d10 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/DepartmentAssesController.java @@ -285,4 +285,15 @@ fileInputStream.close(); } } + + + /** + * 各街道案卷数量统计 + */ + @RequestMapping(value = "/highCaseEventByStreet") + @ResponseBody + public Object highCaseEventByStreet(String begTime, String endTime, String caseType) { + return ResponseData.success(iDepartmentAssessService.highCaseEventByStreet(begTime, endTime,caseType)); + + } } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java index 478c3d5..f50ec53 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/DepartmentAssessMapper.java @@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** *

@@ -85,5 +86,7 @@ List sourceDictList(); - + List> highCaseEventByStreet(@Param("beg") String beg, + @Param("end") String end, + @Param("caseType") String caseType); } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml index db6ebbd..8b03d28 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dao/mapping/DepartmentAssessMapper.xml @@ -264,4 +264,22 @@ + + diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java index 9395eba..dab5835 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/IDepartmentAssessService.java @@ -9,21 +9,30 @@ import com.casic.missiles.modular.assess.model.DepartmentAssessFactor; import java.util.List; +import java.util.Map; /** *

- * 服务类 + * 服务类 *

* * @author TEST203 * @since 2019-11-11 */ public interface IDepartmentAssessService extends IService { - List list(String beg,String end); + List list(String beg, String end); + List highEventList(String beg, String end); + List highCaseEventList(String beg, String end); + List sourceList(String beg, String end); + List ruleList(); - List caseAccessList(Page page,String beg, String end, + + List caseAccessList(Page page, String beg, String end, String caseType, Long depId); + + List> highCaseEventByStreet(String beg, String end, String caseType); + } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java index d77606d..7bfb8e5 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java @@ -18,6 +18,7 @@ import java.util.ArrayList; import java.util.Formatter; import java.util.List; +import java.util.Map; /** *

@@ -378,4 +379,9 @@ sourceDictList.add(caseSourceTotalDTO); return sourceDictList; } + + @Override + public List> highCaseEventByStreet(String beg, String end, String caseType) { + return this.baseMapper.highCaseEventByStreet(beg, end,caseType); + } } diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java index 026bb39..b156d73 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java @@ -933,4 +933,22 @@ return results; } + /** + * 根据案卷状态统计 + */ + @RequestMapping(value = "/statisticByState") + @ResponseBody + public Object statisticByState(String isShopCase) { + return ResponseData.success(cwsCaseService.statisticByState(isShopCase)); + } + + /** + * 三包总览统计 + */ + @RequestMapping(value = "/statisticShop") + @ResponseBody + public Object statisticShop() { + return ResponseData.success(cwsCaseService.statisticShop()); + } + } diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/CwsCaseMapper.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/CwsCaseMapper.java index 8be4b8e..70b9065 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/CwsCaseMapper.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/CwsCaseMapper.java @@ -43,4 +43,11 @@ List> completedList(@Param("page") Page page,@Param("actUserId")String actUserId,@Param("queryCondition") QueryCondition queryCondition); @Update("update dcm_cws_case set CASE_STATE = PRE_STATE where id = #{bizId}") void cancelCaseState(String bizId); + + List> statisticByState(@Param("isShopCase") String isShopCase); + + Integer workCount(@Param("isShopCase") String isShopCase); + Integer todayCaseCount(@Param("isShopCase") String isShopCase); + Integer allCaseCount(@Param("isShopCase") String isShopCase); + Integer merchantCount(); } diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml index 9ea04b3..bc5c3a2 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml @@ -635,4 +635,61 @@ ORDER BY a.CREATE_TIME DESC + + + + + + + + + diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/ICwsCaseService.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/ICwsCaseService.java index 02ea4e8..825f990 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/ICwsCaseService.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/ICwsCaseService.java @@ -20,29 +20,37 @@ Integer countCaseToday(); boolean createNewPC(CwsCase cwsCase, int isNeedVerify, int isNeedRevisit, int bzhours, int bzminis, Long verifyPersonId); + boolean createNewAPP(CwsCase cwsCase, int isNeedVerify, int isNeedRevisit, int bzhours, int bzminis, Long verifyPersonId); + boolean createNewWeChat(CwsCase cwsCase, int isNeedRevisit); /** * 根据案卷状态查询,可添加是否延期、是否缓办条件 - * */ - List> queryByCondition(Page page, DataScope dataScope,QueryCondition queryCondition); + List> queryByCondition(Page page, DataScope dataScope, QueryCondition queryCondition); - List> queryByCondition(DataScope dataScope,QueryCondition queryCondition); + List> queryByCondition(DataScope dataScope, QueryCondition queryCondition); - List> historyByPhone(Page page, String reporterPhone); - List> caseDetailById(Long id); + List> historyByPhone(Page page, String reporterPhone); - List> workList(Page page,String groupId,String onedeptid,String actUserId, QueryCondition queryCondition); + List> caseDetailById(Long id); - List> completedList(Page page,String actUserId, QueryCondition queryCondition); + List> workList(Page page, String groupId, String onedeptid, String actUserId, QueryCondition queryCondition); + + List> completedList(Page page, String actUserId, QueryCondition queryCondition); /** * 案件撤销 + * * @param bizId */ void cancelCaseState(String bizId); + + Map statisticByState(String isShopCase); + + Map statisticShop(); + } diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java index fe49638..7cad56a 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java @@ -36,6 +36,7 @@ import java.text.DecimalFormat; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -566,5 +567,51 @@ return map; } + @Override + public Map statisticByState(String isShopCase) { + Map resultMap = new HashMap<>(); + resultMap.put("register", 0); + resultMap.put("dispatch", 0); + resultMap.put("disposal", 0); + resultMap.put("disposaling", 0); + + List> mapList = this.baseMapper.statisticByState(isShopCase); + for (Map map : mapList) { + switch (map.get("caseState").toString()) { + case "10": + resultMap.put("register", map.get("num")); + break; + case "20": + resultMap.put("dispatch", map.get("num")); + break; + case "30": + resultMap.put("disposal", map.get("num")); + break; + case "39": + resultMap.put("disposaling", map.get("num")); + break; + default: + break; + } + } + return resultMap; + } + + @Override + public Map statisticShop() { + Map resultMap = new HashMap<>(); + + int work = this.baseMapper.workCount("1"); + int todayCase = this.baseMapper.todayCaseCount("1"); + int allCase = this.baseMapper.allCaseCount("1"); + int merchant = this.baseMapper.merchantCount(); + + resultMap.put("work", work); + resultMap.put("todayCase", todayCase); + resultMap.put("allCase", allCase); + resultMap.put("merchant", merchant); + + return resultMap; + } }