platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/FwjgController.java
@@ -45,19 +45,35 @@ @RequestMapping(value = "/getCountByAreaId", method = RequestMethod.GET) @ApiOperation(value = "根据区域id获取区域下所有机构和人员数量以及订单总数") public Result<Object> getCountByAreaId(String areaId){ if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){ //如果是全市 areaId设置未空 areaId = null; } QueryWrapper<OrgFuwu> wrapper = new QueryWrapper<>(); wrapper.eq("area_id",areaId); if (StrUtil.isNotEmpty(areaId)){ wrapper.eq("area_id",areaId); } int orgFuwuCount = iOrgFuwuService.count(wrapper); QueryWrapper<FuwuPerson> wrapper1 = new QueryWrapper<>(); wrapper1.eq("area_id",areaId); if (StrUtil.isNotEmpty(areaId)){ wrapper1.eq("area_id",areaId); } int fuwuPersonCount = iFuwuPersonService.count(wrapper1); QueryWrapper<Order> wrapper2 = new QueryWrapper<>(); wrapper2.eq("area_id",areaId); if (StrUtil.isNotEmpty(areaId)){ wrapper2.eq("area_id",areaId); } int orderCount = iOrderService.count(wrapper2); QueryWrapper<Order> wrapper3 = new QueryWrapper<>(); wrapper2.eq("area_id",areaId); wrapper2.eq("state",0); if (StrUtil.isNotEmpty(areaId)){ wrapper3.eq("area_id",areaId); } wrapper3.eq("state",0); int orderCount2 = iOrderService.count(wrapper3); FwjgCount fwjgCount=new FwjgCount(); fwjgCount.setFwjgCount(orgFuwuCount); fwjgCount.setFwPersonCount(fuwuPersonCount); @@ -69,6 +85,10 @@ @RequestMapping(value = "/getFwnlByAreaId", method = RequestMethod.GET) @ApiOperation(value = "根据区域id获取区域下所有实际服务以及服务订单数") public Result<Object> getFwnlByAreaId(String areaId){ if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){ //如果是全市 areaId设置未空 areaId = null; } QueryWrapper<FuwuDetails> wrapper = new QueryWrapper<>(); wrapper.isNull("pid"); List<FuwuDetails> list = iFuwuDetailsService.list(wrapper); @@ -98,8 +118,14 @@ @RequestMapping(value = "/getFwjgOrderByOrderNumber", method = RequestMethod.GET) @ApiOperation(value = "根据区域id和订单量查询服务机构排名情况") public Result<Object> getFwjgOrderByOrderNumber(String areaId){ if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){ //如果是全市 areaId设置未空 areaId = null; } QueryWrapper<OrgFuwu> wrapper = new QueryWrapper<>(); wrapper.eq("area_id",areaId); if (StrUtil.isNotEmpty(areaId)){ wrapper.eq("area_id",areaId); } List<OrgFuwu> list = iOrgFuwuService.list(wrapper); for (OrgFuwu orgFuwu : list) { QueryWrapper<FuwuDetails> wrapper1 = new QueryWrapper<>(); @@ -130,7 +156,7 @@ @RequestMapping(value = "/getFuwuDetailsOrderByOrderNumber", method = RequestMethod.GET) @ApiOperation(value = "根据区域id和订单量查询实际服务排名情况") public Result<Object> getFuwuDetailsOrderByOrderNumber(String areaId){ if (StrUtil.isNotBlank(areaId)&&areaId.equals("0")){ if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){ //如果是全市 areaId设置未空 areaId = null; } @@ -155,7 +181,7 @@ @RequestMapping(value = "/getOrder", method = RequestMethod.GET) @ApiOperation(value = "执行中订单") public Result<Object> getOrder(String areaId){ if (StrUtil.isNotBlank(areaId)&&areaId.equals("0")){ if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){ //如果是全市 areaId设置未空 areaId = null; } platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/IndexController.java
@@ -45,6 +45,10 @@ @GetMapping("/getSubsidyStatics") @ApiOperation(value = "补贴统计") public Result getSubsidyStatics(String areaId){ if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){ //如果是全市 areaId设置未空 areaId = null; } double total = iSubsidyLogService.getTotalMoney(areaId,null); List<Map<String,Object>> list = iSubsidyLogService.getTypeMoney(areaId); list.forEach(e->{ @@ -59,6 +63,10 @@ @GetMapping("/getOrgFWStatics") @ApiOperation(value = "服务机构统计") public Result getOrgFWStatics(String areaId){ if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){ //如果是全市 areaId设置未空 areaId = null; } QueryWrapper<OrgFuwu> wrapper = new QueryWrapper<>(); wrapper.eq("area_id",areaId); int total = iOrgFuwuService.list(wrapper).size(); @@ -72,6 +80,10 @@ @GetMapping("/getYlOrgYLStatics") @ApiOperation(value = "养老机构统计") public Result getYlOrgStatics(String areaId){ if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){ //如果是全市 areaId设置未空 areaId = null; } QueryWrapper<OrgYanglao> wrapper = new QueryWrapper<>(); if (StrUtil.isNotBlank(areaId)){ wrapper.eq("area_id",areaId); @@ -118,6 +130,10 @@ @GetMapping("/getFuwuPersonStatics") @ApiOperation(value = "服务对象统计") public Result getFuwuPersonStatics(String areaId){ if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){ //如果是全市 areaId设置未空 areaId = null; } int total = iSubsidyLogService.getTotalNum(areaId,null); List<Map<String,Object>> list = iSubsidyLogService.getTypeNum(areaId); list.forEach(e->{ platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/SubsidyAPIController.java
@@ -3,6 +3,7 @@ import cn.cetc54.platform.core.common.utils.ResultUtil; import cn.cetc54.platform.core.common.vo.Result; import cn.cetc54.platform.zhyl.service.ISubsidyLogService; import cn.hutool.core.util.StrUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.Data; @@ -33,6 +34,10 @@ @GetMapping("/getTotalStatistics") @ApiOperation(value = "获取总统计数据") public Result getTotalStatistics(String areaId,Integer type){ if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){ //如果是全市 areaId设置未空 areaId = null; } int totalPersonNum = iSubsidyLogService.getTotalNum(areaId,type);//获取补贴的总人数 double totalMoney = iSubsidyLogService.getTotalMoney(areaId,type);//获取总金额 @@ -45,6 +50,10 @@ @GetMapping("/getStatistics") @ApiOperation(value = "年度月度统计数据") public Result getStatistics(String areaId,Integer type){ if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){ //如果是全市 areaId设置未空 areaId = null; } Map<String,Object> resMap = new HashMap<>(); List<Map<String,Object>> monthList = iSubsidyLogService.getMonthTotal(areaId,type); List<Map<String,Object>> yearList = iSubsidyLogService.getYearTotal(areaId,type);
