From 8b78fa91629b31e4af0216884df0bae730751310 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期四, 10 十二月 2020 18:56:41 +0800
Subject: [PATCH] 服务机构的接口及文档
---
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/vo/FwjgCount.java | 11 +
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/vo/FwnlAndOrderCount.java | 12 +
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/FuwuDetails.java | 4
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/FwjgController.java | 182 ++++++++++++++++++++
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/vo/OrderByExecute.java | 13 +
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/OrgFuwu.java | 4
api.md | 282 +++++++++++++++++++++++++++++-
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/FuwuPerson.java | 4
8 files changed, 496 insertions(+), 16 deletions(-)
diff --git a/api.md b/api.md
index ba886c4..52079a9 100644
--- a/api.md
+++ b/api.md
@@ -18,7 +18,7 @@
> 鑾峰彇鎵�鏈夊尯鍩�
###### URL
-> /api/getAllArea
+> /api/fwjg/getByPage
###### 鏀寔鏍煎紡
> JSON
@@ -29,29 +29,82 @@
###### 璇锋眰鍙傛暟
|鍙傛暟|蹇呴�墊绫诲瀷|璇存槑|
|:----- |:-------|:-----|----- |
-| | || |
+| pageNumber | 鏄� |int| 鍒嗛〉椤垫暟 |
+| pageSize | 鏄� |int| 鍒嗛〉澶у皬 |
+| sort | 鍚� |String| 鎺掑簭瀛楁 |
+| order | 鍚� |String| 鎺掑簭鏂瑰紡 asc/desc |
###### 杩斿洖瀛楁
|杩斿洖瀛楁|瀛楁绫诲瀷|璇存槑 |
|:----- |:------|:----------------------------- |
-| | | |
+| total | int | 杩斿洖鍒嗛〉缁撴灉鏁� |
+| size | int | 鍒嗛〉澶у皬 |
+| current | int | 褰撳墠椤垫暟 |
+| pages | int | 鎬诲叡椤垫暟 |
+| success | boolean | 鏄惁鎴愬姛 |
+| code | int | 杩斿洖code鐮� |
+| result | object | 杩斿洖缁撴灉 |
+| name | String | 鍚嶇О |
+| pid | String | 涓婄骇id |
###### 鎺ュ彛绀轰緥
``` java
{
- "statue": 0,
- "company": "鍙彛鍙箰",
- "category": "楗枡",
+ "success": true,
+ "message": "success",
+ "code": 200,
+ "timestamp": 1607582573231,
+ "result": {
+ "records": [
+ {
+ "id": "1336922902628536320",
+ "createBy": null,
+ "createTime": "2020-12-10 14:37:13",
+ "updateBy": null,
+ "updateTime": null,
+ "delFlag": 0,
+ "name": "鐭冲搴勫競",
+ "pid": null
+ },
+ {
+ "id": "1336923402568601600",
+ "createBy": null,
+ "createTime": "2020-12-10 14:39:12",
+ "updateBy": null,
+ "updateTime": null,
+ "delFlag": 0,
+ "name": "鏂板崕鍖�",
+ "pid": "1336922902628536320"
+ },
+ {
+ "id": "1336923441189752832",
+ "createBy": null,
+ "createTime": "2020-12-10 14:39:21",
+ "updateBy": null,
+ "updateTime": null,
+ "delFlag": 0,
+ "name": "姝ｅ畾鍘�",
+ "pid": "1336922902628536320"
+ }
+ ],
+ "total": 7,
+ "size": 10,
+ "current": 1,
+ "orders": [],
+ "hitCount": false,
+ "searchCount": true,
+ "pages": 1
+ }
}
```
-<h3 id='2'>浜屻�侀椤�</h2>
-<h4 id='2.1'>2.1鑾峰彇鍖哄煙娲ヨ创缁熻</h4>
+<h3 id='2'>浜屻�佹湇鍔℃満鏋�</h2>
+<h4 id='2.1'>2.1鏍规嵁鍖哄煙id鑾峰彇鍖哄煙涓嬫墍鏈夋満鏋勫拰浜哄憳鏁伴噺浠ュ強璁㈠崟鎬绘暟</h4>
###### 鎺ュ彛鍔熻兘
-> 鏍规嵁鍖哄煙鍚嶇О鑾峰彇娲ヨ创缁熻
+> 鏍规嵁鍖哄煙id鑾峰彇鍖哄煙涓嬫墍鏈夋満鏋勫拰浜哄憳鏁伴噺浠ュ強璁㈠崟鎬绘暟
###### URL
-> /api/getAllArea
+> /api/fwjg/getCountByAreaId
###### 鏀寔鏍煎紡
> JSON
@@ -62,18 +115,215 @@
###### 璇锋眰鍙傛暟
|鍙傛暟|蹇呴�墊绫诲瀷|璇存槑|
|:----- |:-------|:-----|----- |
-| | || |
+| areaId | 鏄� |String | 鍖哄煙id |
###### 杩斿洖瀛楁
|杩斿洖瀛楁|瀛楁绫诲瀷|璇存槑 |
|:----- |:------|:----------------------------- |
-| | | |
+| fwjgCount | Integer | 鏈嶅姟鏈烘瀯鎬绘暟 |
+| fwPersonCount | Integer | 鏈嶅姟浜哄憳鎬绘暟 |
+| orderCount | Integer | 璁㈠崟鎬绘暟 |
+| orderWatch | String | 璁㈠崟鐩戞帶鐜� |
###### 鎺ュ彛绀轰緥
``` java
{
- "statue": 0,
- "company": "鍙彛鍙箰",
- "category": "楗枡",
+ "success": true,
+ "message": "success",
+ "code": 200,
+ "timestamp": 1607587253794,
+ "result": {
+ "fwjgCount": 1,
+ "fwPersonCount": 1,
+ "orderCount": 2,
+ "orderWatch": "100%"
+ }
}
-```
\ No newline at end of file
+```
+<h4 id='2.1'>2.1鏍规嵁鍖哄煙id鑾峰彇鍖哄煙涓嬫墍鏈夋湇鍔′互鍙婃湇鍔¤鎯呭拰璁㈠崟浜烘暟</h4>
+###### 鎺ュ彛鍔熻兘
+> 鏍规嵁鍖哄煙id鑾峰彇鍖哄煙涓嬫墍鏈夋満鏋勫拰浜哄憳鏁伴噺浠ュ強璁㈠崟鎬绘暟
+
+###### URL
+> /api/fwjg/getFwnlByAreaId
+
+###### 鏀寔鏍煎紡
+> JSON
+
+###### HTTP璇锋眰鏂瑰紡
+> GET
+
+###### 璇锋眰鍙傛暟
+|鍙傛暟|蹇呴�墊绫诲瀷|璇存槑|
+|:----- |:-------|:-----|----- |
+| areaId | 鏄� |String | 鍖哄煙id |
+
+###### 杩斿洖瀛楁
+|杩斿洖瀛楁|瀛楁绫诲瀷|璇存槑 |
+|:----- |:------|:----------------------------- |
+| fuwuDetails | object | 鏈嶅姟璇︽儏涓�绾ц彍鍗� |
+| fuwuDetailsList | list | 鏈嶅姟璇︽儏浜岀骇鑿滃崟 |
+###### 鎺ュ彛绀轰緥
+``` java
+{
+ "success": true,
+ "message": "success",
+ "code": 200,
+ "timestamp": 1607594225830,
+ "result": [
+ {
+ "fuwuDetails": {
+ "id": "1336969411080359936",
+ "createBy": null,
+ "createTime": "2020-12-10 17:42:02",
+ "updateBy": null,
+ "updateTime": null,
+ "delFlag": 0,
+ "areaId": "1336923302341513216",
+ "orgFwId": "1336941016934125568",
+ "pid": null,
+ "name": "搴峰鏈嶅姟",
+ "orderNumber": null
+ },
+ "fuwuDetailsList": [
+ {
+ "id": "1336969601455624192",
+ "createBy": null,
+ "createTime": "2020-12-10 17:42:47",
+ "updateBy": null,
+ "updateTime": null,
+ "delFlag": 0,
+ "areaId": "1336923302341513216",
+ "orgFwId": "1336941016934125568",
+ "pid": "1336969411080359936",
+ "name": "鍔熻兘璁粌",
+ "orderNumber": 1
+ },
+ {
+ "id": "1336969641251180544",
+ "createBy": null,
+ "createTime": "2020-12-10 17:42:56",
+ "updateBy": null,
+ "updateTime": null,
+ "delFlag": 0,
+ "areaId": "1336923302341513216",
+ "orgFwId": "1336941016934125568",
+ "pid": "1336969411080359936",
+ "name": "搴峰鎸夋懇",
+ "orderNumber": 0
+ }
+ ]
+ },
+ {
+ "fuwuDetails": {
+ "id": "1336969708104192000",
+ "createBy": null,
+ "createTime": "2020-12-10 17:43:12",
+ "updateBy": null,
+ "updateTime": null,
+ "delFlag": 0,
+ "areaId": "1336923302341513216",
+ "orgFwId": "1336941016934125568",
+ "pid": null,
+ "name": "鐢熸椿鐓ф枡鏈嶅姟",
+ "orderNumber": null
+ },
+ "fuwuDetailsList": [
+ {
+ "id": "1336969818158534656",
+ "createBy": null,
+ "createTime": "2020-12-10 17:43:39",
+ "updateBy": null,
+ "updateTime": null,
+ "delFlag": 0,
+ "areaId": "1336923302341513216",
+ "orgFwId": "1336941016934125568",
+ "pid": "1336969708104192000",
+ "name": "鍠樻伅鏈嶅姟",
+ "orderNumber": 0
+ }
+ ]
+ }
+ ]
+}
+}
+```
+<h4 id='2.1'>2.3鏍规嵁鍖哄煙id鍜岃鍗曢噺鏌ヨ鏈嶅姟鏈烘瀯鎺掑悕鎯呭喌</h4>
+###### 鎺ュ彛鍔熻兘
+> 鏍规嵁鍖哄煙id鍜岃鍗曢噺鏌ヨ鏈嶅姟鏈烘瀯鎺掑悕鎯呭喌
+
+###### URL
+> /api/fwjg/getFwjgOrderByOrderNumber
+
+###### 鏀寔鏍煎紡
+> JSON
+
+###### HTTP璇锋眰鏂瑰紡
+> GET
+
+###### 璇锋眰鍙傛暟
+|鍙傛暟|蹇呴�墊绫诲瀷|璇存槑|
+|:----- |:-------|:-----|----- |
+| areaId | 鏄� |String | 鍖哄煙id |
+
+###### 杩斿洖瀛楁
+|杩斿洖瀛楁|瀛楁绫诲瀷|璇存槑 |
+|:----- |:------|:----------------------------- |
+| records | list | 鏈嶅姟鏈烘瀯list |
+###### 鎺ュ彛绀轰緥
+``` java
+
+
+```
+<h4 id='2.1'>2.3鏍规嵁鍖哄煙id鍜岃鍗曢噺鏌ヨ鏈嶅姟鏈烘瀯鎺掑悕鎯呭喌</h4>
+###### 鎺ュ彛鍔熻兘
+> 鏍规嵁鍖哄煙id鍜岃鍗曢噺鏌ヨ瀹為檯鏈嶅姟鎺掑悕鎯呭喌
+
+###### URL
+> /api/fwjg/getFuwuDetailsOrderByOrderNumber
+
+###### 鏀寔鏍煎紡
+> JSON
+
+###### HTTP璇锋眰鏂瑰紡
+> GET
+
+###### 璇锋眰鍙傛暟
+|鍙傛暟|蹇呴�墊绫诲瀷|璇存槑|
+|:----- |:-------|:-----|----- |
+| areaId | 鏄� |String | 鍖哄煙id |
+
+###### 杩斿洖瀛楁
+|杩斿洖瀛楁|瀛楁绫诲瀷|璇存槑 |
+|:----- |:------|:----------------------------- |
+| records | list | 鏈嶅姟璇︽儏list |
+###### 鎺ュ彛绀轰緥
+``` java
+
+```
+<h4 id='2.1'>2.4鎵ц涓鍗�</h4>
+###### 鎺ュ彛鍔熻兘
+> 鎵ц涓鍗�
+
+###### URL
+> /api/fwjg/getOrder
+
+###### 鏀寔鏍煎紡
+> JSON
+
+###### HTTP璇锋眰鏂瑰紡
+> GET
+
+###### 璇锋眰鍙傛暟
+|鍙傛暟|蹇呴�墊绫诲瀷|璇存槑|
+|:----- |:-------|:-----|----- |
+| areaId | 鏄� |String | 鍖哄煙id |
+
+###### 杩斿洖瀛楁
+|杩斿洖瀛楁|瀛楁绫诲瀷|璇存槑 |
+|:----- |:------|:----------------------------- |
+| count | int | 鎵ц涓鍗曟暟閲� |
+| orderByExecuteList | list | 鎵ц涓鍗曡鎯� |
+###### 鎺ュ彛绀轰緥
+``` java
+
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
new file mode 100644
index 0000000..bd854c8
--- /dev/null
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/FwjgController.java
@@ -0,0 +1,182 @@
+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;
+import cn.cetc54.platform.zhyl.entity.vo.FwnlAndOrderCount;
+import cn.cetc54.platform.zhyl.entity.vo.OrderByExecute;
+import cn.cetc54.platform.zhyl.service.*;
+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 javafx.collections.ObservableList;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+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")
+@Transactional
+public class FwjgController {
+ @Autowired
+ private IAreaService iAreaService;
+ @Autowired
+ private IOrgFuwuService iOrgFuwuService;
+ @Autowired
+ private IFuwuPersonService iFuwuPersonService;
+ @Autowired
+ private IOrderService iOrderService;
+ @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鑾峰彇鍖哄煙涓嬫墍鏈夋満鏋勫拰浜哄憳鏁伴噺浠ュ強璁㈠崟鎬绘暟")
+ public Result<Object> getCountByAreaId(String areaId){
+ QueryWrapper<OrgFuwu> wrapper = new QueryWrapper<>();
+ wrapper.eq("area_id",areaId);
+ int orgFuwuCount = iOrgFuwuService.count(wrapper);
+ QueryWrapper<FuwuPerson> wrapper1 = new QueryWrapper<>();
+ wrapper1.eq("area_id",areaId);
+ int fuwuPersonCount = iFuwuPersonService.count(wrapper1);
+ QueryWrapper<Order> wrapper2 = new QueryWrapper<>();
+ wrapper2.eq("area_id",areaId);
+ int orderCount = iOrderService.count(wrapper2);
+ QueryWrapper<Order> wrapper3 = new QueryWrapper<>();
+ wrapper2.eq("area_id",areaId);
+ wrapper2.eq("state",0);
+ int orderCount2 = iOrderService.count(wrapper3);
+ FwjgCount fwjgCount=new FwjgCount();
+ fwjgCount.setFwjgCount(orgFuwuCount);
+ fwjgCount.setFwPersonCount(fuwuPersonCount);
+ fwjgCount.setOrderCount(orderCount);
+ fwjgCount.setOrderWatch((orderCount2/orderCount)*100+"%");
+ return new ResultUtil<>().setData(fwjgCount);
+ }
+
+ @RequestMapping(value = "/getFwnlByAreaId", method = RequestMethod.GET)
+ @ApiOperation(value = "鏍规嵁鍖哄煙id鑾峰彇鍖哄煙涓嬫墍鏈夊疄闄呮湇鍔′互鍙婃湇鍔¤鍗曟暟")
+ public Result<Object> getFwnlByAreaId(String areaId){
+ QueryWrapper<FuwuDetails> wrapper = new QueryWrapper<>();
+ wrapper.isNull("pid");
+ List<FuwuDetails> list = iFuwuDetailsService.list(wrapper);
+ List<FwnlAndOrderCount> fwnlAndOrderCountList=new ArrayList<>();
+ for (FuwuDetails fuwuDetails : list) {
+ QueryWrapper<FuwuDetails> wrapper1 = new QueryWrapper<>();
+ wrapper1.eq("pid",fuwuDetails.getId());
+ List<FuwuDetails> list1 = iFuwuDetailsService.list(wrapper1);
+ for (FuwuDetails details : list1) {
+ QueryWrapper<Order> wrapper2 = new QueryWrapper<>();
+ wrapper2.eq("area_id",areaId);
+ wrapper2.eq("detail_id",details.getId());
+ int count = iOrderService.count(wrapper2);
+ details.setOrderNumber(count);
+ }
+ FwnlAndOrderCount fwnlAndOrderCount=new FwnlAndOrderCount();
+ fwnlAndOrderCount.setFuwuDetails(fuwuDetails);
+ fwnlAndOrderCount.setFuwuDetailsList(list1);
+ fwnlAndOrderCountList.add(fwnlAndOrderCount);
+ }
+ return new ResultUtil<Object>().setData(fwnlAndOrderCountList);
+ }
+
+ @RequestMapping(value = "/getFwjgOrderByOrderNumber", method = RequestMethod.GET)
+ @ApiOperation(value = "鏍规嵁鍖哄煙id鍜岃鍗曢噺鏌ヨ鏈嶅姟鏈烘瀯鎺掑悕鎯呭喌")
+ public Result<Object> getFwjgOrderByOrderNumber(String areaId){
+ QueryWrapper<OrgFuwu> wrapper = new QueryWrapper<>();
+ wrapper.eq("area_id",areaId);
+ 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);
+ }
+ List<OrgFuwu> collectList = list.stream().sorted(Comparator.comparing(OrgFuwu::getOrderNumber)).collect(Collectors.toList());
+ return new ResultUtil<Object>().setData(collectList.subList(0,10));
+ }
+
+ @RequestMapping(value = "/getFuwuDetailsOrderByOrderNumber", method = RequestMethod.GET)
+ @ApiOperation(value = "鏍规嵁鍖哄煙id鍜岃鍗曢噺鏌ヨ瀹為檯鏈嶅姟鎺掑悕鎯呭喌")
+ public Result<Object> getFuwuDetailsOrderByOrderNumber(String areaId){
+ QueryWrapper<FuwuDetails> wrapper = new QueryWrapper<>();
+ wrapper.isNotNull("pid");
+ wrapper.eq("del_flag",0);
+ List<FuwuDetails> list = iFuwuDetailsService.list(wrapper);
+ for (FuwuDetails fuwuDetails : list) {
+ QueryWrapper<Order> wrapper3 = new QueryWrapper<>();
+ wrapper3.eq("area_id",areaId);
+ wrapper3.eq("detail_id",fuwuDetails.getId());
+ int count = iOrderService.count(wrapper3);
+ fuwuDetails.setOrderNumber(count);
+ }
+ List<FuwuDetails> collectList = list.stream().sorted(Comparator.comparing(FuwuDetails::getOrderNumber)).collect(Collectors.toList());
+ return new ResultUtil<Object>().setData(collectList.subList(0,10));
+ }
+
+ @RequestMapping(value = "/getOrder", method = RequestMethod.GET)
+ @ApiOperation(value = "鎵ц涓鍗�")
+ public Result<Object> getOrder(String areaId){
+ QueryWrapper<Order> wrapper = new QueryWrapper<>();
+ wrapper.eq("area_id",areaId);
+ wrapper.eq("state",0);
+ wrapper.orderByAsc("creat_time");
+ List<Order> list = iOrderService.list(wrapper);
+ int count = iOrderService.count(wrapper);
+ List<OrderByExecute> orderByExecuteList=new ArrayList<>();
+ for (Order order : list) {
+ OrderByExecute orderByExecute=new OrderByExecute();
+ orderByExecute.setOrder(order);
+ FuwuPerson person = iFuwuPersonService.getById(order.getPersonId());
+ orderByExecute.setFuwuPerson(person);
+ FuwuDetails fuwuDetail = iFuwuDetailsService.getById(order.getDetailId());
+ orderByExecute.setFuwuDetails(fuwuDetail);
+ orderByExecuteList.add(orderByExecute);
+ }
+ Map<String,Object> map=new HashMap<>();
+ map.put("count",count);
+ map.put("orderByExecuteList",orderByExecuteList);
+ return new ResultUtil<Object>().setData(map);
+ }
+
+
+
+
+}
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/FuwuDetails.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/FuwuDetails.java
index 2b61ba2..70b28de 100644
--- a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/FuwuDetails.java
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/FuwuDetails.java
@@ -1,6 +1,7 @@
package cn.cetc54.platform.zhyl.entity;
import cn.cetc54.platform.core.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModel;
@@ -42,4 +43,7 @@
@Column( length = 24 ,name = "name")
@ApiModelProperty(value = "鏈嶅姟鍚嶇О")
private String name;
+
+ @TableField(exist=false)
+ private Integer orderNumber;
}
\ No newline at end of file
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/FuwuPerson.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/FuwuPerson.java
index 8fd062c..e588643 100644
--- a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/FuwuPerson.java
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/FuwuPerson.java
@@ -26,6 +26,10 @@
private static final long serialVersionUID = 1L;
+ @Column( length = 24 ,name = "area_id")
+ @ApiModelProperty(value = "鍖哄煙id")
+ private String areaId;
+
@Column( length = 10 ,name = "name")
@ApiModelProperty(value = "鍚嶇О")
private String name;
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/OrgFuwu.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/OrgFuwu.java
index fb29693..2df6094 100644
--- a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/OrgFuwu.java
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/OrgFuwu.java
@@ -1,6 +1,7 @@
package cn.cetc54.platform.zhyl.entity;
import cn.cetc54.platform.core.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModel;
@@ -33,4 +34,7 @@
@Column( length = 24 ,name = "area_id")
@ApiModelProperty(value = "鍖哄煙id")
private String areaId;
+
+ @TableField(exist=false)
+ private Integer orderNumber;
}
\ No newline at end of file
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/vo/FwjgCount.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/vo/FwjgCount.java
new file mode 100644
index 0000000..bec9d4a
--- /dev/null
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/vo/FwjgCount.java
@@ -0,0 +1,11 @@
+package cn.cetc54.platform.zhyl.entity.vo;
+
+import lombok.Data;
+
+@Data
+public class FwjgCount {
+ private Integer fwjgCount;
+ private Integer fwPersonCount;
+ private Integer orderCount;
+ private String orderWatch;
+}
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/vo/FwnlAndOrderCount.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/vo/FwnlAndOrderCount.java
new file mode 100644
index 0000000..d6b59e5
--- /dev/null
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/vo/FwnlAndOrderCount.java
@@ -0,0 +1,12 @@
+package cn.cetc54.platform.zhyl.entity.vo;
+
+import cn.cetc54.platform.zhyl.entity.FuwuDetails;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FwnlAndOrderCount {
+ private FuwuDetails fuwuDetails;
+ private List<FuwuDetails> fuwuDetailsList;
+}
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/vo/OrderByExecute.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/vo/OrderByExecute.java
new file mode 100644
index 0000000..55cdd9e
--- /dev/null
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/vo/OrderByExecute.java
@@ -0,0 +1,13 @@
+package cn.cetc54.platform.zhyl.entity.vo;
+
+import cn.cetc54.platform.zhyl.entity.FuwuDetails;
+import cn.cetc54.platform.zhyl.entity.FuwuPerson;
+import cn.cetc54.platform.zhyl.entity.Order;
+import lombok.Data;
+
+@Data
+public class OrderByExecute {
+ private Order order;
+ private FuwuPerson fuwuPerson;
+ private FuwuDetails fuwuDetails;
+}
--
Gitblit v1.9.1