From 3a5fd299fecb0b763d9c2b10ccbb9bd31373814f Mon Sep 17 00:00:00 2001 From: donqi Date: Thu, 30 Jun 2022 17:48:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E5=A2=9E=E5=8A=A0=E5=A4=87?= =?UTF-8?q?=E6=B3=A8=E5=AD=97=E6=AE=B5=E6=8C=81=E4=B9=85=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95=E5=A2=9E=E5=8A=A0=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5=E7=9A=84=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=EF=BC=8C=E4=B8=8E=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=8C=BA=E5=88=86=E5=BC=80=E5=AD=97=E6=AE=B5=E5=90=8D=EF=BC=9B?= =?UTF-8?q?getWorkerInfo=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96=E5=88=86?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=A4=B4=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ghy/web/controller/order/OrderController.java | 2 ++ .../com/ghy/web/controller/order/OrderDetailController.java | 4 ++++ .../com/ghy/web/controller/order/OrderMasterController.java | 5 ++++- .../src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java | 4 ++-- .../src/main/resources/mapper/order/OrderDetailMapper.xml | 2 ++ .../src/main/resources/mapper/order/OrderMasterMapper.xml | 2 ++ ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java | 2 ++ ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml | 4 +++- 8 files changed, 21 insertions(+), 4 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index c2d99f1d..7cef038e 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -150,6 +150,7 @@ public class OrderController extends BaseController { od.setRevTime(om.getRevTime()); od.setExpectTimeStart(om.getExpectTimeStart()); od.setExpectTimeEnd(om.getExpectTimeEnd()); + od.setRemark(om.getRemark()); orderDetailService.insertOrderDetail(od); // 批量生成订单商品 @@ -246,6 +247,7 @@ public class OrderController extends BaseController { orderMaster.setCreateTime(new Date()); orderMaster.setWorkerId(goods.getWorkerId()); // orderMaster.setRevTime(DateUtils.parseDate(appOrderRequest.getServerTime(), com.ghy.common.utils.DateUtils.YYYY_MM_DD_HH_MM_SS)); + orderMaster.setRemark(appOrderRequest.getRemark()); orderMaster.setExpectTimeStart(DateUtils.parseDate(appOrderRequest.getExpectTimeStart(), com.ghy.common.utils.DateUtils.YYYY_MM_DD_HH_MM_SS)); orderMaster.setExpectTimeEnd(DateUtils.parseDate(appOrderRequest.getExpectTimeEnd(), com.ghy.common.utils.DateUtils.YYYY_MM_DD_HH_MM_SS)); orderMasterService.insertOrderMaster(orderMaster); diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index 9155dd30..5aa7d141 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -151,6 +151,8 @@ public class OrderDetailController extends BaseController { orderListResponse.setCreateTime(detail.getCreateTime()); orderListResponse.setWorkBeginTime(detail.getWorkBeginTime()); orderListResponse.setWorkFinishTime(detail.getWorkFinishTime()); + orderListResponse.setRemark(goods.getRemark()); + orderListResponse.setCustomerRemark(orderMaster.getRemark()); return AjaxResult.success(orderListResponse); }catch (Exception e){ @@ -229,6 +231,8 @@ public class OrderDetailController extends BaseController { orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd()); orderListResponse.setWorkBeginTime(detail.getWorkBeginTime()); orderListResponse.setWorkFinishTime(detail.getWorkFinishTime()); + orderListResponse.setRemark(goods.getRemark()); + orderListResponse.setCustomerRemark(orderMaster.getRemark()); orderListResponses.add(orderListResponse); }); return voDataTable(orderListResponses, list); diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index d1044f14..7f99115b 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -148,6 +148,8 @@ public class OrderMasterController extends BaseController { orderListResponse.setOrderMasterCode(master.getCode()); orderListResponse.setStandardList(standardList); orderListResponse.setAddress(customerAddress.getAddress()); + orderListResponse.setRemark(goods.getRemark()); + orderListResponse.setCustomerRemark(master.getRemark()); orderListResponses.add(orderListResponse); }); @@ -248,7 +250,8 @@ public class OrderMasterController extends BaseController { orderListResponse.setExpectTimeStart(orderMaster.getExpectTimeStart()); orderListResponse.setExpectTimeEnd(orderMaster.getExpectTimeEnd()); orderListResponse.setCreateTime(orderMaster.getCreateTime()); - orderListResponse.setRemark(orderMaster.getRemark()); + orderListResponse.setRemark(goods.getRemark()); + orderListResponse.setCustomerRemark(orderMaster.getRemark()); orderListResponse.setOrderStandardDetailList(orderStandardDetails); return AjaxResult.success(orderListResponse); diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java index 880b8e83..04a4e74b 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java @@ -1,12 +1,10 @@ package com.ghy.web.pojo.vo; -import com.ghy.order.domain.OrderDetail; import lombok.Data; import java.math.BigDecimal; import java.util.Date; import java.util.List; -import java.util.Map; @Data public class OrderListResponse { @@ -27,6 +25,8 @@ public class OrderListResponse { private String customerPhone; + private String customerRemark; + private Date serverTime; private Date expectTimeStart; diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml index 056b83c6..f7d75f7d 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml @@ -117,6 +117,7 @@ order_status, worker_id, rev_time, + remark, expect_time_start, expect_time_end, work_begin_time, @@ -132,6 +133,7 @@ #{orderStatus}, #{workerId}, #{revTime}, + #{remark}, #{expectTimeStart}, #{expectTimeEnd}, #{workBeginTime}, diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 6f0cd6fe..70dfa0fd 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -130,6 +130,7 @@ worker_id, pay_time, rev_time, + remark, expect_time_start, expect_time_end, create_by, @@ -146,6 +147,7 @@ #{workerId}, #{payTime}, #{revTime}, + #{remark}, #{expectTimeStart}, #{expectTimeEnd}, #{createBy}, diff --git a/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java b/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java index d2ebb195..c73050ff 100644 --- a/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java +++ b/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java @@ -54,5 +54,7 @@ public class Worker extends BaseEntity { @Excel(name = "领导团队扣费金额", cellType = Excel.ColumnType.STRING) private String leaderTeamMoney; + private String bannerUrl; + private List workerIds; } diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml index aea0247a..878cacec 100644 --- a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml +++ b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml @@ -21,14 +21,16 @@ + SELECT - w.worker_id, w.name, w.account, w.phone, w.password, w.open_id, w.dept_id, sd.dept_name, w.status, w.worker_logo_url, + w.worker_id, w.name, w.account, w.phone, w.password, w.open_id, w.dept_id, sd.dept_name, sdc.banner_url, w.status, w.worker_logo_url, w.leader_team_rate, w.leader_team_money, w.create_by, w.create_time, w.update_by, w.update_time, w.remark, w.type FROM worker w LEFT JOIN sys_dept sd ON w.dept_id = sd.dept_id + LEFT JOIN sys_dept_config sdc ON w.dept_id = sdc.dept_id