From 927beadbb05d22759efc4d60c931f906bffa511d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 28 十月 2024 20:49:55 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeCtrl.java | 51 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 45 insertions(+), 6 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 e2ee1ef..b8a722e 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
@@ -4,7 +4,9 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
+import com.dy.pipIrrGlobal.voRm.VoOpenClostWechat;
import com.dy.pipIrrWechat.intake.qo.OnLineIntakesQO;
+import com.dy.pipIrrWechat.intake.qo.QoOpenClose;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -34,7 +36,8 @@
* @param qo
* @return
*/
- @GetMapping(path = "one_intake")
+ //@GetMapping(path = "one_intake")
+ @GetMapping(path = "all_intakes")
public BaseResponse<QueryResultVo<VoOnLineIntake>> getOneIntake(OnLineIntakesQO qo) {
try {
return BaseResponseUtils.buildSuccess(intakeSv.selectOneIntake(qo));
@@ -49,8 +52,8 @@
* @param qo
* @return
*/
- @GetMapping(path = "all_intakes")
- public BaseResponse<QueryResultVo<VoOnLineIntake>> getAllIntakes(OnLineIntakesQO qo) {
+ @GetMapping(path = "all_intakes2")
+ public BaseResponse<QueryResultVo<List<VoOnLineIntake>>> getAllIntakes(OnLineIntakesQO qo) {
try {
return BaseResponseUtils.buildSuccess(intakeSv.selectAllIntakes(qo));
} catch (Exception e) {
@@ -61,17 +64,53 @@
/**
* 鏍规嵁鎿嶄綔鍛樿幏鍙栧父鐢ㄥ彇姘村彛锛堝湪绾垮拰涓嶅湪绾匡級
- * @param operator
+ * @param operatorId
* @return
*/
@GetMapping(path = "used_intakes")
- public BaseResponse<List<VoOnLineIntake>> getUsedIntakes(Long operator) {
+ public BaseResponse<List<VoOnLineIntake>> getUsedIntakes(Long operatorId) {
+ if(operatorId == null || operatorId <= 0) {
+ return BaseResponseUtils.buildErrorMsg("鎿嶄綔鍛樹笉鑳戒负绌�");
+ }
+
try {
- List<VoOnLineIntake> res = intakeSv.getUsedIntakes(operator);
+ List<VoOnLineIntake> res = intakeSv.getUsedIntakes(operatorId);
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
log.error("鏌ヨ鍙栨按鍙ｅ紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
}
}
+
+ /**
+ * 鑾峰彇鐗╃悊鍗″紑鍏抽榾璁板綍锛屽井淇″皬绋嬪簭浣跨敤
+ * @param qo
+ * @return
+ */
+ @GetMapping(path = "/getCardOpenClose")
+ public BaseResponse<QueryResultVo<List<VoOpenClostWechat>>> getCardOpenClose(QoOpenClose qo) {
+ try {
+ QueryResultVo<List<VoOpenClostWechat>> res = intakeSv.getCardOpenClose(qo);
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鑾峰彇姘村崱寮�鍏抽榾璁板綍寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
+
+ /**
+ * 鑾峰彇铏氭嫙鍗″紑鍏抽榾璁板綍锛屽井淇″皬绋嬪簭浣跨敤
+ * @param qo
+ * @return
+ */
+ @GetMapping(path = "/getVcCardOpenClose")
+ public BaseResponse<QueryResultVo<List<VoOpenClostWechat>>> getVcCardOpenClose(QoOpenClose qo) {
+ try {
+ QueryResultVo<List<VoOpenClostWechat>> res = intakeSv.getVcCardOpenClose(qo);
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鑾峰彇铏氭嫙鍗″紑鍏抽榾璁板綍寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
}
--
Gitblit v1.8.0