From a714bc197c7dbcda3308e6d12a526739032166e0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 27 Dec 2020 14:40:05 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml | 5 +++--
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java | 10 +++++-----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java
index 2104261..d0786df 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java
@@ -19,7 +19,7 @@
private Long id;
@ApiModelProperty(value = "下单顾问ID")
- private Long staffId;
+ private Long createStaffId;
@ApiModelProperty(value = "服务单编号")
private String serviceNo;
@@ -43,12 +43,12 @@
@ApiModelProperty(value = "服务项目信息")
private List<ServiceOrderListProjVo> projs;
- public Long getStaffId() {
- return staffId;
+ public Long getCreateStaffId() {
+ return createStaffId;
}
- public void setStaffId(Long staffId) {
- this.staffId = staffId;
+ public void setCreateStaffId(Long createStaffId) {
+ this.createStaffId = createStaffId;
}
public List<ServiceOrderListProjVo> getProjs() {
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
index bb56269..d2b2a8b 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
@@ -466,7 +466,7 @@
<result property="vipName" column="vipName" />
<result property="timeLength" column="timeLength" />
<result property="status" column="status" />
- <result property="staffId" column="staffId" />
+ <result property="createStaffId" column="createStaffId" />
<collection property="projs" ofType="com.matrix.system.app.vo.ServiceOrderListProjVo">
<result property="projName" column="projName" />
<result property="beautyName" column="beautyName" />
@@ -482,9 +482,10 @@
a.YY_TIME time,
a.TOTAL_TIME timeLength,
a.state status,
+ a.create_staff_id createStaffId,
d.BED_NAME bed,
e.VIP_NAME vipName,
- a.create_staff_id staffId,
+ b.staff_id staffId,
f.su_name beautyName,
g.proj_name projName
from sys_proj_services a
--
Gitblit v1.9.1