From 1cf88d43994ec7ec403319032a9d118b39fe3571 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 25 四月 2025 14:35:35 +0800
Subject: [PATCH] 登录代码优化

---
 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeCtrl.java |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeCtrl.java
index 1f2da92..721917a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeCtrl.java
@@ -5,6 +5,7 @@
 import com.dy.common.webUtil.BaseResponseUtils;
 import com.dy.common.webUtil.QueryResultVo;
 import com.dy.pipIrrGlobal.pojoPr.PrIntake;
+import com.dy.pipIrrGlobal.voPr.VoAllIntake;
 import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
 import com.dy.pipIrrGlobal.voRm.VoOpenClostWechat;
 import com.dy.pipIrrWechat.intake.qo.OnLineIntakesQO;
@@ -39,6 +40,22 @@
      * @return
      */
     @GetMapping(path = "all_intakes")
+    public BaseResponse<QueryResultVo<List<VoOnLineIntake>>> getSomeIntakes(OnLineIntakesQO qo) {
+        try {
+            return BaseResponseUtils.buildSuccess(intakeSv.selectSomeIntakes(qo));
+        } catch (Exception e) {
+            log.error("鏌ヨ鍙栨按鍙e紓甯�", e);
+            return BaseResponseUtils.buildException(e.getMessage());
+        }
+    }
+
+
+    /**
+     * 鏍规嵁鍙栨按鍙g紪鍙疯幏鍙栧彇姘村彛瀵硅薄
+     * @param qo
+     * @return
+     */
+    @GetMapping(path = "all_intakes1")
     public BaseResponse<QueryResultVo<VoOnLineIntake>> getOneIntake(OnLineIntakesQO qo) {
         try {
             return BaseResponseUtils.buildSuccess(intakeSv.selectOneIntake(qo));
@@ -120,9 +137,9 @@
      * @return
      */
     @GetMapping(path = "all")
-    public BaseResponse<QueryResultVo<List<PrIntake>>> all() {
+    public BaseResponse<QueryResultVo<List<VoAllIntake>>> all() {
         try {
-            QueryResultVo<List<PrIntake>> res = this.intakeSv.selectAll();
+            QueryResultVo<List<VoAllIntake>> res = this.intakeSv.selectAll();
             if (res == null) {
                 return BaseResponseUtils.buildErrorMsg("娌℃湁绗﹀悎鏉′欢鐨勫彇姘村彛鏁版嵁");
             } else {

--
Gitblit v1.8.0