From 4d4805096b898a6e99f31794facb81794bd1fcf7 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 25 Jan 2021 09:39:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hive2.0' into hive2.0
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysSkinCheckRecordDao.xml | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysSkinCheckRecordDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysSkinCheckRecordDao.xml
index 45a2a01..cf75379 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysSkinCheckRecordDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysSkinCheckRecordDao.xml
@@ -18,11 +18,13 @@
<result property="shopName" column="shopName" />
<result property="telphone" column="telphone" />
<result property="checkUserName" column="checkUserName" />
+ <result property="userName" column="userName" />
<result property="ext1" column="ext1" />
<result property="ext2" column="ext2" />
<result property="ext3" column="ext3" />
<result property="ext4" column="ext4" />
- <result property="ext5" column="ext5" />
+ <result property="ext5" column="ext5" />
+ <result property="sex" column="sex" />
<collection property="skinDetails" ofType="com.matrix.system.hive.bean.SysSkinDetail" column="id">
<id property="id" column="detailId" />
<result property="checkId" column="check_id" />
@@ -294,6 +296,9 @@
<if test="(record.telphone!=null and record.telphone!='') or (record.telphone!='' and record.telphone==0) ">
and telphone = #{record.telphone}
</if>
+ <if test="record.beginTime != null and record.endTime!=null">
+ and (date(check_time) between #{record.beginTime} and #{record.endTime})
+ </if>
</if>
</where>
<if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
@@ -331,6 +336,9 @@
<if test="(record.telphone!=null and record.telphone!='') or (record.telphone!='' and record.telphone==0) ">
and telphone = #{record.telphone}
</if>
+ <if test="record.beginTime != null and record.endTime!=null">
+ and (date(check_time) between #{record.beginTime} and #{record.endTime})
+ </if>
</if>
</where>
</select>
@@ -350,10 +358,13 @@
t3.symptom analysisSymptom,
t3.percentage analysisPercentage,
t3.analysis analysisAnalysis,
- t3.img analysisImg
+ t3.img analysisImg,
+ t4.vip_name userName,
+ t4.sex sex
from sys_skin_check_record t1
left join sys_skin_detail t2 on t1.id=t2.check_id and t2.t1=1
left join sys_skin_detail t3 on t1.id=t3.check_id and t3.t1=2
+ left join sys_vip_info t4 on t1.user_id=t4.id
where t1.id=#{id}
</select>
--
Gitblit v1.9.1