From a26151eff700b514ca92b0ac9207200b866071fc Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 30 五月 2024 15:24:48 +0800
Subject: [PATCH] 工时统计+权限+异步处理method+检验样品结果判断
---
performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml
index 0fedc4f..cbcc3a6 100644
--- a/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml
+++ b/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml
@@ -4,7 +4,7 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.AuxiliaryWorkingHoursDay">
<id column="id" property="id"/>
- <result column="name" property="name"/>
+ <result column="nameUser" property="nameUser"/>
<result column="number" property="number"/>
<result column="auxiliary_project" property="auxiliaryProject"/>
<result column="approved_working_hour" property="approvedWorkingHour"/>
@@ -25,14 +25,42 @@
<result column="update_user" property="updateUser"/>
<result column="state" property="state"/>
</resultMap>
- <select id="selectAuxiliaryWorkingHoursDay" resultType="com.yuanchu.mom.pojo.AuxiliaryWorkingHoursDay">
+ <select id="selectAuxiliaryWorkingHoursDay" resultType="com.yuanchu.mom.dto.AuxiliaryWorkingHoursDayDto">
select data.*
from (
- select *
- FROM auxiliary_working_hours_day
+ select awhd.*,name
+ FROM auxiliary_working_hours_day awhd
+ left join user on name_user=user.id
+ <if test="ids !=null and ids != ''">
+ WHERE name_user in
+ <foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
+ #{val}
+ </foreach>
+ </if>
) data
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
</select>
+ <select id="selectDataByUser" resultType="com.yuanchu.mom.dto.AuxiliaryWorkingHoursDayDto">
+ select awhd.*,name
+ FROM auxiliary_working_hours_day awhd
+ left join user on name_user=user.id
+ <if test="ids !=null and ids != ''">
+ WHERE name_user in
+ <foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
+ #{val}
+ </foreach>
+ </if>
+ </select>
+ <select id="selectListByIds" resultType="com.yuanchu.mom.pojo.AuxiliaryWorkingHoursDay">
+ select * from auxiliary_working_hours_day
+ where 1=1
+ <if test="ids !=null and ids != ''">
+ and name_user in
+ <foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
+ #{val}
+ </foreach>
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3