From c1ef2d1fc4c0dae2bc8452924dcd77a0ff3a1ef5 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期四, 19 六月 2025 15:02:52 +0800
Subject: [PATCH] #改造

---
 src/main/resources/mapper/TaskWrkLogMapper.xml |   72 +++++++++++++++++++++++++----------
 1 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/src/main/resources/mapper/TaskWrkLogMapper.xml b/src/main/resources/mapper/TaskWrkLogMapper.xml
index e07c447..cfe776a 100644
--- a/src/main/resources/mapper/TaskWrkLogMapper.xml
+++ b/src/main/resources/mapper/TaskWrkLogMapper.xml
@@ -4,28 +4,58 @@
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <resultMap id="BaseResultMap" type="com.zy.asrs.entity.TaskWrkLog">
-        <id column="id" property="id" />
-        <result column="task_no" property="taskNo" />
-        <result column="status" property="status" />
-        <result column="wrk_no" property="wrkNo" />
-        <result column="create_time" property="createTime" />
-        <result column="io_type" property="ioType" />
-        <result column="io_pri" property="ioPri" />
-        <result column="start_point" property="startPoint" />
-        <result column="target_point" property="targetPoint" />
-        <result column="modi_user" property="modiUser" />
-        <result column="modi_time" property="modiTime" />
-        <result column="memo" property="memo" />
-        <result column="barcode" property="barcode" />
-        <result column="assign_time" property="assignTime" />
-        <result column="execute_time" property="executeTime" />
-        <result column="complete_time" property="completeTime" />
-        <result column="cancel_time" property="cancelTime" />
-        <result column="wrk_sts" property="wrkSts" />
-        <result column="crn_no" property="crnNo" />
-        <result column="command_step" property="commandStep" />
-        <result column="transfer_mark" property="transferMark" />
+        <result column="TASK_NO" property="taskNo" />
+        <result column="STATUS" property="status" />
+        <result column="WRK_NO" property="wrkNo" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="IO_TYPE" property="ioType" />
+        <result column="IO_PRI" property="ioPri" />
+        <result column="START_POINT" property="startPoint" />
+        <result column="TARGET_POINT" property="targetPoint" />
+        <result column="MODI_USER" property="modiUser" />
+        <result column="MODI_TIME" property="modiTime" />
+        <result column="MEMO" property="memo" />
+        <result column="BARCODE" property="barcode" />
+        <result column="ASSIGN_TIME" property="assignTime" />
+        <result column="EXECUTE_TIME" property="executeTime" />
+        <result column="COMPLETE_TIME" property="completeTime" />
+        <result column="CANCEL_TIME" property="cancelTime" />
+        <result column="WRK_STS" property="wrkSts" />
+        <result column="CRN_NO" property="crnNo" />
+        <result column="TRANSFER_MARK" property="transferMark" />
 
     </resultMap>
 
+    <sql id="batchSeq">
+        <if test="wrkNo != null">
+            and WRK_NO = #{wrkNo}
+        </if>
+        <if test="taskNo != null">
+            and TASK_NO = #{taskNo}
+        </if>
+        <if test="status != null">
+            and STATUS = #{status}
+        </if>
+        <if test="modiTimeStart != null ">
+            <if test="modiTimeEnd != null ">
+                and MODI_TIME between #{modiTimeStart} and #{modiTimeEnd}
+            </if>
+        </if>
+    </sql>
+
+
+    <select id="selectTaskWrkLogList" resultMap="BaseResultMap">
+        SELECT * FROM "SOURCE"."wcs_task_wrk_log"
+        WHERE 1=1
+        <include refid="batchSeq"></include>
+        ORDER BY CREATE_TIME DESC
+        LIMIT #{pageSize} OFFSET ((#{pageNumber} - 1) * #{pageSize});
+    </select>
+
+    <select id="selectTaskWrkLogListTotal" resultType="Long">
+        SELECT count(1) FROM "SOURCE"."wcs_task_wrk_log"
+        WHERE 1=1
+        <include refid="batchSeq"></include>
+    </select>
+
 </mapper>

--
Gitblit v1.9.1