From 74a3e4680487ad5184bea49d729356053d7fee35 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 13 十二月 2024 16:54:00 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java |   90 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 88 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 ba118b6..46b6682 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,12 +1,16 @@
 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;
 import com.dy.common.webUtil.QueryResultVo;
+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;
@@ -59,14 +63,96 @@
      * @return
      */
     @GetMapping(path = "/getIssueReports")
+    @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());
         }
     }
 
+    /**
+     * 鑾峰彇涓�涓贰妫�鍛橀棶棰樹笂鎶ヨ褰曡鎯�
+     * @param issueReportId
+     * @return
+     */
+    @GetMapping(path = "/getOneIssueReport")
+    @SsoAop()
+    public BaseResponse<VoIssueReport> getOneIssueReport(@RequestParam("issueReportId") Long issueReportId) {
+        try {
+            VoIssueReport issueReport = issueSv.getIssueReportById(issueReportId);
+            if(issueReport == null) {
+                return BaseResponseUtils.buildNonExist();
+            }
+            return BaseResponseUtils.buildSuccess(issueReport);
+        } catch (Exception e) {
+            log.error("鑾峰彇闂涓婃姤璁板綍璇︽儏寮傚父", e);
+            return BaseResponseUtils.buildException(e.getMessage());
+        }
+    }
+
+    /**
+     * 閫昏緫鍒犻櫎宸℃鍛橀棶棰樹笂鎶ワ紝鍒犻櫎鍓嶅厛鍒ゆ柇瑕佸垹闄ょ殑涓婃姤鏄惁瀛樺湪
+     * @param po
+     * @param bindingResult
+     * @return
+     */
+    @PostMapping(path = "deleteIssueReport")
+    public BaseResponse<Boolean> deleteIssueReport(@RequestBody @Valid DtoDeleteParam po, BindingResult bindingResult) {
+        if(bindingResult != null && bindingResult.hasErrors()){
+            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+        }
+
+        String result = issueSv.deleteIssueReport(po);
+        if(!result.equals("success")) {
+            return BaseResponseUtils.buildErrorMsg(result);
+        }
+
+        return BaseResponseUtils.buildSuccess();
+
+    }
+
+    /**
+     * 鍥炲宸℃鍛橀棶棰樹笂鎶�
+     * @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());
+        }
+        if (issueSv.getReportReply(po.getReportId()).get("code").equals("0001")){
+            return BaseResponseUtils.buildFail("璇ラ棶棰樹笂鎶ュ凡鍥炲锛岃鍕块噸澶嶅洖澶�");
+        }
+        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