From 6a571d05a20840fcb9faf0026ea7abd81700fee3 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 14 八月 2023 18:05:57 +0800
Subject: [PATCH] # 工资表配置表 联调修改
---
server/src/main/resources/mappers/SalaryParamMapper.xml | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/server/src/main/resources/mappers/SalaryParamMapper.xml b/server/src/main/resources/mappers/SalaryParamMapper.xml
index a91bf95..45c8024 100644
--- a/server/src/main/resources/mappers/SalaryParamMapper.xml
+++ b/server/src/main/resources/mappers/SalaryParamMapper.xml
@@ -3,21 +3,24 @@
<mapper namespace="doumeemes.dao.business.SalaryParamMapper">
- <select id="selectPage" resultType="doumeemes.dao.business.model.SalaryParam">
+ <select id="selectPage" resultType="doumeemes.dao.business.vo.SalaryParamVO">
SELECT
sp.*,
m.`NAME` as materialName,
- p.`NAME` as proceduresName
+ m.`CODE` as materialCode,
+ p.`NAME` as procedureName,
+ su.REALNAME as createUserName
from
salary_param sp
- LEFT JOIN procedures p on p.ID = sp.PROCEDURE_ID
- LEFT JOIN material m on m.ID = bom.MATERIAL_ID
- <where>
- <if test="keyWord != null and keyWord != ''">
- p`NAME` like concat('%',#{keyWord},'%')
- or p.`CODE` = #{keyWord}</if>
- <if test="procedureName != null and procedureName = ''"> and p.`NAME` like concat('%',#{procedureName},'%')</if>
- <if test="type != null"> and sp.`TYPE` = #{type}</if>
- </where>
+ LEFT JOIN procedures p on p.ID = sp.PROCEDURE_ID
+ LEFT JOIN material m on m.ID = sp.MATERIAL_ID
+ LEFT JOIN `system_user` su on su.ID = sp.CREATE_USER
+ where
+ sp.DELETED = 0
+ <if test="model.keyWord != null and model.keyWord != ''">
+ ( and p`NAME` like concat('%',#{model.keyWord},'%')
+ or p.`CODE` = #{model.keyWord})</if>
+ <if test="model.procedureName != null and model.procedureName != ''"> and p.`NAME` like concat('%',#{model.procedureName},'%')</if>
+ <if test="model.type != null"> and sp.`TYPE` = #{model.type}</if>
</select>
</mapper>
--
Gitblit v1.9.3