From b76c09d2c5f16de0e3777350b8d7ab48ea55aaa8 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期二, 24 五月 2022 10:37:56 +0800
Subject: [PATCH] Merge branch 'jkasrs' of http://47.97.1.152:5880/r/zy-asrs into jkasrs

---
 src/main/resources/mapper/ViewWorkInMapper.xml |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/ViewWorkInMapper.xml b/src/main/resources/mapper/ViewWorkInMapper.xml
index 703625f..e63997b 100644
--- a/src/main/resources/mapper/ViewWorkInMapper.xml
+++ b/src/main/resources/mapper/ViewWorkInMapper.xml
@@ -99,11 +99,13 @@
 
 <!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
 <select id="getViewWorkInAll" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
-	select count(1)
-	from asr_wrkin_view a
+<!--	select count(1)-->
+<!--	from asr_wrkin_view a-->
+<!--	where 1=1-->
+<!--	<include refid="viewWorkInConditionSql"></include>-->
+	select * from asr_wrkin_view
 	where 1=1
 	<include refid="viewWorkInConditionSql"></include>
-	order by io_time desc
 </select>
 
 <!-- 鍑哄簱缁熻 -->

--
Gitblit v1.9.1