From 562984eb58d5b546203771ba956711fbccc5e773 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期六, 21 五月 2022 15:05:42 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/ViewWorkInMapper.xml |    8 +++++---
 src/main/resources/application.yml             |    4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 28be799..731ac19 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,8 +10,8 @@
     enabled: false
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#    url: jdbc:sqlserver://localhost:1433;databasename=jkasrs
-    url: jdbc:sqlserver://10.20.192.200:1433;databasename=jkasrs
+    url: jdbc:sqlserver://localhost:1433;databasename=jkasrs
+#    url: jdbc:sqlserver://10.20.192.200:1433;databasename=jkasrs
     username: sa
     password: sa@123
   mvc:
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