From 160487aedf89e2aea61f043c7a5c3d211ed19798 Mon Sep 17 00:00:00 2001
From: xuefei <564615061@qq.com>
Date: 星期六, 12 十二月 2020 11:44:36 +0800
Subject: [PATCH] 服务对象页面
---
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/serviceimpl/ISubsidyPersonStaticsServiceImpl.java | 32 +++
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/service/ISubsidyPersonService.java | 14 +
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/service/ISubsidyPersonStaticsService.java | 22 ++
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/serviceimpl/ISubsidyPersonServiceImpl.java | 26 ++
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/SubsidyPerson.java | 47 ++++
platform-modules/platform-generator/src/main/java/cn/cetc54/platform/generator/PlatformMPGenerator.java | 4
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/IndexController.java | 4
api.md | 167 ++++++++++++++++
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/mapper/SubsidyPersonMapper.java | 19 +
platform-modules/platform-zhyl/src/main/resources/mapper/SubsidyPersonStaticsMapper.xml | 5
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/CommonController.java | 8
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/mapper/SubsidyPersonStaticsMapper.java | 33 +++
platform-modules/platform-zhyl/src/main/resources/mapper/SubsidyPersonMapper.xml | 5
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/SubsidyAPIController.java | 4
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/FwjgController.java | 13 -
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/SubsidyPersonStatics.java | 66 ++++++
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/FwdxController.java | 77 +++++++
platform-admin/src/main/resources/application.yml | 1
18 files changed, 526 insertions(+), 21 deletions(-)
diff --git a/api.md b/api.md
index ef5e6e8..ff2523e 100644
--- a/api.md
+++ b/api.md
@@ -12,8 +12,9 @@
[3.琛ヨ创](#3)
[ 3.1鑾峰彇鎬荤粺璁℃暟鎹甝(#3.1)
[ 3.2骞村害鏈堝害缁熻鏁版嵁](#3.2)
-[4.鏈嶅姟瀵硅薄](#4)
-
+[4.鏈嶅姟瀵硅薄](#4)
+ [ 4.1鑾峰彇缁熻鏁版嵁](#4.1)
+ [ 4.2鑾峰彇鍘嗗彶缁熻鏁版嵁](#4.2)
[5.鏈嶅姟鏈烘瀯](#5)
[ 5.1鏍规嵁鍖哄煙id鑾峰彇鍖哄煙涓嬫墍鏈夋満鏋勫拰浜哄憳鏁伴噺浠ュ強璁㈠崟鎬绘暟](#5.1)
[ 5.2鏍规嵁鍖哄煙id鑾峰彇鍖哄煙涓嬫墍鏈夋湇鍔′互鍙婃湇鍔¤鎯呭拰璁㈠崟浜烘暟](#5.2)
@@ -413,6 +414,168 @@
}
```
+
+
+<h3 id='4'>鍥涖�佹湇鍔″璞�</h2>
+<h4 id='4.1'>4.1鑾峰彇缁熻鏁版嵁</h4>
+###### 鎺ュ彛鍔熻兘
+> 鏍规嵁鍖哄煙id鍜岃ˉ璐寸被鍨嬭幏鍙栨�荤殑缁熻鏁版嵁
+
+###### URL
+> /api2/fwdx/getStaticsData
+
+###### 鏀寔鏍煎紡
+> JSON
+
+###### HTTP璇锋眰鏂瑰紡
+> GET
+
+###### 璇锋眰鍙傛暟
+|鍙傛暟|蹇呴�墊绫诲瀷|璇存槑|
+|:----- |:-------|:-----|----- |
+| areaId | 鏄� |String | 鍖哄煙id |
+| type | 鍚� |Integer | 琛ヨ创绫诲瀷 |
+
+###### 杩斿洖瀛楁
+|杩斿洖瀛楁|瀛楁绫诲瀷|璇存槑 |
+|:----- |:------|:----------------------------- |
+| subsidyType | int | 琛ヨ创绫诲瀷 |
+| month | String | 鏈堜唤 |
+| yearAdd | int | 骞存柊澧� |
+| yearOut | int | 骞撮��鍑� |
+| yearSum | int | 骞村悎璁� |
+| monthAdd | int | 鏈堟柊澧� |
+| monthOut | int | 鏈堥��鍑� |
+| monthSum | int | 鏈堝悎璁� |
+| totalNum | int | 鐢宠鎬绘鏁� |
+| checkNum | int | 澶嶅悎鎬绘鏁� |
+| personNum | int | 鏈嶅姟鎬讳汉鏁� |
+| subsidyTypeName | String | 琛ヨ创鍚嶇О |
+| child | List | 瀛愰」鐩� |
+
+###### 鎺ュ彛绀轰緥
+``` java
+{
+ "success": true,
+ "message": "success",
+ "code": 200,
+ "timestamp": 1607743828413,
+ "result": {
+ "id": 0,
+ "subsidyType": 0,
+ "areaId": null,
+ "month": "2020-12",
+ "yearAdd": 1345,
+ "yearOut": 233,
+ "yearSum": 12330,
+ "monthAdd": 117,
+ "monthOut": 53,
+ "monthSum": 5500,
+ "totalNum": 3054,
+ "checkNum": 3400,
+ "personNum": 13500,
+ "subsidyTypeName": "鍥伴毦娈嬬柧鐢熸椿琛ヨ创",
+ "child": [
+ {
+ "id": 1,
+ "subsidyType": 0,
+ "areaId": "1336922902628536320",
+ "month": "2020-12",
+ "yearAdd": 745,
+ "yearOut": 124,
+ "yearSum": 6790,
+ "monthAdd": 50,
+ "monthOut": 43,
+ "monthSum": 3200,
+ "totalNum": 1854,
+ "checkNum": 2100,
+ "personNum": 7800,
+ "subsidyTypeName": "鍥伴毦娈嬬柧鐢熸椿琛ヨ创",
+ "child": null
+ },
+ {
+ "id": 2,
+ "subsidyType": 1,
+ "areaId": "1336922902628536320",
+ "month": "2020-12",
+ "yearAdd": 600,
+ "yearOut": 109,
+ "yearSum": 5540,
+ "monthAdd": 67,
+ "monthOut": 10,
+ "monthSum": 2300,
+ "totalNum": 1200,
+ "checkNum": 1300,
+ "personNum": 5700,
+ "subsidyTypeName": "閲嶅害娈嬬柧浜虹敓娲昏ˉ璐�",
+ "child": null
+ }
+ ]
+ }
+```
+<h4 id='4.2'>4.2鑾峰彇鍘嗗彶缁熻鏁版嵁</h4>
+###### 鎺ュ彛鍔熻兘
+> 鏍规嵁鍖哄煙id鍜岃ˉ璐寸被鍨嬭幏鍙栬幏鍙栧巻鍙茬粺璁℃暟鎹�
+
+###### URL
+> /api2/fwdx/getHistoryStaticsData
+
+###### 鏀寔鏍煎紡
+> JSON
+
+###### HTTP璇锋眰鏂瑰紡
+> GET
+
+###### 璇锋眰鍙傛暟
+|鍙傛暟|蹇呴�墊绫诲瀷|璇存槑|
+|:----- |:-------|:-----|----- |
+| areaId | 鏄� |String | 鍖哄煙id |
+| type | 鍚� |Integer | 琛ヨ创绫诲瀷 |
+
+###### 杩斿洖瀛楁
+|杩斿洖瀛楁|瀛楁绫诲瀷|璇存槑 |
+|:----- |:------|:----------------------------- |
+| month | String | 鏈堜唤 |
+| mAdd | int | 鏈堟柊澧� |
+| mOut | int | 鏈堥��鍑� |
+| totalName | int | 鐢宠鎬绘鏁� |
+| checkNum | int | 澶嶆牳鎬绘鏁� |
+
+###### 鎺ュ彛绀轰緥
+``` java
+{
+ "success": true,
+ "message": "success",
+ "code": 200,
+ "timestamp": 1607744308886,
+ "result": [
+ {
+ "mOut": 53,
+ "month": "2020-12",
+ "checkNum": 3400,
+ "mAdd": 117,
+ "totalName": 3054
+ },
+ {
+ "mOut": 15,
+ "month": "2020-11",
+ "checkNum": 3400,
+ "mAdd": 75,
+ "totalName": 2454
+ },
+ {
+ "mOut": 25,
+ "month": "2020-10",
+ "checkNum": 3400,
+ "mAdd": 105,
+ "totalName": 2284
+ }
+ ]
+}
+```
+
+
+
<h3 id='5'>浜斻�佹湇鍔℃満鏋�</h2>
<h4 id='5.1'>5.1鏍规嵁鍖哄煙id鑾峰彇鍖哄煙涓嬫墍鏈夋満鏋勫拰浜哄憳鏁伴噺浠ュ強璁㈠崟鎬绘暟</h4>
###### 鎺ュ彛鍔熻兘
diff --git a/platform-admin/src/main/resources/application.yml b/platform-admin/src/main/resources/application.yml
index e0386fb..4d039c9 100644
--- a/platform-admin/src/main/resources/application.yml
+++ b/platform-admin/src/main/resources/application.yml
@@ -153,6 +153,7 @@
# 鏃犻渶鐧诲綍璁よ瘉鐨勮姹�
urls:
- /api/**
+ - /api2/**
- /platform/file/**
- /platform/oauth2/**
- /platform/actuator/**
diff --git a/platform-modules/platform-generator/src/main/java/cn/cetc54/platform/generator/PlatformMPGenerator.java b/platform-modules/platform-generator/src/main/java/cn/cetc54/platform/generator/PlatformMPGenerator.java
index f79de8d..316e9b7 100644
--- a/platform-modules/platform-generator/src/main/java/cn/cetc54/platform/generator/PlatformMPGenerator.java
+++ b/platform-modules/platform-generator/src/main/java/cn/cetc54/platform/generator/PlatformMPGenerator.java
@@ -31,7 +31,7 @@
* 瀹炰綋绫诲悕
* 寤鸿浠呴渶淇敼
*/
- private static final String className = "Test";
+ private static final String className = "SubsidyPersonStatics";
/**
* 绫昏鏄庢弿杩�
@@ -49,7 +49,7 @@
* 鏁版嵁搴撹〃鍚嶅墠缂�
* 涓嬫柟璇锋牴鎹渶瑕佷慨鏀�
*/
- private static final String tablePre = "t_";
+ private static final String tablePre = "t_yl_";
/**
* 涓婚敭绫诲瀷
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/CommonController.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/CommonController.java
index 5f734df..bab481f 100644
--- a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/CommonController.java
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/CommonController.java
@@ -10,10 +10,7 @@
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.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
@@ -25,7 +22,8 @@
@Slf4j
@RestController
@Api(description = "閫氱敤鎺ュ彛")
-@RequestMapping("/api/common")
+@RequestMapping("/api2/common")
+@CrossOrigin("*")
public class CommonController {
@Autowired
private IAreaService iAreaService;
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/FwdxController.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/FwdxController.java
new file mode 100644
index 0000000..55d86a2
--- /dev/null
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/FwdxController.java
@@ -0,0 +1,77 @@
+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.SubsidyPersonStatics;
+import cn.cetc54.platform.zhyl.service.ISubsidyPersonStaticsService;
+import cn.hutool.core.date.DateUtil;
+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.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author xfei
+ * @date 2020/12/12
+ */
+@Slf4j
+@RestController
+@Api(description = "鏈嶅姟瀵硅薄")
+@RequestMapping("/api2/fwdx")
+@Transactional
+@CrossOrigin("*")
+public class FwdxController {
+ @Autowired
+ private ISubsidyPersonStaticsService iSubsidyPersonStaticsService;
+ @GetMapping("getStaticsData")
+ @ApiOperation(value = "鑾峰彇缁熻鏁版嵁")
+ public Result getStaticsData(String areaId,Integer type){
+ if (StrUtil.isEmpty(areaId)){
+ return ResultUtil.error("缂哄皯鍙傛暟");
+ }
+ String month = DateUtil.format(new Date(),"yyyy-MM");
+ QueryWrapper<SubsidyPersonStatics> query = new QueryWrapper<>();
+ query.lambda().eq(SubsidyPersonStatics::getAreaId,areaId);
+ query.lambda().eq(SubsidyPersonStatics::getMonth,month);
+ if (type!=null){
+ query.lambda().eq(SubsidyPersonStatics::getSubsidyType,type);
+ }
+ List<SubsidyPersonStatics> list = iSubsidyPersonStaticsService.list(query);
+ SubsidyPersonStatics statics = new SubsidyPersonStatics();
+ statics.setChild(list);
+ list.forEach(e->{
+ statics.setMonth(e.getMonth());
+ statics.setYearAdd(statics.getYearAdd()+e.getYearAdd());
+ statics.setYearOut(statics.getYearOut()+e.getYearOut());
+ statics.setYearSum(statics.getYearSum()+e.getYearSum());
+ statics.setMonthAdd(statics.getMonthAdd()+e.getMonthAdd());
+ statics.setMonthOut(statics.getMonthOut()+e.getMonthOut());
+ statics.setMonthSum(statics.getMonthSum()+e.getMonthSum());
+ statics.setTotalNum(statics.getTotalNum()+e.getTotalNum());
+ statics.setCheckNum(statics.getCheckNum()+e.getCheckNum());
+ statics.setPersonNum(statics.getPersonNum()+e.getPersonNum());
+ });
+ return ResultUtil.data(statics);
+ }
+ @GetMapping("getHistoryStaticsData")
+ @ApiOperation(value = "鑾峰彇鍘嗗彶缁熻鏁版嵁")
+ public Result getHistoryStaticsData(String areaId,Integer type){
+ if (StrUtil.isEmpty(areaId)){
+ return ResultUtil.error("缂哄皯鍙傛暟");
+ }
+ List result = iSubsidyPersonStaticsService.getMonthAddOut(areaId,type);
+ return ResultUtil.data(result);
+
+ }
+
+}
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/FwjgController.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/FwjgController.java
index 3bc9dc7..efd88cb 100644
--- a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/FwjgController.java
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/FwjgController.java
@@ -16,19 +16,20 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
-import java.sql.Wrapper;
import java.util.*;
import java.util.stream.Collectors;
@Slf4j
@RestController
@Api(description = "鏈嶅姟鏈烘瀯椤甸潰鎺ュ彛")
-@RequestMapping("/api/fwjg")
+@RequestMapping("/api2/fwjg")
@Transactional
+@CrossOrigin("*")
public class FwjgController {
@Autowired
private IAreaService iAreaService;
@@ -41,14 +42,6 @@
@Autowired
private IFuwuDetailsService iFuwuDetailsService;
-
- @RequestMapping(value = "/getByPage", method = RequestMethod.GET)
- @ApiOperation(value = "鍒嗛〉鑾峰彇鎵�鏈�")
- public Result<IPage<Area>> getByPage(PageVo page){
-
- IPage<Area> data = iAreaService.page(PageUtil.initMpPage(page));
- return new ResultUtil<IPage<Area>>().setData(data);
- }
@RequestMapping(value = "/getCountByAreaId", method = RequestMethod.GET)
@ApiOperation(value = "鏍规嵁鍖哄煙id鑾峰彇鍖哄煙涓嬫墍鏈夋満鏋勫拰浜哄憳鏁伴噺浠ュ強璁㈠崟鎬绘暟")
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 fc13381..5183c54 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
@@ -15,6 +15,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -30,7 +31,8 @@
@Slf4j
@RestController
@Api(description = "棣栭〉鎺ュ彛")
-@RequestMapping("/api/index")
+@RequestMapping("/api2/index")
+@CrossOrigin("*")
public class IndexController {
@Autowired
private IOrgYanglaoService iOrgYanglaoService;
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/SubsidyAPIController.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/SubsidyAPIController.java
index 6c8a2fe..66699d5 100644
--- a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/SubsidyAPIController.java
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/SubsidyAPIController.java
@@ -7,6 +7,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -21,7 +22,8 @@
@Slf4j
@RestController
@Api(description = "琛ヨ创椤甸潰鎺ュ彛")
-@RequestMapping("/api/subsidy")
+@RequestMapping("/api2/subsidy")
+@CrossOrigin("*")
public class SubsidyAPIController {
@Autowired
private ISubsidyLogService iSubsidyLogService;
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/SubsidyPerson.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/SubsidyPerson.java
new file mode 100644
index 0000000..8496916
--- /dev/null
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/SubsidyPerson.java
@@ -0,0 +1,47 @@
+package cn.cetc54.platform.zhyl.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * @author xfei
+ * @date 2020/12/11
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "t_yl_subsidy_person")
+@TableName("t_yl_subsidy_person")
+@ApiModel(value = "琛ヨ创浜哄憳")
+public class SubsidyPerson {
+ @Id
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
+ private int id;
+ @ApiModelProperty("韬唤璇佸彿鐮�")
+ private String sfzhm;
+ @ApiModelProperty("琛ヨ创绉嶇被")
+ private int subsidyType;
+ @ApiModelProperty("鍔犲叆鏃堕棿")
+ private Date inTime;
+ @ApiModelProperty("閫�鍑烘椂闂�")
+ private Date outTime;
+ @ApiModelProperty("鏍稿鏃堕棿")
+ private Date checkTime;
+ @ApiModelProperty("鐘舵�� 0/鍔犲叆 1/閫�鍑�")
+ private int status;
+ @ApiModelProperty("鏄惁鏍稿 0/鏈牳瀵� 1/宸叉牳瀵�")
+ private int isCheck;
+ @Transient
+ @TableField(exist=false)
+ @ApiModelProperty(value = "琛ヨ创鍚嶇О")
+ private String subsidyTypeName;
+}
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/SubsidyPersonStatics.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/SubsidyPersonStatics.java
new file mode 100644
index 0000000..f9cd140
--- /dev/null
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/SubsidyPersonStatics.java
@@ -0,0 +1,66 @@
+package cn.cetc54.platform.zhyl.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.util.List;
+
+/**
+ * 琛ヨ创缁熻琛�
+ * @author xfei
+ * @date 2020/12/11
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "t_yl_subsidy_person_statics")
+@TableName("t_yl_subsidy_person_statics")
+@ApiModel(value = "琛ヨ创浜哄憳")
+public class SubsidyPersonStatics {
+ @Id
+ @GeneratedValue(strategy= GenerationType.IDENTITY)
+ private int id;
+ @ApiModelProperty("琛ヨ创绫诲瀷")
+ private int subsidyType;
+ @ApiModelProperty("琛ヨ创绫诲瀷")
+ private String areaId;
+ @ApiModelProperty("鏈堜唤")
+ private String month;
+ @ApiModelProperty("骞存柊澧�")
+ private int yearAdd;
+ @ApiModelProperty("骞撮��鍑�")
+ private int yearOut;
+ @ApiModelProperty("骞村悎璁�")
+ private int yearSum;
+ @ApiModelProperty("鏈堟柊澧�")
+ private int monthAdd;
+ @ApiModelProperty("鏈堥��鍑�")
+ private int monthOut;
+ @ApiModelProperty("鏈堝悎璁�")
+ private int monthSum;
+ @ApiModelProperty("鐢宠鎬绘鏁�")
+ private int totalNum;
+ @ApiModelProperty("澶嶅悎鎬绘鏁�")
+ private int checkNum;
+ @ApiModelProperty("鏈嶅姟鎬讳汉鏁�")
+ private int personNum;
+ @Transient
+ @TableField(exist=false)
+ @ApiModelProperty(value = "琛ヨ创鍚嶇О")
+ private String subsidyTypeName;
+ @Transient
+ @TableField(exist=false)
+ @ApiModelProperty(value = "瀛愰」")
+ private List<SubsidyPersonStatics> child;
+
+ public String getSubsidyTypeName() {
+ return SubsidyEmum.values()[subsidyType].name();
+ }
+}
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/mapper/SubsidyPersonMapper.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/mapper/SubsidyPersonMapper.java
new file mode 100644
index 0000000..1e1f900
--- /dev/null
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/mapper/SubsidyPersonMapper.java
@@ -0,0 +1,19 @@
+package cn.cetc54.platform.zhyl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import cn.cetc54.platform.zhyl.entity.SubsidyPerson;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 娴嬭瘯鏁版嵁澶勭悊灞�
+ * @author
+ */
+public interface SubsidyPersonMapper extends BaseMapper<SubsidyPerson> {
+// @Select()
+// int yearAddNum(@Param("year") Date year);
+
+}
\ No newline at end of file
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/mapper/SubsidyPersonStaticsMapper.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/mapper/SubsidyPersonStaticsMapper.java
new file mode 100644
index 0000000..6de56e5
--- /dev/null
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/mapper/SubsidyPersonStaticsMapper.java
@@ -0,0 +1,33 @@
+package cn.cetc54.platform.zhyl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import cn.cetc54.platform.zhyl.entity.SubsidyPersonStatics;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 娴嬭瘯鏁版嵁澶勭悊灞�
+ * @author
+ */
+public interface SubsidyPersonStaticsMapper extends BaseMapper<SubsidyPersonStatics> {
+ /**
+ * 鑾峰彇姣忔湀鏂板鍜岄��鍑虹殑鍘嗗彶鏁版嵁
+ * @param type
+ * @return
+ */
+ @Select("<script>" +
+ "select month,SUM(month_add) as mAdd,SUM(month_out) as mOut,SUM(check_num) as checkNum,SUM(total_num) as totalName " +
+ "FROM t_yl_subsidy_person_statics " +
+ " <where> " +
+ "area_id = #{areaId} " +
+ " <if test='type!= null'>" +
+ " and subsidy_type = #{type}" +
+ " </if>" +
+ " </where>" +
+ "GROUP BY month ORDER BY month DESC LIMIT 12" +
+ " </script>")
+ List<Map<String,Object>> getMonthAddOut(@Param("areaId") String areaId,@Param("type") Integer type);
+}
\ No newline at end of file
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/service/ISubsidyPersonService.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/service/ISubsidyPersonService.java
new file mode 100644
index 0000000..9b42b87
--- /dev/null
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/service/ISubsidyPersonService.java
@@ -0,0 +1,14 @@
+package cn.cetc54.platform.zhyl.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.cetc54.platform.zhyl.entity.SubsidyPerson;
+
+import java.util.List;
+
+/**
+ * 娴嬭瘯鎺ュ彛
+ * @author
+ */
+public interface ISubsidyPersonService extends IService<SubsidyPerson> {
+
+}
\ No newline at end of file
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/service/ISubsidyPersonStaticsService.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/service/ISubsidyPersonStaticsService.java
new file mode 100644
index 0000000..009182c
--- /dev/null
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/service/ISubsidyPersonStaticsService.java
@@ -0,0 +1,22 @@
+package cn.cetc54.platform.zhyl.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.cetc54.platform.zhyl.entity.SubsidyPersonStatics;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 娴嬭瘯鎺ュ彛
+ * @author
+ */
+public interface ISubsidyPersonStaticsService extends IService<SubsidyPersonStatics> {
+ /**
+ * 鑾峰彇鏈堟柊澧炲拰閫�鍑虹殑鍘嗗彶鏁版嵁
+ * @param areaId
+ * @param type
+ * @return
+ */
+ List<Map<String,Object>> getMonthAddOut(String areaId, Integer type);
+
+}
\ No newline at end of file
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/serviceimpl/ISubsidyPersonServiceImpl.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/serviceimpl/ISubsidyPersonServiceImpl.java
new file mode 100644
index 0000000..d4aa356
--- /dev/null
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/serviceimpl/ISubsidyPersonServiceImpl.java
@@ -0,0 +1,26 @@
+package cn.cetc54.platform.zhyl.serviceimpl;
+
+import cn.cetc54.platform.zhyl.mapper.SubsidyPersonMapper;
+import cn.cetc54.platform.zhyl.entity.SubsidyPerson;
+import cn.cetc54.platform.zhyl.service.ISubsidyPersonService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 娴嬭瘯鎺ュ彛瀹炵幇
+ * @author
+ */
+@Slf4j
+@Service
+@Transactional
+public class ISubsidyPersonServiceImpl extends ServiceImpl<SubsidyPersonMapper, SubsidyPerson> implements ISubsidyPersonService {
+
+ @Autowired
+ private SubsidyPersonMapper subsidyPersonMapper;
+}
\ No newline at end of file
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/serviceimpl/ISubsidyPersonStaticsServiceImpl.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/serviceimpl/ISubsidyPersonStaticsServiceImpl.java
new file mode 100644
index 0000000..53dcb2c
--- /dev/null
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/serviceimpl/ISubsidyPersonStaticsServiceImpl.java
@@ -0,0 +1,32 @@
+package cn.cetc54.platform.zhyl.serviceimpl;
+
+import cn.cetc54.platform.zhyl.mapper.SubsidyPersonStaticsMapper;
+import cn.cetc54.platform.zhyl.entity.SubsidyPersonStatics;
+import cn.cetc54.platform.zhyl.service.ISubsidyPersonStaticsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 娴嬭瘯鎺ュ彛瀹炵幇
+ * @author
+ */
+@Slf4j
+@Service
+@Transactional
+public class ISubsidyPersonStaticsServiceImpl extends ServiceImpl<SubsidyPersonStaticsMapper, SubsidyPersonStatics> implements ISubsidyPersonStaticsService {
+
+ @Autowired
+ private SubsidyPersonStaticsMapper subsidyPersonStaticsMapper;
+
+ @Override
+ public List<Map<String, Object>> getMonthAddOut(String areaId, Integer type) {
+ return subsidyPersonStaticsMapper.getMonthAddOut(areaId,type);
+ }
+}
\ No newline at end of file
diff --git a/platform-modules/platform-zhyl/src/main/resources/mapper/SubsidyPersonMapper.xml b/platform-modules/platform-zhyl/src/main/resources/mapper/SubsidyPersonMapper.xml
new file mode 100644
index 0000000..17b2519
--- /dev/null
+++ b/platform-modules/platform-zhyl/src/main/resources/mapper/SubsidyPersonMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.cetc54.platform.zhyl.mapper.SubsidyPersonMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/platform-modules/platform-zhyl/src/main/resources/mapper/SubsidyPersonStaticsMapper.xml b/platform-modules/platform-zhyl/src/main/resources/mapper/SubsidyPersonStaticsMapper.xml
new file mode 100644
index 0000000..3daeda3
--- /dev/null
+++ b/platform-modules/platform-zhyl/src/main/resources/mapper/SubsidyPersonStaticsMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.cetc54.platform.zhyl.mapper.SubsidyPersonStaticsMapper">
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.1