From d8047152e563ba7816208a3fe9cf1ffdc9cddc83 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 21 六月 2023 23:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml b/igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml
index 0c98dde..67047c7 100644
--- a/igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml
+++ b/igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml
@@ -181,4 +181,32 @@
         WHERE COMPANY_ID_ = #{param.companyId}
           AND DEPT_ID_ = #{param.deptId}
     </select>
+    <select id="getOrderList" resultType="com.ld.igds.phone35.dto.DtoOrder">
+        SELECT
+        ID_ as id,
+        COMPANY_ID_ as companyId,
+        DEPT_ID_ as deptId,
+        TYPE_ as type,
+        DEPOT_ID_ as depotId,
+        APPLY_USER_ as applyUser,
+        APPLY_USER_NAME_ as applyUserName,
+        APPLY_TIME_ as applyTime,
+        AUDIT_USER_ as auditUser,
+        AUDIT_USER_NAME_ as auditUserName,
+        CONDUCT_USER_ as conductUser,
+        AUDIT_TIME_ as auditTime,
+        STATUS_ as status,
+        RECORD_ as record,
+        START_ as startTime,
+        END_ as endTime
+        FROM
+        D_APPLY_ORDER
+        <where>
+            <if test="param.companyId != null and param.companyId != ''">and COMPANY_ID_ = #{param.companyId}</if>
+            <if test="param.deptId != null and param.deptId != ''">and DEPT_ID_ = #{param.deptId}</if>
+            <if test="param.userName != null and param.userName != ''">and APPLY_USER_ = #{param.userName}</if>
+            <if test="param.status != null and param.status != ''">and STATUS_ = #{param.status}</if>
+        </where>
+        order by APPLY_TIME_ DESC
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3