From 05477e22f0ca3b17ca8a5a2996e539f3cd5cc1a9 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 01 十一月 2024 15:06:12 +0800
Subject: [PATCH] 2024-11-01 修复整点报历史记录总数量错误的bug
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueCtrl.java | 63 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueCtrl.java
index 8ea2eec..8091d44 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueCtrl.java
@@ -5,8 +5,11 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.pojoSe.SeIssueReport;
+import com.dy.pipIrrGlobal.pojoSe.SeReportReply;
import com.dy.pipIrrGlobal.voSe.VoIssueReport;
+import com.dy.pipIrrGlobal.voSe.VoIssueReportReply;
import com.dy.pipIrrWechat.issue.dto.DtoIssueReport;
+import com.dy.pipIrrWechat.issue.dto.DtoReportReply;
import com.dy.pipIrrWechat.issue.qo.QoIssueReport;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
@@ -104,16 +107,70 @@
}
try {
- //鍙栨按鍙D
Integer recordCount = Optional.ofNullable(issueSv.deleteIssueReport(issueReportId)).orElse(0);
if (recordCount == 0) {
return BaseResponseUtils.buildErrorMsg("鍐滄埛闂涓婃姤鍒犻櫎澶辫触");
- } else {
- return BaseResponseUtils.buildSuccess(true);
+ }else {
+ return BaseResponseUtils.buildSuccess();
}
} catch (Exception e) {
log.error("鍐滄埛闂涓婃姤鍒犻櫎澶辫触", e);
return BaseResponseUtils.buildException(e.getMessage());
}
}
+
+ /**
+ * 鍥炲鍐滄埛闂涓婃姤
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "replyReport")
+ @Transactional(rollbackFor = Exception.class)
+ public BaseResponse<Boolean> replyReport(@RequestBody @Valid DtoReportReply po, BindingResult bindingResult) {
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ // 娣诲姞涓婃姤鍥炲璁板綍
+ SeReportReply seReportReply = new SeReportReply();
+ seReportReply.setReportId(po.getReportId());
+ seReportReply.setReplyContent(po.getReplyContent());
+ seReportReply.setReplyTime(new Date());
+ seReportReply.setReplierId(po.getReplierId());
+ Long reportReplyId = issueSv.insertReportReply(seReportReply);
+ if(reportReplyId == null) {
+ return BaseResponseUtils.buildErrorMsg("鍥炲鍐滄埛闂涓婃姤澶辫触");
+ }
+
+ // 淇敼闂涓婃姤鐘舵�佷负宸插洖澶�
+ SeIssueReport seIssueReport = new SeIssueReport();
+ seIssueReport.setId(po.getReportId());
+ seIssueReport.setState((byte)2);
+ Integer issueReportId = issueSv.updateIssueReport(seIssueReport);
+ if(issueReportId == null) {
+ return BaseResponseUtils.buildErrorMsg("鍐滄埛闂涓婃姤淇敼澶辫触");
+ }
+
+ return BaseResponseUtils.buildSuccess(true) ;
+ }
+
+ /**
+ * 鏍规嵁闂涓婃姤ID鑾峰彇涓婃姤鍥炲淇℃伅
+ * @param reportId
+ * @return
+ */
+ @GetMapping(path = "/getReportReply")
+ public BaseResponse<VoIssueReportReply> getReportReply(@RequestParam("reportId") Long reportId) {
+ if(reportId == null) {
+ return BaseResponseUtils.buildErrorMsg("璇烽�夋嫨涓�涓棶棰樹笂鎶�");
+ }
+
+ try {
+ return BaseResponseUtils.buildSuccess(issueSv.getReportReplyByReportId(reportId));
+ } catch (Exception e) {
+ log.error("鑾峰彇涓婃姤鍥炲淇℃伅褰曞紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
}
--
Gitblit v1.8.0