From e36d6d9718f6e0bd6c262ffbec46938674f33008 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 03 十二月 2024 16:07:10 +0800
Subject: [PATCH] 重构获取巡检员问题上报接口，重构获取农户问题上报接口
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java
index 446935e..2fdd3c8 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrApp.issue;
+import com.alibaba.fastjson2.JSONObject;
import com.dy.common.aop.SsoAop;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
@@ -7,7 +8,9 @@
import com.dy.pipIrrApp.issue.dto.DtoDeleteParam;
import com.dy.pipIrrApp.issue.qo.QoIssueReport;
import com.dy.pipIrrGlobal.pojoOp.OpeIssueReport;
+import com.dy.pipIrrGlobal.pojoOp.OpeReportReply;
import com.dy.pipIrrGlobal.voOp.VoIssueReport;
+import com.dy.pipIrrGlobal.voOp.VoIssueReportReply;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -63,8 +66,8 @@
@SsoAop()
public BaseResponse<QueryResultVo<List<VoIssueReport>>> getIssueReports(QoIssueReport vo) {
try {
- QueryResultVo<List<VoIssueReport>> res = issueSv.getIssueReports(vo);
- return BaseResponseUtils.buildSuccess(res);
+ //QueryResultVo<List<VoIssueReport_temp>> res = issueSv.getIssueReports(vo);
+ return BaseResponseUtils.buildSuccess(issueSv.getIssueReports(vo));
} catch (Exception e) {
log.error("鑾峰彇宸℃鍛橀棶棰樹笂鎶ヨ褰曞紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
@@ -92,4 +95,42 @@
}
+ /**
+ * 鍥炲宸℃鍛橀棶棰樹笂鎶�
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "replyReport")
+ @Transactional(rollbackFor = Exception.class)
+ public BaseResponse<Boolean> replyReport(@RequestBody @Valid OpeReportReply po, BindingResult bindingResult) {
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ String result = issueSv.replyReport(po);
+ if(!result.equals("sucess")) {
+ return BaseResponseUtils.buildErrorMsg(result);
+ }
+
+ return BaseResponseUtils.buildSuccess() ;
+ }
+
+ /**
+ * 鏍规嵁闂涓婃姤ID鑾峰彇涓婃姤鍥炲淇℃伅
+ * @param reportId
+ * @return
+ */
+ @GetMapping(path = "/getReportReply")
+ public BaseResponse<VoIssueReportReply> getReportReply(@RequestParam("reportId") Long reportId) {
+
+ JSONObject result = issueSv.getReportReply(reportId);
+ if(!result.get("code").equals("0001")) {
+ return BaseResponseUtils.buildErrorMsg(result.get("msg").toString());
+ }
+
+ return BaseResponseUtils.buildSuccess(result.get("data"));
+
+ }
+
}
--
Gitblit v1.8.0