From 9ff71e0d63c963f2c2c48facdf2336c558ba7100 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期日, 23 二月 2025 18:28:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/ComplaintController.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 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 17e4575..8a6df99 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,14 +1,20 @@
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.R;
import com.panzhihua.sangeshenbian.annotation.DistributedLock;
+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.entity.ComplaintProgress;
+import com.panzhihua.sangeshenbian.model.query.ComplaintQuery;
import com.panzhihua.sangeshenbian.dto.ComplaintReport;
import com.panzhihua.sangeshenbian.entity.Complaint;
import com.panzhihua.sangeshenbian.enums.ProcessStatusEnum;
import com.panzhihua.sangeshenbian.service.IComplaintService;
+import com.panzhihua.sangeshenbian.model.vo.ComplaintVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -17,11 +23,6 @@
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;
/**
* <p>
@@ -32,7 +33,7 @@
* @since 2025-02-22
*/
@RestController
-@RequestMapping("/complaint")
+@RequestMapping("/applet/complaint")
@RequiredArgsConstructor
@Api(tags = "诉求管理")
public class ComplaintController extends BaseController {
@@ -50,6 +51,23 @@
complaintService.saveComplaint(complaint,getUserId());
}
+ @PostMapping("/list")
+ @ApiOperation("工单列表")
+ public R<Page<ComplaintVO>> complaintList(@RequestBody ComplaintQuery query) {
+ return R.ok(complaintService.complaintList(query));
+ }
+ @ApiOperation("办理进度录入")
+ @PostMapping("/saveProcess")
+ public R<?> saveProcess(@RequestBody ComplaintProcessDTO dto){
+ complaintService.saveProcess(dto);
+ return R.ok();
+ }
+ @ApiOperation("办理结果录入")
+ @PostMapping("/saveResult")
+ public R<?> saveResult(@RequestBody ComplaintCompletionDTO dto){
+ complaintService.saveResult(dto);
+ return R.ok();
+ }
/**
* 问题上报
*/
--
Gitblit v1.7.1