From 0135fa289418c5fd231fa4e7c60ee7b8f06f17a7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 06 五月 2025 19:29:11 +0800
Subject: [PATCH] Merge branch 'dev-2.0.1' of http://120.76.84.145:10101/gitblit/r/java/zhihuishenqu into dev-2.0.1
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/MgtComplaintController.java | 58 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/MgtComplaintController.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/MgtComplaintController.java
index c8a8c8b..309bc6b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/MgtComplaintController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/MgtComplaintController.java
@@ -4,21 +4,19 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
-import com.panzhihua.sangeshenbian.model.query.ComplaintQuery;
+import com.panzhihua.sangeshenbian.annotation.SysLog;
+import com.panzhihua.sangeshenbian.model.dto.ComplaintProcessUpdateDto;
import com.panzhihua.sangeshenbian.model.vo.ComplaintVO;
import com.panzhihua.sangeshenbian.service.IComplaintService;
+import com.panzhihua.sangeshenbian.warpper.MgtComplaintQuery;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Lazy;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-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 org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
import java.io.IOException;
/**
@@ -34,7 +32,7 @@
@ApiOperation("诉求列表")
@PostMapping("/page")
- public R<Page<ComplaintVO>> pageList(@RequestBody ComplaintQuery query) {
+ public R<Page<ComplaintVO>> pageList(@RequestBody MgtComplaintQuery query) {
SystemUserVo loginUserInfo = getLoginUserInfoSanGeShenBian();
return R.ok(complaintService.pageList(query,loginUserInfo));
}
@@ -43,9 +41,9 @@
public R<ComplaintVO> detail(@ApiParam(name = "id", value = "诉求id", required = true) @PathVariable("id") Long id) {
return R.ok(complaintService.getDetailMgt(id));
}
- @ApiOperation("诉求列表")
+ @ApiOperation("导出")
@PostMapping("/export")
- public void export(@RequestBody ComplaintQuery query) {
+ public void export(@RequestBody MgtComplaintQuery query) {
SystemUserVo loginUserInfo = getLoginUserInfoSanGeShenBian();
try {
complaintService.export(query,loginUserInfo);
@@ -53,23 +51,35 @@
throw new RuntimeException(e);
}
}
- @ApiOperation("社区问题单")
- @GetMapping("/community-problem/{id}")
- public void communityProblem(@ApiParam(name = "id", value = "诉求id", required = true) @PathVariable("id") Long id) {
+
+
+
+ @PostMapping("/update-progress")
+ @ApiOperation("办理进度修改2.0.1")
+ public R<?> updateProgress(@Valid @RequestBody ComplaintProcessUpdateDto dto) {
+ complaintService.updateProgress(dto);
+ return R.ok();
+ }
+
+ @DeleteMapping("del-progress/{id}")
+ @ApiOperation("办理进度删除2.0.1")
+ public R<?> delProgress(@ApiParam(name = "id", value = "办理进度id", required = true) @PathVariable("id") Long id) {
+ complaintService.delProgress(id);
+ return R.ok();
+ }
+
+
+
+ @ApiOperation("社区问题单、问题处理单、协调通知单 下载")
+ @GetMapping("/download-file/{id}/{type}")
+ @SysLog(operatorCategory = "单导出",operId = 10)
+ public R<?> communityProblem(@ApiParam(name = "id", value = "诉求id", required = true) @PathVariable("id") Long id,
+ @ApiParam(name = "type", value = "类型：1：社区问题单 2：问题处理单 3：协调通知单", required = true) @PathVariable("type") Integer type) {
try {
- complaintService.communityProblem(id);
+ String name = complaintService.downloadFile(id, type, getLoginUserInfoSanGeShenBian());
+ return R.ok(name);
} catch (IOException e) {
throw new RuntimeException(e);
}
- }
- @ApiOperation("问题处理单")
- @GetMapping("/problem-handle/{id}")
- public void problemHandle(@ApiParam(name = "id", value = "诉求id", required = true) @PathVariable("id") Long id) {
- complaintService.problemHandle(id);
- }
- @ApiOperation("协调通知单")
- @GetMapping("/coordination-notice/{id}")
- public void coordinationNotice(@ApiParam(name = "id", value = "诉求id", required = true) @PathVariable("id") Long id) {
- complaintService.coordinationNotice(id);
}
}
--
Gitblit v1.7.1