From 020911ea0df033a9c5b921d1c4938b37d9cd6fe4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 27 Dec 2020 13:23:01 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml | 2 ++
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListProjVo.java | 11 +++++++++++
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListProjVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListProjVo.java
index d20e4a2..b1102ef 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListProjVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListProjVo.java
@@ -10,12 +10,23 @@
@ApiModel(value = "ServiceOrderListProjVo", description = "服务单列表项目返回参数类")
public class ServiceOrderListProjVo {
+ @ApiModelProperty(value = "美疗师ID")
+ private Long id;
+
@ApiModelProperty(value = "项目名称")
private String projName;
@ApiModelProperty(value = "美疗师")
private String beautyName;
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
public String getProjName() {
return projName;
}
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 57fe46a..1df9bcf 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
@@ -469,6 +469,7 @@
<collection property="projs" ofType="com.matrix.system.app.vo.ServiceOrderListProjVo">
<result property="projName" column="projName" />
<result property="beautyName" column="beautyName" />
+ <result property="id" column="staffId" />
</collection>
</resultMap>
@@ -482,6 +483,7 @@
a.state status,
d.BED_NAME bed,
e.VIP_NAME vipName,
+ b.staff_id staffId,
f.su_name beautyName,
g.proj_name projName
from sys_proj_services a
--
Gitblit v1.9.1