From 17bd0962b7caba32f35d29a1082e7c998342e65d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 24 二月 2025 00:17:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/ComplaintController.java | 61 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/ComplaintController.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/ComplaintController.java
index f1f6e4c..7bed262 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/ComplaintController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/ComplaintController.java
@@ -6,15 +6,14 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.sangeshenbian.annotation.DistributedLock;
-import com.panzhihua.sangeshenbian.dto.ComplaintReport;
-import com.panzhihua.sangeshenbian.model.dto.ComplaintCompletionDTO;
-import com.panzhihua.sangeshenbian.model.dto.ComplaintProcessDTO;
+import com.panzhihua.sangeshenbian.model.dto.*;
import com.panzhihua.sangeshenbian.model.entity.Complaint;
import com.panzhihua.sangeshenbian.model.query.ComplaintQuery;
import com.panzhihua.sangeshenbian.model.vo.ComplaintVO;
import com.panzhihua.sangeshenbian.service.IComplaintService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -23,6 +22,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -51,7 +51,7 @@
@ApiOperation(value = "录入诉求")
@DistributedLock(lockName = "complaint_serial_number_lock")
public void save(Complaint complaint) {
- complaintService.saveComplaint(complaint,getUserId());
+ complaintService.saveComplaint(complaint, getUserId());
}
@PostMapping("/list")
@@ -76,13 +76,62 @@
complaintService.saveResult(dto,getLoginUserInfo());
return R.ok();
}
+
/**
* 问题上报
*/
@PostMapping("/report")
@ApiOperation(value = "问题上报")
- public void report(@RequestBody ComplaintReport complaintReport) {
- // TODO
+ public R<?> report(@RequestBody ComplaintReportDTO complaintReportDTO) {
+ complaintService.saveReport(complaintReportDTO, getLoginUserInfo());
+ return R.ok();
+ }
+
+ /**
+ * 诉求下派
+ */
+ @PostMapping("/saveDispatch")
+ public R<?> saveDispatch(@RequestBody ComplaintDispatch dto){
+ complaintService.saveDispatch(dto, getLoginUserInfo());
+ return R.ok();
+ }
+
+ /**
+ * 延期申请
+ */
+ @PostMapping("/saveDelay")
+ public R<?> saveDelay(@RequestBody ComplaintDelayDTO dto){
+ complaintService.saveDelay(dto, getLoginUserInfo());
+ return R.ok();
+ }
+
+ /**
+ * 延期审核
+ */
+ @PostMapping("/delayAudit")
+ @ApiOperation(value = "延期审核")
+ public R<?> delayAudit(@RequestBody ComplaintDelayAuditDTO dto) {
+ complaintService.delayAudit(dto, getLoginUserInfo());
+ return R.ok();
+ }
+
+ /**
+ * 上报审核
+ */
+ @PostMapping("/reportAudit")
+ @ApiOperation(value = "问题上报审核")
+ public R<?> reportAudit(@RequestBody ComplaintReporAuditDTO dto) {
+ complaintService.reportAudit(dto, getLoginUserInfo());
+ return R.ok();
+ }
+
+ /**
+ * 获取下派单位列表
+ */
+ @GetMapping("/getDispatchList")
+ @ApiOperation(value = "获取下派单位列表")
+ public R<?> getDispatchList() {
+ return R.ok(complaintService.getDispatchList(getLoginUserInfo()));
}
--
Gitblit v1.7.1