From 2cb9b0101d76b774963e9bb40c2b45ee247332ea Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 02 一月 2024 23:30:28 +0800
Subject: [PATCH] 优化完成工作单功能
---
java110-db/src/main/resources/mapper/oa/WorkTaskV1ServiceDaoImplMapper.xml | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/oa/WorkTaskV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/oa/WorkTaskV1ServiceDaoImplMapper.xml
index 1a523eb..6d254b1 100644
--- a/java110-db/src/main/resources/mapper/oa/WorkTaskV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/oa/WorkTaskV1ServiceDaoImplMapper.xml
@@ -8,9 +8,9 @@
<!-- 淇濆瓨宸ヤ綔鍗曚换鍔′俊鎭� add by wuxw 2018-07-03 -->
<insert id="saveWorkTaskInfo" parameterType="Map">
insert into work_task(
- staff_name,start_time,state,end_time,community_id,store_id,task_id,work_id,staff_id
+ staff_name,start_time,state,end_time,community_id,store_id,task_id,work_id,staff_id,org_staff_id,org_staff_name
) values (
- #{staffName},#{startTime},#{state},#{endTime},#{communityId},#{storeId},#{taskId},#{workId},#{staffId}
+ #{staffName},#{startTime},#{state},#{endTime},#{communityId},#{storeId},#{taskId},#{workId},#{staffId},#{orgStaffId},#{orgStaffName}
)
</insert>
@@ -24,7 +24,7 @@
td.`name` stateName,
wp.work_cycle workCycle,wp.create_user_id
createUserId,wp.create_user_name createUserName,wp.work_name workName,wp.wt_id wtId,wp.create_user_tel createUserTel,
- wt.type_name typeName,t.finish_time finishTime,t.task_timeout taskTimeout
+ wt.type_name typeName,t.finish_time finishTime,t.task_timeout taskTimeout,t.org_staff_id orgStaffId,t.org_staff_name orgStaffName
from work_task t
left join t_dict td on t.state = td.status_cd and td.table_name = 'work_pool' and td.table_columns = 'state'
left join work_pool wp on t.work_id = wp.work_id and wp.status_cd = '0'
@@ -46,6 +46,10 @@
<if test="startTime !=null and startTime != ''">
and t.start_time= #{startTime}
</if>
+ <if test="taskInsTime !=null and taskInsTime != ''">
+ and DATE_FORMAT(t.start_time,'%Y-%m-%d')= #{taskInsTime}
+ </if>
+
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
</if>
@@ -76,6 +80,10 @@
<if test="staffId !=null and staffId != ''">
and t.staff_id= #{staffId}
</if>
+ <if test="orgStaffId !=null and orgStaffId != ''">
+ and t.org_staff_id= #{orgStaffId}
+ </if>
+
<if test="taskTimeout !=null and taskTimeout != ''">
and t.task_timeout= #{taskTimeout}
</if>
@@ -192,6 +200,9 @@
<if test="staffId !=null and staffId != ''">
and t.staff_id= #{staffId}
</if>
+ <if test="orgStaffId !=null and orgStaffId != ''">
+ and t.org_staff_id= #{orgStaffId}
+ </if>
<if test="taskTimeout !=null and taskTimeout != ''">
and t.task_timeout= #{taskTimeout}
</if>
--
Gitblit v1.8.0