From 9b5169ef7fc32b8357222a8990b393e442f77095 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期日, 23 二月 2025 22:57:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/ComplaintController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 10 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 94b5706..f1f6e4c 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
@@ -1,25 +1,30 @@
package com.panzhihua.sangeshenbian.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.controller.BaseController;
-import com.panzhihua.common.utlis.DateUtils;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
import com.panzhihua.sangeshenbian.annotation.DistributedLock;
-import com.panzhihua.sangeshenbian.entity.Complaint;
-import com.panzhihua.sangeshenbian.enums.ProcessStatusEnum;
+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.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 lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-
import org.springframework.web.bind.annotation.RestController;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import static cn.hutool.core.util.ObjectUtil.isNull;
+import javax.validation.Valid;
/**
* <p>
@@ -29,8 +34,9 @@
* @author
* @since 2025-02-22
*/
+@Validated
@RestController
-@RequestMapping("/complaint")
+@RequestMapping("/applet/complaint")
@RequiredArgsConstructor
@Api(tags = "诉求管理")
public class ComplaintController extends BaseController {
@@ -48,6 +54,37 @@
complaintService.saveComplaint(complaint,getUserId());
}
+ @PostMapping("/list")
+ @ApiOperation("工单列表")
+ public R<Page<ComplaintVO>> complaintList(@RequestBody ComplaintQuery query) {
+ return R.ok(complaintService.complaintList(query,getLoginUserInfo()));
+ }
+ @GetMapping("/detail")
+ @ApiOperation("工单详情")
+ public R<ComplaintVO> detail(@ApiParam(name = "id", value = "工单id", required = true) Long id) {
+ return R.ok(complaintService.detail(id));
+ }
+ @PostMapping("/saveProcess")
+ @ApiOperation("办理进度录入")
+ public R<?> saveProcess(@Valid @RequestBody ComplaintProcessDTO dto){
+ complaintService.saveProcess(dto,getUserId());
+ return R.ok();
+ }
+ @PostMapping("/saveResult")
+ @ApiOperation("办理结果录入")
+ public R<?> saveResult(@RequestBody ComplaintCompletionDTO dto){
+ complaintService.saveResult(dto,getLoginUserInfo());
+ return R.ok();
+ }
+ /**
+ * 问题上报
+ */
+ @PostMapping("/report")
+ @ApiOperation(value = "问题上报")
+ public void report(@RequestBody ComplaintReport complaintReport) {
+ // TODO
+ }
+
}
--
Gitblit v1.7.1