From 4745238280ae22f373802470844c66cbcdbf4458 Mon Sep 17 00:00:00 2001
From: xuefei <564615061@qq.com>
Date: 星期二, 22 十二月 2020 15:17:51 +0800
Subject: [PATCH] 新接口修改
---
.gitignore | 1
platform-core/src/main/java/cn/cetc54/platform/core/config/IndexHtmlConfig.java | 18 +
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/IndexNewController.java | 234 +++++++++++++
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/IndexController.java | 5
api.md | 524 ++++++++++++++++++++++++++++
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/service/IOrderService.java | 7
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/CommonController.java | 1
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/vo/SubsidyTypeVo.java | 2
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/SubsidyAPIController.java | 92 ++++
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/FwjgController.java | 37 -
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/FwdxController.java | 92 ++++
platform-admin/src/main/resources/application.yml | 17
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/mapper/OrderMapper.java | 9
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/SubsidyEmum.java | 2
15 files changed, 995 insertions(+), 51 deletions(-)
diff --git a/.gitignore b/.gitignore
index 52a1ed0..6ec47ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
**/target/
/.iml/
/**/*.iml
+/platform-admin/src/main/resources/static/
diff --git a/api.md b/api.md
index 4d36baa..ee1c1cc 100644
--- a/api.md
+++ b/api.md
@@ -21,6 +21,18 @@
[ 5.3鏍规嵁鍖哄煙id鍜岃鍗曢噺鏌ヨ鏈嶅姟鏈烘瀯鎺掑悕鎯呭喌](#5.3)
[ 5.4鏍规嵁鍖哄煙id鍜岃鍗曢噺鏌ヨ鏈嶅姟鏈烘瀯鎺掑悕鎯呭喌](#5.4)
[ 5.5鎵ц涓鍗昡(#5.4)
+[5.鍏昏�佹満鏋刔(#6)
+ [ 6.1 鑾峰彇缁熻鏁版嵁](#6.1)
+ [ 6.2 搴婁綅涓暟鎺掑悕](#6.2)
+ [ 6.3 搴婁綅浣跨敤鐜囨帓鍚峕(#6.3)
+ [ 5.4 鍘嗗彶鏁版嵁](#6.4)
+[7.鏂伴椤礭(#7)
+ [ 7.1 绀句細鏁戝姪](#7.1)
+ [ 7.2 绀句細浜嬪姟](#7.2)
+ [ 7.3 鍏昏�佹湇鍔(#7.3)
+ [ 7.4 鍎跨绂忓埄](#7.4)
+ [ 7.5 缁煎悎鍒嗘瀽](#7.5)
+ [ 7.6 鍖哄煙鍦板悕](#7.6)
<h3 id='1'>涓�銆侀�氱敤</h2>
@@ -1221,7 +1233,7 @@
<h3 id='6'>鍏�佸吇鑰佹満鏋�</h2>
-<h4 id='6.1'>6.1鑾峰彇缁熻鏁版嵁</h4>
+<h4 id='6.1'>6.1 鑾峰彇缁熻鏁版嵁</h4>
###### 鎺ュ彛鍔熻兘
> 鑾峰彇缁熻鏁版嵁
@@ -1267,7 +1279,7 @@
"type2Num": 0
}
```
-<h4 id='6.2'>6.2搴婁綅涓暟鎺掑悕</h4>
+<h4 id='6.2'>6.2 搴婁綅涓暟鎺掑悕</h4>
###### 鎺ュ彛鍔熻兘
> 搴婁綅涓暟鎺掑悕
@@ -1346,7 +1358,7 @@
}
]
```
-<h4 id='6.3'>6.3搴婁綅浣跨敤鐜囨帓鍚�</h4>
+<h4 id='6.3'>6.3 搴婁綅浣跨敤鐜囨帓鍚�</h4>
###### 鎺ュ彛鍔熻兘
> 搴婁綅浣跨敤鐜囨帓鍚�
@@ -1393,7 +1405,7 @@
]
}
```
-<h4 id='6.4'>6.4鍘嗗彶鏁版嵁</h4>
+<h4 id='6.4'>6.4 鍘嗗彶鏁版嵁</h4>
###### 鎺ュ彛鍔熻兘
> 鍘嗗彶鏁版嵁
@@ -1461,4 +1473,508 @@
"num3": -6
}
}
+```
+
+
+<h3 id='7'>涓冦�佹柊棣栭〉</h2>
+<h4 id='7.1'>7.1 绀句細鏁戝姪</h4>
+###### 鎺ュ彛鍔熻兘
+> 绀句細鏁戝姪
+
+###### URL
+> /api2/indexnew/getSocialAssistance
+
+###### 鏀寔鏍煎紡
+> JSON
+
+###### HTTP璇锋眰鏂瑰紡
+> GET
+
+###### 璇锋眰鍙傛暟
+|鍙傛暟|蹇呴�墊绫诲瀷|璇存槑|
+|:----- |:-------|:-----|----- |
+
+###### 杩斿洖瀛楁
+|杩斿洖瀛楁|瀛楁绫诲瀷|璇存槑 |
+|:----- |:------|:----------------------------- |
+| values | list | 0/鏈堜唤 1/绀句細浣庝繚 2/鍩庡競鐗瑰洶 3/鍐滄潙浣庝繚 4/鍐滄潙鐗瑰洶 |
+| totalNum | int | 绱鏁戝姪浜烘暟 |
+| bedNumber | int | 绱鏁戝姪閲戦 |
+###### 鎺ュ彛绀轰緥
+``` java
+{
+ "success": true,
+ "message": "success",
+ "code": 200,
+ "timestamp": 1608193290531,
+ "result": {
+ "totalNum": 8412,
+ "values": [
+ [
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6,
+ 7,
+ 8,
+ 9,
+ 10,
+ 11,
+ 12
+ ],
+ [
+ 11907653,
+ 10597717,
+ 9296957,
+ 6597877,
+ 4763372,
+ 10710327,
+ 9553979,
+ 4834701,
+ 10880464,
+ 9810688,
+ 5738737,
+ 10748867
+ ],
+ [
+ 11010462,
+ 7804402,
+ 9392711,
+ 11341311,
+ 8226456,
+ 7441524,
+ 4568079,
+ 11054400,
+ 4058794,
+ 5997314,
+ 9592501,
+ 11165410
+ ],
+ [
+ 7735633,
+ 7007250,
+ 6633273,
+ 7130232,
+ 7686402,
+ 8403656,
+ 7056768,
+ 7306279,
+ 9173077,
+ 8598968,
+ 10173203,
+ 8361172
+ ],
+ [
+ 6009653,
+ 4813926,
+ 5912294,
+ 7372661,
+ 11468996,
+ 11789401,
+ 10779945,
+ 6445069,
+ 10400497,
+ 8283154,
+ 11153893,
+ 8146418
+ ]
+ ],
+ "totalMoney": 404936523
+ }
+}
+```
+<h4 id='7.2'>7.2 绀句細浜嬪姟</h4>
+###### 鎺ュ彛鍔熻兘
+> 绀句細浜嬪姟
+
+###### URL
+> /api2/indexnew/getSocialAffair
+
+###### 鏀寔鏍煎紡
+> JSON
+
+###### HTTP璇锋眰鏂瑰紡
+> GET
+
+###### 璇锋眰鍙傛暟
+|鍙傛暟|蹇呴�墊绫诲瀷|璇存槑|
+|:----- |:-------|:-----|----- |
+
+###### 杩斿洖瀛楁
+|杩斿洖瀛楁|瀛楁绫诲瀷|璇存槑 |
+|:----- |:------|:----------------------------- |
+| values | list | 0/鏈堜唤 1/缁撳 2/绂诲 |
+| num1 | int | 娈嬬柧琛ュ姪浜烘暟 |
+| num2 | int | 娈嬬柧琛ュ姪閲戦 |
+| num3 | int | 绱绂讳笘浜哄憳 |
+| num4 | int | 绱缁撳鐧昏 |
+| num5 | int | 閲嶅害娈嬬柧浜哄憳 |
+| num6 | int | 鍥伴毦娈嬬柧浜哄憳 |
+###### 鎺ュ彛绀轰緥
+``` java
+{
+ "success": true,
+ "message": "success",
+ "code": 200,
+ "timestamp": 1608193383484,
+ "result": {
+ "num6": 13425,
+ "values": [
+ [
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6,
+ 7,
+ 8,
+ 9,
+ 10,
+ 11,
+ 12
+ ],
+ [
+ 2124,
+ 2143,
+ 2462,
+ 2373,
+ 2278,
+ 2425,
+ 2467,
+ 2471,
+ 2425,
+ 2282,
+ 2341,
+ 2153
+ ],
+ [
+ 1689,
+ 1412,
+ 1607,
+ 1188,
+ 1844,
+ 1871,
+ 1940,
+ 1781,
+ 1498,
+ 1550,
+ 1274,
+ 1080
+ ]
+ ],
+ "num1": 1768,
+ "num5": 25956,
+ "num4": 6543,
+ "num3": 4568,
+ "num2": 2562
+ }
+}
+```
+<h4 id='7.3'>7.3 鍏昏�佹湇鍔�</h4>
+###### 鎺ュ彛鍔熻兘
+> 鍏昏�佹湇鍔�
+
+###### URL
+> /api2/indexnew/getPensionService
+
+###### 鏀寔鏍煎紡
+> JSON
+
+###### HTTP璇锋眰鏂瑰紡
+> GET
+
+###### 璇锋眰鍙傛暟
+|鍙傛暟|蹇呴�墊绫诲瀷|璇存槑|
+|:----- |:-------|:-----|----- |
+
+###### 杩斿洖瀛楁
+|杩斿洖瀛楁|瀛楁绫诲瀷|璇存槑 |
+|:----- |:------|:----------------------------- |
+| list | list | 0/楂橀緞琛ヨ创 1/楂橀緞娲ヨ创 2/瀵挎槦琛ヨ创 |
+| n1 | int | 鍏昏�佹満鏋勬暟 |
+| n2 | int | 搴婁綅鏁� |
+| n3 | int | 鏈嶅姟鏈烘瀯鏁� |
+| n4 | int | 鏈烘瀯浜哄憳鏁� |
+###### 鎺ュ彛绀轰緥
+``` java
+{
+ "success": true,
+ "message": "success",
+ "code": 200,
+ "timestamp": 1608193630945,
+ "result": {
+ "n1": 63,
+ "n2": 8769,
+ "n3": 458,
+ "n4": 13876,
+ "list": [
+ {
+ "num": 1697,
+ "money": 687
+ },
+ {
+ "num": 1227,
+ "money": 857
+ },
+ {
+ "num": 1333,
+ "money": 498
+ }
+ ]
+ }
+}
+```
+
+<h4 id='7.4'>7.4 鍎跨绂忓埄</h4>
+###### 鎺ュ彛鍔熻兘
+> 鍎跨绂忓埄
+
+###### URL
+> /api2/indexnew/getChildService
+
+###### 鏀寔鏍煎紡
+> JSON
+
+###### HTTP璇锋眰鏂瑰紡
+> GET
+
+###### 璇锋眰鍙傛暟
+|鍙傛暟|蹇呴�墊绫诲瀷|璇存槑|
+|:----- |:-------|:-----|----- |
+
+###### 杩斿洖瀛楁
+|杩斿洖瀛楁|瀛楁绫诲瀷|璇存槑 |
+|:----- |:------|:----------------------------- |
+| list | list | 0/鏈堜唤 1/鏃犳姎鍎跨 2/鏁ｅ吇鍎跨 3/闆嗕緵鍎跨 |
+| totalNum | int | 鍚堣浜烘暟 |
+| avgNum | int | 骞冲潎骞撮緞 |
+| yearAdd | int | 骞村闀� |
+| yearOut | int | 骞撮��鍑� |
+###### 鎺ュ彛绀轰緥
+``` java
+{
+ "success": true,
+ "message": "success",
+ "code": 200,
+ "timestamp": 1608194604735,
+ "result": {
+ "avgNum": 9,
+ "yearAdd": 2268,
+ "totalNum": 271746,
+ "yearOut": 2094,
+ "values": [
+ [
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6,
+ 7,
+ 8,
+ 9,
+ 10,
+ 11,
+ 12
+ ],
+ [
+ 8468,
+ 8438,
+ 8015,
+ 8664,
+ 8977,
+ 8769,
+ 8970,
+ 8211,
+ 8663,
+ 8573,
+ 8334,
+ 8060
+ ],
+ [
+ 7097,
+ 7015,
+ 7507,
+ 7733,
+ 7471,
+ 7981,
+ 7616,
+ 7427,
+ 8208,
+ 7083,
+ 7323,
+ 8056
+ ],
+ [
+ 7163,
+ 7200,
+ 6417,
+ 6599,
+ 6223,
+ 6923,
+ 6380,
+ 6289,
+ 6150,
+ 6754,
+ 6320,
+ 6669
+ ]
+ ]
+ }
+}
+```
+<h4 id='7.5'>7.5 缁煎悎鍒嗘瀽</h4>
+###### 鎺ュ彛鍔熻兘
+> 缁煎悎鍒嗘瀽
+
+###### URL
+> /api2/indexnew/getZongHe
+
+###### 鏀寔鏍煎紡
+> JSON
+
+###### HTTP璇锋眰鏂瑰紡
+> GET
+
+###### 璇锋眰鍙傛暟
+|鍙傛暟|蹇呴�墊绫诲瀷|璇存槑|
+|:----- |:-------|:-----|----- |
+
+###### 杩斿洖瀛楁
+|杩斿洖瀛楁|瀛楁绫诲瀷|璇存槑 |
+|:----- |:------|:----------------------------- |
+| values | list | 0/鏈堜唤 1/鎬绘暟 2/鏍稿鏁� |
+| checkTotalNum | int | 绱澶嶆牳娆℃暟 |
+| proportion | int | 澶嶆牳鐜� |
+| checkNum | int | 璁㈠崟澶嶆牳鏁� |
+| totalNum | int | 璁㈠崟鎬绘暟 |
+| totalServiceNum | int | 璁㈠崟鏈嶅姟鎬绘暟 |
+| totalServiceTime | int | 璁㈠崟鏈嶅姟鏃堕暱 |
+###### 鎺ュ彛绀轰緥
+``` java
+{
+ "success": true,
+ "message": "success",
+ "code": 200,
+ "timestamp": 1608194895386,
+ "result": {
+ "totalServiceNum": 4888,
+ "proportion": 130,
+ "checkNum": 6372,
+ "totalNum": 4888,
+ "totalServiceTime": 7332,
+ "values": [
+ [
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6,
+ 7,
+ 8,
+ 9,
+ 10,
+ 11,
+ 12
+ ],
+ [
+ 596,
+ 467,
+ 580,
+ 462,
+ 521,
+ 540,
+ 597,
+ 540,
+ 529,
+ 461,
+ 595,
+ 484
+ ],
+ [
+ 371,
+ 366,
+ 388,
+ 372,
+ 424,
+ 446,
+ 434,
+ 410,
+ 414,
+ 411,
+ 414,
+ 438
+ ]
+ ],
+ "checkTotalNum": 6372
+ }
+}
+```
+<h4 id='7.6'>7.6 鍖哄煙鍦板悕</h4>
+###### 鎺ュ彛鍔熻兘
+> 鍖哄煙鍦板悕
+
+###### URL
+> /api2/indexnew/getRegion
+
+###### 鏀寔鏍煎紡
+> JSON
+
+###### HTTP璇锋眰鏂瑰紡
+> GET
+
+###### 璇锋眰鍙傛暟
+|鍙傛暟|蹇呴�墊绫诲瀷|璇存槑|
+|:----- |:-------|:-----|----- |
+
+###### 杩斿洖瀛楁
+|杩斿洖瀛楁|瀛楁绫诲瀷|璇存槑 |
+|:----- |:------|:----------------------------- |
+| key | String | 鍚嶇О |
+| v | int | 鍊� |
+| unit | String | 鍗曚綅 |
+###### 鎺ュ彛绀轰緥
+``` java
+{
+ "success": true,
+ "message": "success",
+ "code": 200,
+ "timestamp": 1608195372905,
+ "result": [
+ {
+ "key": "灞呮皯鍖�",
+ "v": 105,
+ "unit": "涓�"
+ },
+ {
+ "key": "澶у瀷寤虹瓚鐗�",
+ "v": 28,
+ "unit": "涓�"
+ },
+ {
+ "key": "琛楅亾",
+ "v": 31,
+ "unit": "鏉�"
+ },
+ {
+ "key": "缁翠慨",
+ "v": 98,
+ "unit": "鍧�"
+ },
+ {
+ "key": "淇濇磥",
+ "v": 205,
+ "unit": "鍧�"
+ },
+ {
+ "key": "鎾ゅ洖",
+ "v": 48,
+ "unit": "鍧�"
+ }
+ ]
+}
```
\ No newline at end of file
diff --git a/platform-admin/src/main/resources/application.yml b/platform-admin/src/main/resources/application.yml
index 4d039c9..8f293f0 100644
--- a/platform-admin/src/main/resources/application.yml
+++ b/platform-admin/src/main/resources/application.yml
@@ -4,7 +4,7 @@
# password: platform
server:
- port: 8888
+ port: 9096
servlet:
context-path: /
tomcat:
@@ -15,10 +15,10 @@
spring:
# 鏁版嵁婧�
datasource:
- url: jdbc:mysql://127.0.0.1:3306/zhyl?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
- username: root
+ url: jdbc:mysql://39.96.92.240:3306/zhyl?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+ username: boying
# Jasypt鍔犲瘑 鍙埌common-utils涓壘鍒癑asyptUtil鍔犺В瀵嗗伐鍏风被鐢熸垚鍔犲瘑缁撴灉 鏍煎紡涓篍NC(鍔犲瘑缁撴灉) 浠ヤ笅瑙ｅ瘑缁撴灉涓�123456
- password: root
+ password: 2009boying
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
# Druid StatViewServlet閰嶇疆
@@ -100,14 +100,14 @@
platform:
# 鍏ㄥ眬闄愭祦
ratelimit:
- enable: true
+ enable: false
# 姣�1绉掑唴
timeout: 1000
# 鎬婚檺鍒�200涓姹�
limit: 200
# IP闄愭祦
iplimit:
- enable: true
+ enable: false
# 姣�1绉掑唴
timeout: 1000
# 姣忎釜ip闄愬埗20涓姹�
@@ -152,8 +152,7 @@
ignored:
# 鏃犻渶鐧诲綍璁よ瘉鐨勮姹�
urls:
- - /api/**
- - /api2/**
+ - /**
- /platform/file/**
- /platform/oauth2/**
- /platform/actuator/**
@@ -177,6 +176,8 @@
- /**/*.css
- /**/*.png
- /**/*.ico
+ - /**/*.html
+ - /*.html
# Actuator
management:
diff --git a/platform-core/src/main/java/cn/cetc54/platform/core/config/IndexHtmlConfig.java b/platform-core/src/main/java/cn/cetc54/platform/core/config/IndexHtmlConfig.java
new file mode 100644
index 0000000..7978a0b
--- /dev/null
+++ b/platform-core/src/main/java/cn/cetc54/platform/core/config/IndexHtmlConfig.java
@@ -0,0 +1,18 @@
+package cn.cetc54.platform.core.config;
+
+import org.springframework.core.Ordered;
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+/**
+ * @author xfei
+ * @date 2020/12/13
+ */
+public class IndexHtmlConfig extends WebMvcConfigurerAdapter {
+ @Override
+ public void addViewControllers(ViewControllerRegistry registry) {
+ registry.addViewController("/").setViewName("index");
+ registry.setOrder(Ordered.HIGHEST_PRECEDENCE);
+ super.addViewControllers(registry);
+ }
+}
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 bab481f..46d9688 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
@@ -37,6 +37,7 @@
@ApiOperation(value = "鑾峰彇鍏ㄩ儴琛ヨ创绫诲瀷")
public Result<List<SubsidyTypeVo>> getAllSubsidyType(){
List<SubsidyTypeVo> list = new ArrayList<>();
+ list.add(new SubsidyTypeVo(null,"鍏ㄩ儴"));
for (SubsidyEmum emum:SubsidyEmum.values()){
list.add(new SubsidyTypeVo(emum.ordinal(),emum.name()));
}
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
index cf2a359..a0b3a96 100644
--- 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
@@ -5,6 +5,7 @@
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.NumberUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.Api;
@@ -36,8 +37,9 @@
public class FwdxController {
@Autowired
private ISubsidyPersonStaticsService iSubsidyPersonStaticsService;
- @GetMapping("getStaticsData")
- @ApiOperation(value = "鑾峰彇缁熻鏁版嵁")
+ private int b = 18;//鍊嶆暟
+// @GetMapping("getStaticsData")
+// @ApiOperation(value = "鑾峰彇缁熻鏁版嵁")
public Result getStaticsData(String areaId,Integer type){
if (StrUtil.isEmpty(areaId)){
return ResultUtil.error("缂哄皯鍙傛暟");
@@ -66,8 +68,8 @@
});
return ResultUtil.data(statics);
}
- @GetMapping("getHistoryStaticsData")
- @ApiOperation(value = "鑾峰彇鍘嗗彶缁熻鏁版嵁")
+// @GetMapping("getHistoryStaticsData")
+// @ApiOperation(value = "鑾峰彇鍘嗗彶缁熻鏁版嵁")
public Result getHistoryStaticsData(String areaId,Integer type){
if (StrUtil.isEmpty(areaId)){
return ResultUtil.error("缂哄皯鍙傛暟");
@@ -89,6 +91,88 @@
return ResultUtil.data(vo);
}
+
+ @GetMapping("getStaticsData")
+ @ApiOperation(value = "鑾峰彇缁熻鏁版嵁")
+ public Result getStaticsDataT(String areaId,Integer type){
+ if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){
+ //濡傛灉鏄叏甯� areaId璁剧疆鏈┖
+ areaId = null;
+ }
+ boolean all = areaId==null;
+
+ List<SubsidyPersonStatics> list = new ArrayList<>();
+ for (int i=0;i<(type==null?12:1);i++){
+ SubsidyPersonStatics s = new SubsidyPersonStatics();
+ int mAdd = NumberUtil.generateBySet(50,100,1)[0];
+ int mOut = NumberUtil.generateBySet(1,50,1)[0];
+ int mSum = NumberUtil.generateBySet(150,280,1)[0];
+ int yAdd = NumberUtil.generateBySet(500,1600,1)[0];
+ int yOut = NumberUtil.generateBySet(50,650,1)[0];
+ int ySum = NumberUtil.generateBySet(1500,2800,1)[0];
+ int totalNum = NumberUtil.generateBySet(200,300,1)[0];
+ int checkNum = NumberUtil.generateBySet(100,200,1)[0];
+ int personNum = NumberUtil.generateBySet(16000,23000,1)[0];
+ s.setMonthAdd(all?mAdd*b:mAdd);
+ s.setMonthOut(all?mOut*b:mOut);
+ s.setMonthSum(all?mSum*b:mSum);
+ s.setYearSum(all?ySum*b:ySum);
+ s.setYearAdd(all?yAdd*b:yAdd);
+ s.setYearOut(all?yOut*b:yOut);
+ s.setTotalNum(all?totalNum*b:totalNum);
+ s.setCheckNum(all?checkNum*b:checkNum);
+ s.setPersonNum(all?personNum*b:personNum);
+ s.setSubsidyType(type==null?i:type);
+ list.add(s);
+ }
+
+
+
+
+
+
+ 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 getHistoryStaticsDataT(String areaId,Integer type){
+ if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){
+ //濡傛灉鏄叏甯� areaId璁剧疆鏈┖
+ areaId = null;
+ }
+ boolean all = areaId==null;
+
+ StatisVO vo = new StatisVO();
+ for (int i=1;i<13;i++){
+ int mAdd = NumberUtil.generateBySet(50,100,1)[0];
+ int mOut = NumberUtil.generateBySet(1,50,1)[0];
+ int checkNum = NumberUtil.generateBySet(100,200,1)[0];
+ int totalNum = NumberUtil.generateBySet(200,300,1)[0];
+ vo.month.add(i);
+ vo.mAdd.add(all?mAdd*b:mAdd);
+ vo.mOut.add(all?mOut*b:mOut);
+ vo.checkNum.add(all?checkNum*b:checkNum);
+ vo.totalNum.add(all?totalNum*b:totalNum);
+ }
+ return ResultUtil.data(vo);
+ }
+
+
+
@Data
class StatisVO{
//鏈堜唤
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 86d24d0..4797f6f 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
@@ -1,8 +1,6 @@
package cn.cetc54.platform.zhyl.api;
-import cn.cetc54.platform.core.common.utils.PageUtil;
import cn.cetc54.platform.core.common.utils.ResultUtil;
-import cn.cetc54.platform.core.common.vo.PageVo;
import cn.cetc54.platform.core.common.vo.Result;
import cn.cetc54.platform.zhyl.entity.*;
import cn.cetc54.platform.zhyl.entity.vo.FwjgCount;
@@ -11,7 +9,6 @@
import cn.cetc54.platform.zhyl.service.*;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -128,29 +125,11 @@
}
List<OrgFuwu> list = iOrgFuwuService.list(wrapper);
for (OrgFuwu orgFuwu : list) {
- QueryWrapper<FuwuDetails> wrapper1 = new QueryWrapper<>();
- wrapper1.isNull("pid");
- wrapper1.eq("org_fw_id",orgFuwu.getId());
- List<FuwuDetails> list1 = iFuwuDetailsService.list(wrapper1);
- int orgFuwuCount=0;
- for (FuwuDetails fuwuDetails : list1) {
- QueryWrapper<FuwuDetails> wrapper2 = new QueryWrapper<>();
- wrapper2.eq("pid",fuwuDetails.getId());
- List<FuwuDetails> list2 = iFuwuDetailsService.list(wrapper2);
- int fuwuDetailsCount=0;
- for (FuwuDetails details : list2) {
- QueryWrapper<Order> wrapper3 = new QueryWrapper<>();
- wrapper3.eq("area_id",areaId);
- wrapper3.eq("detail_id",details.getId());
- int count = iOrderService.count(wrapper3);
- fuwuDetailsCount+=count;
- }
- orgFuwuCount+=fuwuDetailsCount;
- }
- orgFuwu.setOrderNumber(orgFuwuCount);
+ orgFuwu.setOrderNumber(iOrderService.getOrderNum(orgFuwu.getId()));
}
- List<OrgFuwu> collectList = list.stream().sorted(Comparator.comparing(OrgFuwu::getOrderNumber)).collect(Collectors.toList());
- return new ResultUtil<Object>().setData(collectList.subList(0,10));
+ List<OrgFuwu> collectList = list.stream().sorted(Comparator.comparing(OrgFuwu::getOrderNumber).reversed()).collect(Collectors.toList());
+ List<OrgFuwu> resList = collectList.size()>10?collectList.subList(0,10):collectList;
+ return new ResultUtil<Object>().setData(resList);
}
@RequestMapping(value = "/getFuwuDetailsOrderByOrderNumber", method = RequestMethod.GET)
@@ -173,7 +152,7 @@
int count = iOrderService.count(wrapper3);
fuwuDetails.setOrderNumber(count);
}
- List<FuwuDetails> collectList = list.stream().sorted(Comparator.comparing(FuwuDetails::getOrderNumber)).collect(Collectors.toList());
+ List<FuwuDetails> collectList = list.stream().sorted(Comparator.comparing(FuwuDetails::getOrderNumber).reversed()).collect(Collectors.toList());
List<FuwuDetails> resList = collectList.size()>10?collectList.subList(0,10):collectList;
return ResultUtil.data(resList);
}
@@ -190,8 +169,10 @@
wrapper.eq("area_id",areaId);
}
-// wrapper.eq("state",0);
- wrapper.orderByAsc("create_time");
+ wrapper.eq("state",0);
+
+ wrapper.orderByDesc("create_time");
+ wrapper.last(" limit 10");
List<Order> list = iOrderService.list(wrapper);
int count = iOrderService.count(wrapper);
List<OrderByExecute> orderByExecuteList=new ArrayList<>();
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 ac38185..0ce5df5 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
@@ -68,7 +68,10 @@
areaId = null;
}
QueryWrapper<OrgFuwu> wrapper = new QueryWrapper<>();
- wrapper.eq("area_id",areaId);
+ if (StrUtil.isNotEmpty(areaId)){
+ wrapper.eq("area_id",areaId);
+ }
+
int total = iOrgFuwuService.list(wrapper).size();
List list = iOrderService.getTypeStatics(areaId);
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/IndexNewController.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/IndexNewController.java
new file mode 100644
index 0000000..20141a6
--- /dev/null
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/IndexNewController.java
@@ -0,0 +1,234 @@
+package cn.cetc54.platform.zhyl.api;
+
+import cn.cetc54.platform.core.common.utils.ResultUtil;
+import cn.cetc54.platform.core.common.vo.Result;
+import cn.hutool.core.util.NumberUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+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.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author xfei
+ * @date 2020/12/17
+ */
+@Slf4j
+@RestController
+@Api(description = "棣栭〉鎺ュ彛")
+@RequestMapping("/api2/indexnew")
+@CrossOrigin("*")
+public class IndexNewController {
+
+ @GetMapping("/getSocialAssistance")
+ @ApiOperation(value = "绀句細鏁戝姪")
+ public Result getSocialAssistance(){
+ List<Object> l = new ArrayList<>();
+ String[] d0 = {"1瀛ｅ害","2瀛ｅ害","3瀛ｅ害","4瀛ｅ害"};
+ int[] d1 = {12, 16, 13, 18};
+ int[] d2 = {10, 7, 10, 15};
+ int[] d3 = {15, 19, 13, 16};
+ int[] d4 = {12, 16, 15, 12};
+ int[] d5 = {61, 135, 201, 274};
+ l.add(d0);
+ l.add(d1);
+ l.add(d2);
+ l.add(d3);
+ l.add(d4);
+ l.add(d5);
+ Map<String,Object> resMap = new HashMap<>();
+ resMap.put("totalMoney",210);
+ resMap.put("totalNum",16);
+ resMap.put("values",l);
+ return ResultUtil.data(resMap);
+ }
+ public Result getSocialAssistance1(){
+
+ List<List<Integer>> values = new ArrayList<>();
+ values.add(new ArrayList<>());
+ values.add(new ArrayList<>());
+ values.add(new ArrayList<>());
+ values.add(new ArrayList<>());
+ values.add(new ArrayList<>());
+ int totalMoney = 0;
+ for (int i=1;i<13;i++){
+ values.get(0).add(i);
+ Integer[] v = NumberUtil.generateBySet(4000000,12000000,4);
+ values.get(1).add(v[0]);
+ values.get(2).add(v[1]);
+ values.get(3).add(v[2]);
+ values.get(4).add(v[3]);
+ totalMoney+=v[0];
+ totalMoney+=v[1];
+ totalMoney+=v[2];
+ totalMoney+=v[3];
+ }
+ int totalNum = NumberUtil.generateBySet(7000,9000,1)[0];
+
+ Map<String,Object> resMap = new HashMap<>();
+ resMap.put("totalMoney",totalMoney);
+ resMap.put("totalNum",totalNum);
+ resMap.put("values",values);
+ return ResultUtil.data(resMap);
+
+ }
+ @GetMapping("/getSocialAffair")
+ @ApiOperation(value = "绀句細浜嬪姟")
+ public Object getSocialAffair(){
+ List<List<Integer>> values = new ArrayList<>();
+ values.add(new ArrayList<>());
+ values.add(new ArrayList<>());
+ values.add(new ArrayList<>());
+ for (int i=1;i<13;i++){
+ values.get(0).add(i);
+ int v0 = NumberUtil.generateBySet(2000,2500,1)[0];
+ int v1 = NumberUtil.generateBySet(1000,2000,1)[0];
+ values.get(1).add(v0);
+ values.get(2).add(v1);
+ }
+
+ Map<String,Object> resMap = new HashMap<>();
+ resMap.put("values",values);
+ resMap.put("num1",1768); //娈嬬柧琛ュ姪浜烘暟
+ resMap.put("num2",2562); //娈嬬柧琛ュ姪閲戦
+ resMap.put("num3",4568); //绱绂讳笘浜哄憳
+ resMap.put("num4",6543); //绱缁撳鐧昏
+ resMap.put("num5",25956);//閲嶅害娈嬬柧浜哄憳
+ resMap.put("num6",13425);//鍥伴毦娈嬬柧浜哄憳
+ return ResultUtil.data(resMap);
+
+ }
+ @GetMapping("/getPensionService")
+ @ApiOperation(value = "鍏昏�佹湇鍔�")
+ public Result getPensionService(){
+
+ List<StatisVO> list = new ArrayList<>();
+ for (int i=0;i<3;i++){
+ StatisVO vo = new StatisVO();
+ vo.money = NumberUtil.generateBySet(400,1200,1)[0];
+ vo.num = NumberUtil.generateBySet(1200,1900,1)[0];
+ list.add(vo);
+ }
+ int n1 = 63;//鍏昏�佹満鏋勬�绘暟
+ int n2 = 8769;//搴婁綅鏁�
+ int n3 = 458;//鏈烘瀯涓暟
+ int n4 = 13876;//鏈烘瀯浜烘暟
+
+ Map<String,Object> resMap = new HashMap<>();
+ resMap.put("list",list);
+ resMap.put("n1",n1);
+ resMap.put("n2",n2);
+ resMap.put("n3",n3);
+ resMap.put("n4",n4);
+ return ResultUtil.data(resMap);
+
+ }
+
+ @GetMapping("/getChildService")
+ @ApiOperation(value = "鍎跨绂忓埄")
+ public Object getChildService(){
+ List<List<Integer>> values = new ArrayList<>();
+ values.add(new ArrayList<>());
+ values.add(new ArrayList<>());
+ values.add(new ArrayList<>());
+ values.add(new ArrayList<>());
+ int totalNum = 0;
+ for (int i=1;i<13;i++){
+ values.get(0).add(i);
+ int v0 = NumberUtil.generateBySet(8000,9000,1)[0];
+ int v1 = NumberUtil.generateBySet(7000,8500,1)[0];
+ int v2 = NumberUtil.generateBySet(6000,7300,1)[0];
+ values.get(1).add(v0);
+ values.get(2).add(v1);
+ values.get(3).add(v2);
+ totalNum+=v1;
+ totalNum+=v2;
+ totalNum+=v0;
+ }
+ int avgNum = 9;
+ int yearAdd = 756*3;
+ int yearOut = 698*3;
+
+ Map<String,Object> resMap = new HashMap<>();
+ resMap.put("values",values);
+ resMap.put("totalNum",totalNum);
+ resMap.put("avgNum",avgNum);
+ resMap.put("yearAdd",yearAdd);
+ resMap.put("yearOut",yearOut);
+ return ResultUtil.data(resMap);
+ }
+
+ @GetMapping("/getZongHe")
+ @ApiOperation(value = "缁煎悎鍒嗘瀽")
+ public Object getZongHe(){
+ List<List<Integer>> values = new ArrayList<>();
+ values.add(new ArrayList<>());
+ values.add(new ArrayList<>());
+ values.add(new ArrayList<>());
+ int totalNum = 0;//鎬绘暟
+ int checkNum = 0;//澶嶆牳鏁�
+ for (int i=1;i<13;i++){
+ values.get(0).add(i);
+ int v0 = NumberUtil.generateBySet(450,600,1)[0];
+ int v1 = NumberUtil.generateBySet(350,450,1)[0];
+ values.get(1).add(v0);
+ values.get(2).add(v1);
+ totalNum+=v1;
+ checkNum+=v0;
+ }
+ int proportion = checkNum*100/totalNum;//澶嶆牳鐜�
+
+ Map<String,Object> resMap = new HashMap<>();
+ resMap.put("values",values);
+ resMap.put("checkTotalNum",checkNum);//绱澶嶆牳娆℃暟
+ resMap.put("proportion",proportion);//澶嶆牳鐜�
+ resMap.put("checkNum",checkNum);//璁㈠崟澶嶆牳鏁�
+ resMap.put("totalNum",totalNum);//璁㈠崟鎬绘暟
+ resMap.put("totalServiceNum",totalNum);//璁㈠崟鎬绘暟
+ resMap.put("totalServiceTime",totalNum*1.5);//璁㈠崟鏈嶅姟鏃堕暱
+ return ResultUtil.data(resMap);
+
+ }
+ @GetMapping("/getRegion")
+ @ApiOperation(value = "鍖哄煙鍦板悕")
+ public Object getRegion(){
+ List<ObjVO> list = new ArrayList<>();
+ list.add(new ObjVO("鏂板浜哄彛",9.5,"涓囦汉"));
+ list.add(new ObjVO("缁撳娉ㄥ唽",1560,"瀵�"));
+ list.add(new ObjVO("绂诲娉ㄥ唽",1200,"瀵�"));
+ list.add(new ObjVO("鍥扮梾",1.3,"涓囦汉"));
+ list.add(new ObjVO("杞︾ジ",0.8,"涓囦汉"));
+ list.add(new ObjVO("鎰忓",0.9,"涓囦汉"));
+ return ResultUtil.data(list);
+ }
+
+ @Data
+ class StatisVO{
+ int num;
+ int money;
+ }
+ @Data
+ @NoArgsConstructor
+ @AllArgsConstructor
+ class ObjVO{
+ String key;
+ Object v;
+ String unit;
+
+ }
+
+
+
+
+
+}
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 b72ff7d..1864a20 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
@@ -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.NumberUtil;
import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -31,8 +32,8 @@
public class SubsidyAPIController {
@Autowired
private ISubsidyLogService iSubsidyLogService;
- @GetMapping("/getTotalStatistics")
- @ApiOperation(value = "鑾峰彇鎬荤粺璁℃暟鎹�")
+// @GetMapping("/getTotalStatistics")
+// @ApiOperation(value = "鑾峰彇鎬荤粺璁℃暟鎹�")
public Result getTotalStatistics(String areaId,Integer type){
if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){
//濡傛灉鏄叏甯� areaId璁剧疆鏈┖
@@ -47,8 +48,8 @@
return ResultUtil.data(resMap);
}
- @GetMapping("/getStatistics")
- @ApiOperation(value = "骞村害鏈堝害缁熻鏁版嵁")
+// @GetMapping("/getStatistics")
+// @ApiOperation(value = "骞村害鏈堝害缁熻鏁版嵁")
public Result getStatistics(String areaId,Integer type){
if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){
//濡傛灉鏄叏甯� areaId璁剧疆鏈┖
@@ -88,6 +89,89 @@
return ResultUtil.data(resMap);
}
+ @GetMapping("/getTotalStatistics")
+ @ApiOperation(value = "鑾峰彇鎬荤粺璁℃暟鎹�")
+ public Result getTotalStatisticsT(String areaId,Integer type){
+ if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){
+ //濡傛灉鏄叏甯� areaId璁剧疆鏈┖
+ areaId = null;
+ }
+ boolean all = areaId==null;
+
+ int totalPersonNum = iSubsidyLogService.getTotalNum(areaId,type);//鑾峰彇琛ヨ创鐨勬�讳汉鏁�
+ double totalMoney = iSubsidyLogService.getTotalMoney(areaId,type);//鑾峰彇鎬婚噾棰�
+
+ if (totalPersonNum==0){
+ totalPersonNum = NumberUtil.generateBySet(2000,3000,1)[0];
+ }
+ if (totalMoney==0){
+ totalMoney = NumberUtil.generateBySet(21000,39000,1)[0];
+ }
+
+ int hb1 = NumberUtil.generateBySet(1,15,1)[0];
+ int tb1 = NumberUtil.generateBySet(1,15,1)[0];
+ int hb2 = NumberUtil.generateBySet(1,15,1)[0];
+ int tb2 = NumberUtil.generateBySet(1,15,1)[0];
+ int fh1 = NumberUtil.generateBySet(100,250,1)[0];
+ int fh2 = NumberUtil.generateBySet(40,70,1)[0];
+
+ Map<String,Object> resMap = new HashMap<>();
+ resMap.put("totalPersonNum",totalPersonNum);
+ resMap.put("totalMoney",totalMoney);
+ resMap.put("hb1",hb1);
+ resMap.put("tb1",tb1);
+ resMap.put("hb2",hb2);
+ resMap.put("tb2",tb2);
+ resMap.put("fh1",all?fh1*18:fh1);
+ resMap.put("fh2",fh2);
+ return ResultUtil.data(resMap);
+
+ }
+ @GetMapping("/getStatistics")
+ @ApiOperation(value = "骞村害鏈堝害缁熻鏁版嵁")
+ public Result getStatisticsT(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);
+
+ List<String> month = new ArrayList<>();
+ List<Double> mSum = new ArrayList<>();
+ monthList.forEach(e->{
+ String d = (String) e.get("time");
+ double s = (double) e.get("sum");
+ month.add(0,d.split("-")[1]);
+ mSum.add(0,s);
+ });
+ StatisticsVo mS = new StatisticsVo();
+ mS.setTime(month);
+ mS.setSum(mSum);
+
+ List<String> year = new ArrayList<>();
+ List<Double> ySum = new ArrayList<>();
+ yearList.forEach(e->{
+ String d = (String) e.get("time");
+ double s = (double) e.get("sum");
+ year.add(0,d);
+ ySum.add(0,s/10000);
+ });
+ StatisticsVo yS = new StatisticsVo();
+ year.add(0,"2019");
+ ySum.add(0,7300d);
+ year.add(0,"2018");
+ ySum.add(0,6900d);
+ yS.setTime(year);
+ yS.setSum(ySum);
+
+
+ resMap.put("monthStatistics",mS);
+ resMap.put("yearStatistics",yS);
+ return ResultUtil.data(resMap);
+
+ }
@Data
class StatisticsVo{
Object time;
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/SubsidyEmum.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/SubsidyEmum.java
index edb6300..0ec8cf2 100644
--- a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/SubsidyEmum.java
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/SubsidyEmum.java
@@ -5,5 +5,5 @@
* @date 2020/12/10
*/
public enum SubsidyEmum {
- 鍥伴毦娈嬬柧鐢熸椿琛ヨ创,閲嶅害娈嬬柧浜虹敓娲昏ˉ璐�,楂橀緞鑰佷汉鐢熸椿琛ヨ创,楂橀緞鑰佷汉鐢熸椿娲ヨ创,鐧惧瞾瀵挎槦钀ュ吇琛ヨ创,闆嗕腑渚涘簲鍎跨,鏁ｅ眳鍎跨,鏃犱汉鎶氬吇鍎跨,鍩庡競鐗瑰洶浜哄憳,鍐滄潙鐗瑰洶浜哄憳,鍩庡競浣庝繚瀹跺涵,鍐滄潙浣庝繚瀹跺涵
+ 鍩庡競浣庝繚,鍩庡競鐗瑰洶,鍐滄潙浣庝繚,鍐滄潙鐗瑰洶,閲嶆畫鎶ょ悊,娈嬬柧琛ュ姪,楂橀緞琛ヨ创,楂橀緞娲ヨ创,瀵挎槦琛ヨ创,鏃犳姎鍎跨,鏁ｅ眳鍎跨,闆嗕緵鍎跨
}
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 ef87ded..ea22085 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
@@ -32,4 +32,13 @@
"GROUP BY detail ORDER BY num desc" +
"</script>")
List<Map<String,Object>> getTypeStatics(@Param("areaId") String areaId);
+ @Select("<script>" +
+ "select count(*) as num " +
+ "from t_yl_order o " +
+ "left join t_yl_fuwu_person p " +
+ "on o.person_id=p.id " +
+ "where p.org_fw_Id=#{orgId}" +
+ "</script>")
+ int getOrderNum(@Param("orgId") String orgId);
+
}
\ No newline at end of file
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 208ebbf..af2d8c3 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
@@ -17,4 +17,11 @@
*/
List getTypeStatics(String areaId);
+ /**
+ * 鏍规嵁鏈嶅姟鏈烘瀯id 鑾峰彇璁㈠崟閲�
+ * @param orgId
+ * @return
+ */
+ int getOrderNum(String orgId);
+
}
\ 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 84cdda3..7a69c98 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
@@ -28,4 +28,9 @@
public List getTypeStatics(String areaId) {
return orderMapper.getTypeStatics(areaId);
}
+
+ @Override
+ public int getOrderNum(String orgId) {
+ return orderMapper.getOrderNum(orgId);
+ }
}
\ No newline at end of file
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/vo/SubsidyTypeVo.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/vo/SubsidyTypeVo.java
index 5941955..03f1366 100644
--- a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/vo/SubsidyTypeVo.java
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/vo/SubsidyTypeVo.java
@@ -13,6 +13,6 @@
@NoArgsConstructor
@AllArgsConstructor
public class SubsidyTypeVo {
- private int index;
+ private Integer index;
private String name;
}
--
Gitblit v1.9.1