From 879ce4e66b36daf44f79b17eb02d3578148e4545 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 24 二月 2025 18:56:20 +0800
Subject: [PATCH] 解决冲突
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/ComplaintController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 3b17c6b..3257044 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
@@ -10,14 +10,19 @@
import com.panzhihua.sangeshenbian.model.entity.Complaint;
import com.panzhihua.sangeshenbian.model.entity.ComplaintAuditRecord;
import com.panzhihua.sangeshenbian.model.entity.ComplaintProgress;
+import com.panzhihua.sangeshenbian.model.entity.ProblemType;
import com.panzhihua.sangeshenbian.model.query.ComplaintQuery;
import com.panzhihua.sangeshenbian.model.vo.ComplaintVO;
+import com.panzhihua.sangeshenbian.model.vo.DispatchVO;
import com.panzhihua.sangeshenbian.service.IComplaintService;
+import com.panzhihua.sangeshenbian.service.IProblemTypeService;
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.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -40,13 +45,17 @@
@Validated
@RestController
@RequestMapping("/applet/complaint")
-@RequiredArgsConstructor
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
@Api(tags = "诉求管理")
public class ComplaintController extends BaseController {
private final IComplaintService complaintService;
-
-
+ private final IProblemTypeService problemTypeService;
+ @GetMapping("/problem-type/list")
+ @ApiOperation("获取诉求问题类型列表")
+ public R<List<ProblemType>> problemTypeList() {
+ return R.ok(problemTypeService.list());
+ }
/**
* 录入诉求
*/
@@ -70,6 +79,7 @@
}
@GetMapping("/progress/{complaintId}")
+ @ApiOperation("办理进度")
public R<List<ComplaintProgress>> progress(@ApiParam(name = "complaintId", value = "诉求id", required = true) @PathVariable("complaintId") Long complaintId) {
return R.ok(complaintService.progress(complaintId));
}
@@ -149,7 +159,7 @@
*/
@GetMapping("/getDispatchList")
@ApiOperation(value = "获取下派单位列表")
- public R<?> getDispatchList() {
+ public R<List<DispatchVO>> getDispatchList() {
return R.ok(complaintService.getDispatchList(getLoginUserInfo()));
}
--
Gitblit v1.7.1