From 6416b165e4a3c8ecc2d547ceef0fb3962d3c7b56 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 12 一月 2026 14:58:45 +0800
Subject: [PATCH] 1.查询产品信息列表接口，销售台账查询其产品的状态 2.增添不合格现象字段，取消生产状态字段 3.修改发货审批接口,发货审批通过，生产该订单出库记录 4.存在质检记录并已提交的销售台账删除时做出限制 5.生产报工投入，产出2:1调整
---
src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml b/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml
index be3c392..d720d37 100644
--- a/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml
+++ b/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml
@@ -10,7 +10,13 @@
<if test="staffJoinLeaveRecord.staffName != null and staffJoinLeaveRecord.staffName != '' ">
AND staff_name LIKE CONCAT('%',#{staffJoinLeaveRecord.staffName},'%')
</if>
-
+ <if test="staffJoinLeaveRecord.entryDateStart != null and staffJoinLeaveRecord.entryDateStart != '' ">
+ and contract_start_time like concat('%',#{staffJoinLeaveRecord.entryDateStart},'%')
+ </if>
+ <if test="staffJoinLeaveRecord.entryDateEnd != null and staffJoinLeaveRecord.entryDateEnd != '' ">
+ and contract_end_time like concat('%',#{staffJoinLeaveRecord.entryDateEnd},'%')
+ </if>
+ order by create_time desc
</select>
<select id="staffJoinLeaveRecordList" resultType="com.ruoyi.staff.pojo.StaffJoinLeaveRecord">
SELECT
@@ -22,4 +28,13 @@
AND staff_name LIKE CONCAT('%',#{staffJoinLeaveRecord.staffName},'%')
</if>
</select>
+ <select id="staffOnJobList" resultType="com.ruoyi.staff.pojo.StaffJoinLeaveRecord">
+ select *
+ from (select *,
+ ROW_NUMBER() over (PARTITION BY staff_no ORDER BY create_time DESC ) as rn
+ from staff_join_leave_record
+ where staff_state = 1) t
+ where rn = 1
+
+ </select>
</mapper>
--
Gitblit v1.9.3