From f315cb9599bd6db3052e8fee019b9140474ea9ac Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 21 三月 2025 19:02:13 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/MgtComplaintController.java | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 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..50d9b47 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
@@ -7,6 +7,7 @@
import com.panzhihua.sangeshenbian.model.query.ComplaintQuery;
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;
@@ -34,7 +35,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 +44,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 +54,15 @@
throw new RuntimeException(e);
}
}
- @ApiOperation("社区问题单")
- @GetMapping("/community-problem/{id}")
- public void communityProblem(@ApiParam(name = "id", value = "诉求id", required = true) @PathVariable("id") Long id) {
+
+ @ApiOperation("社区问题单、问题处理单、协调通知单 下载")
+ @GetMapping("/download-file/{id}/{type}")
+ public void 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);
+ complaintService.downloadFile(id, type,getLoginUserInfoSanGeShenBian());
} 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