From 86683aaea7bbe731cc67a077a14c1662882f9389 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期日, 05 三月 2023 16:10:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java | 2 ++
src/main/java/com/zy/asrs/controller/OpenController.java | 2 +-
src/main/resources/mapper/ViewWorkInMapper.xml | 7 +++++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 10 ++++++++--
src/main/java/com/zy/asrs/service/OpenService.java | 2 +-
5 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index a7aa55e..f689107 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -215,7 +215,7 @@
if (Cools.isEmpty()) {
return R.parse(BaseRes.PARAM);
}
- return R.ok("缁勬墭鎴愬姛");
+ return R.ok().add(openService.outlogERP());
}
diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index 8ac825d..99f034f 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -60,6 +60,8 @@
public int getViewWorkOutCount(ViewWorkInBean viewWorkOut);
//涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
public List<ViewWorkInBean> getViewWorkOutAll(ViewWorkInBean viewWorkOut);
+ //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝ERP璋冪敤
+ public List<ViewWorkInBean> getViewWorkOutERP();
// ------鍥捐〃
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 2108b95..4a05c3f 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -58,6 +58,6 @@
/**
* 鍑哄簱璁板綍鑾峰彇
*/
- void outlogERP();
+ List<ViewWorkInBean> outlogERP();
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index f84e478..6a7aeae 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -603,8 +603,14 @@
*/
@Override
@Transactional
- public void outlogERP() {
-
+ public List<ViewWorkInBean> outlogERP() {
+ List<ViewWorkInBean> viewWorkInERP = reportQueryMapper.getViewWorkOutERP();
+ ArrayList<ViewWorkInBean> viewWorkInBeans = new ArrayList<>();
+ for (ViewWorkInBean viewWorkInBean:viewWorkInERP){
+ viewWorkInBean.sype();
+ viewWorkInBeans.add(viewWorkInBean);
+ }
+ return viewWorkInBeans;
}
}
diff --git a/src/main/resources/mapper/ViewWorkInMapper.xml b/src/main/resources/mapper/ViewWorkInMapper.xml
index cde2279..6b3d6d5 100644
--- a/src/main/resources/mapper/ViewWorkInMapper.xml
+++ b/src/main/resources/mapper/ViewWorkInMapper.xml
@@ -152,4 +152,11 @@
Order by a.io_time desc
</select>
+<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝ERP璋冪敤 -->
+<select id="getViewWorkOutERP" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
+ select top 100 * from asr_wrkout_view
+ where 1=1
+ Order by io_time desc
+</select>
+
</mapper>
--
Gitblit v1.9.1