From 867d1b68fcdf6c9a072d3a516368333ad59f2e00 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 18 十二月 2024 08:46:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes
---
applet/src/main/resources/mapping/TOptometryMapper.xml | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/applet/src/main/resources/mapping/TOptometryMapper.xml b/applet/src/main/resources/mapping/TOptometryMapper.xml
index 26fc32f..ddf5d08 100644
--- a/applet/src/main/resources/mapping/TOptometryMapper.xml
+++ b/applet/src/main/resources/mapping/TOptometryMapper.xml
@@ -24,7 +24,22 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, code, userId, age, gender, name, phone, optometristId, storeId, status, registerTime, createTime, updateTime, createBy, updateBy, isDelete
+ id, code, userId, age, gender, `name`, phone, optometristId, storeId, status, registerTime, createTime, updateTime, createBy, updateBy, isDelete
</sql>
+ <select id="pageList" resultType="com.jilongda.applet.vo.TOptometryVO">
+ select o.id, o.code, o.userId, o.age, o.gender, o.`name`, o.phone, o.optometristId, o.storeId, o.status, o.registerTime,
+ o.createTime, o.updateTime, o.createBy, o.updateBy, o.isDelete,
+ t.name as optometristName, s.name as storeName
+ from t_optometry o
+ left join t_optometrist t on o.optometristId = t.id
+ left join t_store s on o.storeId = s.id
+ <where>
+ <if test="query.userId != null">
+ and o.userId = #{query.userId}
+ </if>
+ AND o.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY o.createTime DESC
+ </select>
</mapper>
--
Gitblit v1.7.1