From a56551a91812ec1f620d49c7e6e06f9f15eabdbb Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Tue, 12 Jan 2021 17:39:29 +0800 Subject: [PATCH] 1、修改服务单看板时间查询了未确认的和已取消的bug 2、跟进记录根据时间倒序排序 --- zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) 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..736e68d 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml @@ -464,9 +464,10 @@ <result property="time" column="time"/> <result property="bed" column="bed" /> <result property="vipName" column="vipName" /> + <result property="vipId" column="vipId" /> <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 +483,11 @@ 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, + e.id vipId, + b.staff_id staffId, f.su_name beautyName, g.proj_name projName from sys_proj_services a -- Gitblit v1.9.1