From 386e4215819efd8dd5e0f60b363708871bb7686d Mon Sep 17 00:00:00 2001
From: xuefei <564615061@qq.com>
Date: 星期五, 11 十二月 2020 15:01:45 +0800
Subject: [PATCH] 首页页面相关接口
---
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/service/ISubsidyLogService.java | 15 +
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/mapper/SubsidyLogMapper.java | 16 +
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/serviceimpl/ISubsidyLogServiceImpl.java | 12 +
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/OrgYanglao.java | 12
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/Subsidy.java | 2
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/SubsidyLog.java | 10 -
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/IndexController.java | 114 ++++++++++++++
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/mapper/OrgFuwuMapper.java | 2
api.md | 204 +++++++++++++++++++++++++
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/FuwuDuixiang.java | 8 -
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/service/IOrderService.java | 6
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/serviceimpl/IOrderServiceImpl.java | 5
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/Order.java | 4
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/mapper/OrderMapper.java | 23 ++
14 files changed, 395 insertions(+), 38 deletions(-)
diff --git a/api.md b/api.md
index 4e2a9f7..ef5e6e8 100644
--- a/api.md
+++ b/api.md
@@ -5,8 +5,10 @@
[ 1.2鑾峰彇鍏ㄩ儴琛ヨ创绫诲瀷](#1.2)
[2.棣栭〉](#2)
- [ 2.1鑾峰彇鍖哄煙娲ヨ创缁熻](#2.1)
- [ 2.2鑾峰彇鍏ㄩ儴琛ヨ创绫诲瀷](#1.2)
+ [ 2.1琛ヨ创缁熻](#2.1)
+ [ 2.2鏈嶅姟鏈烘瀯缁熻](#2.2)
+ [ 2.3鍏昏�佹満鏋勭粺璁(#2.3)
+ [ 2.4鏈嶅姟瀵硅薄缁熻](#2.4)
[3.琛ヨ创](#3)
[ 3.1鑾峰彇鎬荤粺璁℃暟鎹甝(#3.1)
[ 3.2骞村害鏈堝害缁熻鏁版嵁](#3.2)
@@ -125,6 +127,204 @@
]
}
```
+
+<h3 id='2'>浜屻�侀椤�</h2>
+<h4 id='2.1'>2.1琛ヨ创缁熻</h4>
+###### 鎺ュ彛鍔熻兘
+> 鏍规嵁鍖哄煙id鑾峰彇琛ヨ创缁熻
+
+###### URL
+> /api/index/getSubsidyStatics
+
+###### 鏀寔鏍煎紡
+> JSON
+
+###### HTTP璇锋眰鏂瑰紡
+> GET
+
+###### 璇锋眰鍙傛暟
+|鍙傛暟|蹇呴�墊绫诲瀷|璇存槑|
+|:----- |:-------|:-----|----- |
+| areaId | 鍚� |String | 鍖哄煙id |
+
+###### 杩斿洖瀛楁
+|杩斿洖瀛楁|瀛楁绫诲瀷|璇存槑 |
+|:----- |:------|:----------------------------- |
+| total | double | 琛ヨ创鎬婚噾棰� |
+| typeName | String | 琛ヨ创椤圭洰鍚嶇О |
+| sum | double | 琛ヨ创椤圭洰鎬婚噾棰� |
+
+###### 鎺ュ彛绀轰緥
+``` java
+{
+ "success": true,
+ "message": "success",
+ "code": 200,
+ "timestamp": 1607665964425,
+ "result": {
+ "total": 2500,
+ "list": [
+ {
+ "typeName": "楂橀緞鑰佷汉鐢熸椿琛ヨ创",
+ "sum": 1500,
+ "type": 2
+ },
+ {
+ "typeName": "閲嶅害娈嬬柧浜虹敓娲昏ˉ璐�",
+ "sum": 1000,
+ "type": 1
+ }
+ ]
+ }
+}
+```
+<h4 id='2.2'>2.2鏈嶅姟鏈烘瀯缁熻</h4>
+###### 鎺ュ彛鍔熻兘
+> 鏍规嵁鍖哄煙id鏈嶅姟鏈烘瀯缁熻
+
+###### URL
+> /api/index/getOrgFWStatics
+
+###### 鏀寔鏍煎紡
+> JSON
+
+###### HTTP璇锋眰鏂瑰紡
+> GET
+
+###### 璇锋眰鍙傛暟
+|鍙傛暟|蹇呴�墊绫诲瀷|璇存槑|
+|:----- |:-------|:-----|----- |
+| areaId | 鍚� |String | 鍖哄煙id |
+
+###### 杩斿洖瀛楁
+|杩斿洖瀛楁|瀛楁绫诲瀷|璇存槑 |
+|:----- |:------|:----------------------------- |
+| total | int | 鏈嶅姟鏈烘瀯鎬绘暟 |
+| detail | String | 鏈嶅姟椤圭洰 |
+| num | int | 姝ゆ湇鍔￠」鐩�讳釜鏁� |
+
+###### 鎺ュ彛绀轰緥
+``` java
+{
+ "success": true,
+ "message": "success",
+ "code": 200,
+ "timestamp": 1607667809694,
+ "result": {
+ "total": 0,
+ "list": [
+ {
+ "num": 1,
+ "detail": "搴峰鏈嶅姟"
+ },
+ {
+ "num": 1,
+ "detail": "鐢熸椿鏂欑悊"
+ }
+ ]
+ }
+}
+```
+<h4 id='2.3'>2.3鍏昏�佹満鏋勭粺璁�</h4>
+###### 鎺ュ彛鍔熻兘
+> 鏍规嵁鍖哄煙id鑾峰彇鍏昏�佹満鏋勭粺璁�
+
+###### URL
+> /api/index/getYlOrgYLStatics
+
+###### 鏀寔鏍煎紡
+> JSON
+
+###### HTTP璇锋眰鏂瑰紡
+> GET
+
+###### 璇锋眰鍙傛暟
+|鍙傛暟|蹇呴�墊绫诲瀷|璇存槑|
+|:----- |:-------|:-----|----- |
+| areaId | 鍚� |String | 鍖哄煙id |
+
+###### 杩斿洖瀛楁
+|杩斿洖瀛楁|瀛楁绫诲瀷|璇存槑 |
+|:----- |:------|:----------------------------- |
+| total | int | 鍏昏�佹満鏋勬�讳釜鏁� |
+| type0 | int | 鍏昏�侀櫌涓暟 |
+| type1 | int | 鏁�侀櫌涓暟 |
+| type2 | int | 鐤楀吇闄釜鏁� |
+| square | double | 鎬婚潰绉� |
+| bedNumber | int | 搴婁綅涓暟 |
+| nurseNumber | int | 鎶ょ悊浜哄憳涓暟 |
+| duixiangNumber | int | 鍏ヤ綇鑰佷汉涓暟 |
+
+###### 鎺ュ彛绀轰緥
+``` java
+{
+ "success": true,
+ "message": "success",
+ "code": 200,
+ "timestamp": 1607668287242,
+ "result": {
+ "square": 5100,
+ "total": 2,
+ "type2": 0,
+ "duixiangNumber": 24,
+ "type1": 0,
+ "bedNumber": 20,
+ "type0": 2,
+ "nurseNumber": 57
+ }
+}
+```
+<h4 id='2.4'>2.4鏈嶅姟瀵硅薄缁熻</h4>
+###### 鎺ュ彛鍔熻兘
+> 鏍规嵁鍖哄煙id鑾峰彇鏈嶅姟瀵硅薄缁熻
+
+###### URL
+> /api/index/getFuwuPersonStatics
+
+###### 鏀寔鏍煎紡
+> JSON
+
+###### HTTP璇锋眰鏂瑰紡
+> GET
+
+###### 璇锋眰鍙傛暟
+|鍙傛暟|蹇呴�墊绫诲瀷|璇存槑|
+|:----- |:-------|:-----|----- |
+| areaId | 鍚� |String | 鍖哄煙id |
+
+###### 杩斿洖瀛楁
+|杩斿洖瀛楁|瀛楁绫诲瀷|璇存槑 |
+|:----- |:------|:----------------------------- |
+| total | double | 鏈嶅姟瀵硅薄鎬讳釜鏁� |
+| typeName | String | 琛ヨ创椤圭洰鍚嶇О |
+| sum | int | 琛ヨ创椤圭洰鎬讳汉鏁� |
+
+###### 鎺ュ彛绀轰緥
+``` java
+{
+ "success": true,
+ "message": "success",
+ "code": 200,
+ "timestamp": 1607669982970,
+ "result": {
+ "total": 2,
+ "list": [
+ {
+ "num": 1,
+ "typeName": "閲嶅害娈嬬柧浜虹敓娲昏ˉ璐�",
+ "type": 1
+ },
+ {
+ "num": 1,
+ "typeName": "楂橀緞鑰佷汉鐢熸椿琛ヨ创",
+ "type": 2
+ }
+ ]
+ }
+}
+```
+
+
<h3 id='3'>涓夈�佽ˉ璐�</h2>
<h4 id='3.1'>3.1鑾峰彇鎬荤粺璁℃暟鎹�</h4>
###### 鎺ュ彛鍔熻兘
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/IndexController.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/IndexController.java
index 1f2d4e8..fc13381 100644
--- a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/IndexController.java
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/IndexController.java
@@ -1,9 +1,27 @@
package cn.cetc54.platform.zhyl.api;
+import cn.cetc54.platform.core.common.utils.ResultUtil;
+import cn.cetc54.platform.core.common.vo.Result;
+import cn.cetc54.platform.zhyl.entity.OrgFuwu;
+import cn.cetc54.platform.zhyl.entity.OrgYanglao;
+import cn.cetc54.platform.zhyl.entity.SubsidyEmum;
+import cn.cetc54.platform.zhyl.service.IOrderService;
+import cn.cetc54.platform.zhyl.service.IOrgFuwuService;
+import cn.cetc54.platform.zhyl.service.IOrgYanglaoService;
+import cn.cetc54.platform.zhyl.service.ISubsidyLogService;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* @author xfei
@@ -14,5 +32,101 @@
@Api(description = "棣栭〉鎺ュ彛")
@RequestMapping("/api/index")
public class IndexController {
+ @Autowired
+ private IOrgYanglaoService iOrgYanglaoService;
+ @Autowired
+ private ISubsidyLogService iSubsidyLogService;
+ @Autowired
+ private IOrgFuwuService iOrgFuwuService;
+ @Autowired
+ private IOrderService iOrderService;
+ @GetMapping("/getSubsidyStatics")
+ @ApiOperation(value = "琛ヨ创缁熻")
+ public Result getSubsidyStatics(String areaId){
+ double total = iSubsidyLogService.getTotalMoney(areaId,null);
+ List<Map<String,Object>> list = iSubsidyLogService.getTypeMoney(areaId);
+ list.forEach(e->{
+ int type = (int) e.get("type");
+ e.put("typeName", SubsidyEmum.values()[type].name());
+ });
+ Map<String,Object> resMap = new HashMap<>();
+ resMap.put("total",total);
+ resMap.put("list",list);
+ return ResultUtil.data(resMap);
+ }
+ @GetMapping("/getOrgFWStatics")
+ @ApiOperation(value = "鏈嶅姟鏈烘瀯缁熻")
+ public Result getOrgFWStatics(String areaId){
+ QueryWrapper<OrgFuwu> wrapper = new QueryWrapper<>();
+ wrapper.eq("area_id",areaId);
+ int total = iOrgFuwuService.list(wrapper).size();
+ List list = iOrderService.getTypeStatics(areaId);
+
+ Map<String,Object> resMap = new HashMap<>();
+ resMap.put("total",total);
+ resMap.put("list",list);
+ return ResultUtil.data(resMap);
+ }
+ @GetMapping("/getYlOrgYLStatics")
+ @ApiOperation(value = "鍏昏�佹満鏋勭粺璁�")
+ public Result getYlOrgStatics(String areaId){
+ QueryWrapper<OrgYanglao> wrapper = new QueryWrapper<>();
+ if (StrUtil.isNotBlank(areaId)){
+ wrapper.eq("area_id",areaId);
+ }
+ List<OrgYanglao> list = iOrgYanglaoService.list(wrapper);
+ int total = list.size();//鍏昏�佹満鏋勬�讳釜鏁�
+ int type0 =0;//鍏昏�侀櫌涓暟
+ int type1 =0;//鏁�侀櫌涓暟
+ int type2 =0;//鐤楀吇闄釜鏁�
+ double square =0;//鎬婚潰绉�
+ int bedNumber = 0;//搴婁綅涓暟
+ int nurseNumber = 0;//鎶ょ悊浜哄憳涓暟
+ int duixiangNumber = 0;//鍏ヤ綇鑰佷汉涓暟
+
+ for (OrgYanglao org:list){
+ switch (org.getType()){
+ case 0:
+ type0++;
+ break;
+ case 1:
+ type1++;
+ break;
+ case 2:
+ type2++;
+ break;
+ }
+ square+=org.getSquare();
+ bedNumber+= org.getBedNumber();
+ nurseNumber+= org.getNurseNumber();
+ duixiangNumber+=org.getDuixiangNumber();
+ }
+ Map<String,Object> resMap = new HashMap<>();
+ resMap.put("total",total);
+ resMap.put("type0",type0);
+ resMap.put("type1",type1);
+ resMap.put("type2",type2);
+ resMap.put("square",square);
+ resMap.put("bedNumber",bedNumber);
+ resMap.put("nurseNumber",nurseNumber);
+ resMap.put("duixiangNumber",duixiangNumber);
+ return ResultUtil.data(resMap);
+
+ }
+ @GetMapping("/getFuwuPersonStatics")
+ @ApiOperation(value = "鏈嶅姟瀵硅薄缁熻")
+ public Result getFuwuPersonStatics(String areaId){
+ int total = iSubsidyLogService.getTotalNum(areaId,null);
+ List<Map<String,Object>> list = iSubsidyLogService.getTypeNum(areaId);
+ list.forEach(e->{
+ int type = (int) e.get("type");
+ e.put("typeName", SubsidyEmum.values()[type].name());
+ });
+ Map<String,Object> resMap = new HashMap<>();
+ resMap.put("total",total);
+ resMap.put("list",list);
+ return ResultUtil.data(resMap);
+ }
+
}
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/FuwuDuixiang.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/FuwuDuixiang.java
index 5d180ce..87de492 100644
--- a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/FuwuDuixiang.java
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/FuwuDuixiang.java
@@ -46,14 +46,6 @@
@ApiModelProperty(value = "鍖哄煙id")
private String areaId;
- @Column( length = 20 ,name = "record_year")
- @ApiModelProperty(value = "鐧昏骞翠唤")
- private String recordYear;
-
- @Column( length = 20 ,name = "record_month")
- @ApiModelProperty(value = "鐧昏鏈堜唤")
- private String recordMonth;
-
@Column( length = 200 ,name = "subsidyIds")
@ApiModelProperty(value = "琛ヨ创闆嗗悎")
private String subsidyIds;
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/Order.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/Order.java
index 78af866..922cdb9 100644
--- a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/Order.java
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/Order.java
@@ -34,6 +34,10 @@
@ApiModelProperty(value = "鏈嶅姟璇︽儏id")
private String detailId;
+ @Column( length = 24 ,name = "detail")
+ @ApiModelProperty(value = "鏈嶅姟璇︽儏")
+ private String detail;
+
@Column( length = 24 ,name = "duixiang_id")
@ApiModelProperty(value = "鏈嶅姟瀵硅薄id")
private String duixiangId;
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/OrgYanglao.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/OrgYanglao.java
index 0f80aca..c377395 100644
--- a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/OrgYanglao.java
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/OrgYanglao.java
@@ -36,24 +36,24 @@
private String areaId;
@Column( length = 1 ,name = "type")
- @ApiModelProperty(value = "绫诲瀷")
- private Integer type;
+ @ApiModelProperty(value = "绫诲瀷 0/鍏昏�侀櫌 1/鏁�侀櫌 2/鐤楀吇闄�")
+ private int type;
@Column( length = 10 ,name = "square")
@ApiModelProperty(value = "闈㈢Н")
- private String square;
+ private double square;
@Column( length = 10 ,name = "bed_number")
@ApiModelProperty(value = "搴婁綅鏁�")
- private Integer bedNumber;
+ private int bedNumber;
@Column( length = 10 ,name = "nurse_number")
@ApiModelProperty(value = "鎶ょ悊浜哄憳鏁�")
- private Integer nurseNumber;
+ private int nurseNumber;
@Column( length = 10 ,name = "duixiang_number")
@ApiModelProperty(value = "鍏ヤ綇鑰佷汉鏁�")
- private Integer duixiangNumber;
+ private int duixiangNumber;
}
\ No newline at end of file
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/Subsidy.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/Subsidy.java
index 25fe58f..e8e264f 100644
--- a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/Subsidy.java
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/Subsidy.java
@@ -33,7 +33,7 @@
@Column( length = 1 ,name = "type")
@ApiModelProperty(value = "琛ュ姪绫诲瀷")
- private Integer type;
+ private int type;
@Column( length = 10 ,name = "money")
@ApiModelProperty(value = "琛ュ姪閲戦")
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/SubsidyLog.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/SubsidyLog.java
index 4e949a1..bf88c76 100644
--- a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/SubsidyLog.java
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/SubsidyLog.java
@@ -31,13 +31,6 @@
@ApiModelProperty(value = "鍖哄煙id")
private String areaId;
- @Column( length = 20 ,name = "year")
- @ApiModelProperty(value = "鐧昏骞翠唤")
- private String year;
-
- @Column( length = 20 ,name = "month")
- @ApiModelProperty(value = "鐧昏鏈堜唤")
- private String month;
@Column( length = 1 ,name = "type")
@ApiModelProperty(value = "琛ュ姪绫诲瀷")
@@ -51,9 +44,6 @@
@ApiModelProperty(value = "鏈嶅姟瀵硅薄id")
private String duixiangId;
- @Column( length = 1 ,name = "state")
- @ApiModelProperty(value = "鐘舵�侊紝")
- private Integer state;
}
\ No newline at end of file
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/mapper/OrderMapper.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/mapper/OrderMapper.java
index 369cd8d..ef87ded 100644
--- a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/mapper/OrderMapper.java
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/mapper/OrderMapper.java
@@ -2,13 +2,34 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.cetc54.platform.zhyl.entity.Order;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
* 璁㈠崟鏁版嵁澶勭悊灞�
* @author
*/
public interface OrderMapper extends BaseMapper<Order> {
-
+ /**
+ * 鑾峰彇鏌愪釜鍖哄煙鐨勬湇鍔￠」鐩殑涓暟
+ * @param areaId
+ * @return
+ */
+ @Select("<script>" +
+ "select detail,count(*) as num " +
+ "from" +
+ "(select detail,person_id " +
+ "from t_yl_order " +
+ "<where>" +
+ " <if test='areaId!= null'>" +
+ "and area_id=#{areaId} " +
+ " </if>" +
+ "</where>" +
+ "GROUP BY detail,person_id) t " +
+ "GROUP BY detail ORDER BY num desc" +
+ "</script>")
+ List<Map<String,Object>> getTypeStatics(@Param("areaId") String areaId);
}
\ No newline at end of file
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/mapper/OrgFuwuMapper.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/mapper/OrgFuwuMapper.java
index 781c386..beaf37d 100644
--- a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/mapper/OrgFuwuMapper.java
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/mapper/OrgFuwuMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.cetc54.platform.zhyl.entity.OrgFuwu;
+import org.apache.ibatis.annotations.Select;
import java.util.List;
@@ -11,4 +12,5 @@
*/
public interface OrgFuwuMapper extends BaseMapper<OrgFuwu> {
+
}
\ No newline at end of file
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/mapper/SubsidyLogMapper.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/mapper/SubsidyLogMapper.java
index 300dda8..3f0a3c9 100644
--- a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/mapper/SubsidyLogMapper.java
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/mapper/SubsidyLogMapper.java
@@ -27,7 +27,7 @@
" </where>" +
" GROUP BY duixiang_id"+
" </script>")
- Integer getTotalNum(@Param(value = "areaId")String areaId, @Param(value = "type")Integer type);
+ List<Integer> getTotalNum(@Param(value = "areaId")String areaId, @Param(value = "type")Integer type);
/**
* 鑾峰彇鎬婚噾棰�
@@ -45,7 +45,6 @@
" and type = #{type}" +
" </if>" +
" </where>" +
- " GROUP BY duixiang_id"+
" </script>")
Double getTotalMoney(@Param(value = "areaId")String areaId, @Param(value = "type")Integer type);
@@ -96,6 +95,7 @@
" </script>")
List<Map<String,Object>> getYearTotal(@Param(value = "areaId")String areaId, @Param(value = "type")Integer type);
+
/**
*缁熻姣忕琛ヨ创鐨勯噾棰濇暟
* @param areaId
@@ -109,24 +109,26 @@
" and area_id = #{areaId}" +
" </if>" +
" </where>" +
- " GROUP BY type ORDER BY money desc"+
+ " GROUP BY type ORDER BY sum desc"+
" </script>")
List<Map<String,Object>> getTypeMoney(@Param(value = "areaId")String areaId);
/**
- * 姣忕琛ヨ创鐨勬鏁�
+ * 姣忕琛ヨ创鐨勪汉鏁�
* @param areaId
* @return
*/
@Select("<script>" +
- " select type," +
- "conunt(id) as num FROM t_yl_subsidy_log" +
+ "select type,count(duixiang_id) as num from (" +
+ " select type,duixiang_id" +
+ " FROM t_yl_subsidy_log" +
" <where> " +
" <if test='areaId!= null'>" +
" and area_id = #{areaId}" +
" </if>" +
" </where>" +
- " GROUP BY type ORDER BY num desc"+
+ " GROUP BY type,duixiang_id) t GROUP BY type" +
+ " ORDER BY num desc"+
" </script>")
List<Map<String,Object>> getTypeNum(@Param(value = "areaId")String areaId);
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/service/IOrderService.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/service/IOrderService.java
index fc21d8d..208ebbf 100644
--- a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/service/IOrderService.java
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/service/IOrderService.java
@@ -10,5 +10,11 @@
* @author
*/
public interface IOrderService extends IService<Order> {
+ /**
+ * 鑾峰彇鏌愪釜鍖哄煙鐨勬湇鍔￠」鐩殑涓暟
+ * @param areaId
+ * @return
+ */
+ List getTypeStatics(String areaId);
}
\ No newline at end of file
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/service/ISubsidyLogService.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/service/ISubsidyLogService.java
index 611932e..3c9c914 100644
--- a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/service/ISubsidyLogService.java
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/service/ISubsidyLogService.java
@@ -2,8 +2,6 @@
import com.baomidou.mybatisplus.extension.service.IService;
import cn.cetc54.platform.zhyl.entity.SubsidyLog;
-import org.apache.ibatis.annotations.Param;
-
import java.util.List;
import java.util.Map;
@@ -44,4 +42,17 @@
*/
List<Map<String,Object>> getYearTotal(String areaId,Integer type);
+ /**
+ *缁熻姣忕琛ヨ创鐨勯噾棰濇暟
+ * @param areaId
+ * @return
+ */
+ List<Map<String,Object>> getTypeMoney(String areaId);
+ /**
+ * 姣忕琛ヨ创鐨勬鏁�
+ * @param areaId
+ * @return
+ */
+ List<Map<String,Object>> getTypeNum(String areaId);
+
}
\ No newline at end of file
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/serviceimpl/IOrderServiceImpl.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/serviceimpl/IOrderServiceImpl.java
index 2f63208..84cdda3 100644
--- a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/serviceimpl/IOrderServiceImpl.java
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/serviceimpl/IOrderServiceImpl.java
@@ -23,4 +23,9 @@
@Autowired
private OrderMapper orderMapper;
+
+ @Override
+ public List getTypeStatics(String areaId) {
+ return orderMapper.getTypeStatics(areaId);
+ }
}
\ No newline at end of file
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/serviceimpl/ISubsidyLogServiceImpl.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/serviceimpl/ISubsidyLogServiceImpl.java
index a601198..1ab4b6e 100644
--- a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/serviceimpl/ISubsidyLogServiceImpl.java
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/serviceimpl/ISubsidyLogServiceImpl.java
@@ -27,7 +27,7 @@
@Override
public int getTotalNum(String areaId,Integer type) {
- Integer num = subsidyLogMapper.getTotalNum(areaId,type);
+ Integer num = subsidyLogMapper.getTotalNum(areaId,type).size();
return num==null?0:num;
}
@@ -46,4 +46,14 @@
public List<Map<String, Object>> getYearTotal(String areaId, Integer type) {
return subsidyLogMapper.getYearTotal(areaId,type);
}
+
+ @Override
+ public List<Map<String, Object>> getTypeMoney(String areaId) {
+ return subsidyLogMapper.getTypeMoney(areaId);
+ }
+
+ @Override
+ public List<Map<String, Object>> getTypeNum(String areaId) {
+ return subsidyLogMapper.getTypeNum(areaId);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1