From 428eee9df5f8885ab71d7cd273f5889b8c81e1dc Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 31 十月 2024 16:49:30 +0800
Subject: [PATCH] 2024-10-31 优化代码
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeIssueReportMapper.xml | 3 +++
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java | 9 +++++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoIssueReport.java | 8 +++++++-
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueCtrl.java | 19 ++++++++++++++++---
4 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoIssueReport.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoIssueReport.java
index 2b343d8..4f5b493 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoIssueReport.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoIssueReport.java
@@ -17,7 +17,7 @@
*/
@Data
-@JsonPropertyOrder({"issueReportId", "clientName", "phone", "reportTime", "content", "images", "audios", "videos", "stateId", "state"})
+@JsonPropertyOrder({"issueReportId", "clientName", "phone", "reportTime", "content", "images", "audios", "videos", "replyTime", "stateId", "state"})
public class VoIssueReport implements BaseEntity {
private static final long serialVersionUID = 202410301354001L;
@@ -64,6 +64,12 @@
private String videos;
/**
+ * 涓婃姤鍥炲鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date replyTime;
+
+ /**
* 鐘舵�佸��
*/
private Integer stateId;
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeIssueReportMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeIssueReportMapper.xml
index 7c433e3..3183e50 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeIssueReportMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeIssueReportMapper.xml
@@ -175,6 +175,7 @@
SELECT COUNT(*) AS recordCount
FROM se_issue_report rpt
LEFT JOIN se_client cli ON cli.id = rpt.client_id
+ LEFT JOIN se_report_reply rpy ON rpy.report_id = rpt.id
<where>
AND rpt.state != 3
@@ -211,6 +212,7 @@
rpt.images,
rpt.audios,
rpt.videos,
+ rpy.reply_time AS replyTime,
rpt.state AS stateId,
CASE
WHEN rpt.state = 1 THEN '鏈彈鐞�'
@@ -218,6 +220,7 @@
END AS state
FROM se_issue_report rpt
LEFT JOIN se_client cli ON cli.id = rpt.client_id
+ LEFT JOIN se_report_reply rpy ON rpy.report_id = rpt.id
<where>
AND rpt.state != 3
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 305f725..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
@@ -107,12 +107,11 @@
}
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);
@@ -133,6 +132,7 @@
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
+ // 娣诲姞涓婃姤鍥炲璁板綍
SeReportReply seReportReply = new SeReportReply();
seReportReply.setReportId(po.getReportId());
seReportReply.setReplyContent(po.getReplyContent());
@@ -141,6 +141,15 @@
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) ;
@@ -153,6 +162,10 @@
*/
@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) {
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java
index 101be67..dce5580 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java
@@ -43,6 +43,15 @@
}
/**
+ * 淇敼鍐滄埛闂涓婃姤鐘舵�侊紝鍥炲鍙婂垹闄ゆ椂浣跨敤
+ * @param po
+ * @return
+ */
+ public Integer updateIssueReport(SeIssueReport po) {
+ return seIssueReportMapper.updateByPrimaryKeySelective(po);
+ }
+
+ /**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇鍐滄埛闂涓婃姤
* @param queryVo
* @return
--
Gitblit v1.8.0