From 039abee6b27058ca46b1e1e82aa0b5407a5dad44 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 28 七月 2025 15:25:26 +0800
Subject: [PATCH] 优化 和修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/controller/ComplaintController.java | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/controller/ComplaintController.java b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/controller/ComplaintController.java
index abb0aa7..9ffd9f1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/controller/ComplaintController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/controller/ComplaintController.java
@@ -4,6 +4,7 @@
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.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.westcommittee.annotation.DistributedLock;
import com.panzhihua.westcommittee.model.dto.*;
@@ -17,6 +18,7 @@
import com.panzhihua.westcommittee.service.IComplaintService;
import com.panzhihua.westcommittee.service.IProblemTypeService;
import com.panzhihua.westcommittee.warpper.GetHouseAddressQuery;
+import com.panzhihua.westcommittee.warpper.IdentityInformation;
import io.swagger.annotations.*;
import lombok.RequiredArgsConstructor;
import org.checkerframework.checker.units.qual.C;
@@ -28,6 +30,7 @@
import javax.validation.Valid;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import static cn.hutool.core.util.ObjectUtil.isNull;
@@ -62,8 +65,8 @@
@ApiOperation(value = "录入诉求")
@DistributedLock(lockName = "complaint_serial_number_lock")
public R<?> save(@Valid @RequestBody Complaint complaint) {
- complaintService.saveComplaint(complaint, getLoginUserInfo());
- return R.ok();
+ HashMap<String, String> map = complaintService.saveComplaint(complaint, getLoginUserInfo());
+ return R.ok(map);
}
@@ -126,10 +129,6 @@
@PostMapping("/save-process")
@ApiOperation("办理进度录入")
public R<?> saveProcess(@Valid @RequestBody ComplaintProcessDTO dto){
- Complaint byId = complaintService.getById(dto.getComplaintId());
- if(byId.getAssignStatus()==0){
- return R.fail("该诉求未分配");
- }
complaintService.saveProcess(dto,getLoginUserInfo());
return R.ok();
}
@@ -153,12 +152,6 @@
@PostMapping("/report")
@ApiOperation(value = "问题上报")
public R<?> report(@RequestBody ComplaintReportDTO complaintReportDTO) {
- Complaint byId = complaintService.getById(complaintReportDTO.getComplaintId());
- if(byId.getAssignStatus()==0){
- return R.fail("该诉求未分配");
- }
-
-
complaintService.saveReport(complaintReportDTO, getLoginUserInfo());
return R.ok();
}
@@ -180,10 +173,6 @@
@PostMapping("/saveDelay")
@ApiOperation(value = "延期申请")
public R<?> saveDelay(@Valid @RequestBody ComplaintDelayDTO dto){
- Complaint byId = complaintService.getById(dto.getComplaintId());
- if(byId.getAssignStatus()==0){
- return R.fail("该诉求未分配");
- }
complaintService.saveDelay(dto, getLoginUserInfo());
return R.ok();
}
@@ -237,11 +226,20 @@
@ApiOperation(value = "分配诉求")
public R<?> assignComplain(@Valid@RequestBody AssignComplainDto dto) {
- complaintService.assignComplain(getLoginUserInfo(),dto.getComplainId(),dto.getDeptId(),dto.getRemark());
+ complaintService.assignComplain(getLoginUserInfo(),dto.getComplainId(),dto.getDeptId(),dto.getRemark(),dto.getProblemType());
return R.ok();
}
+ @PostMapping("/setProblemType")
+ @ApiOperation(value = "分配问题类型")
+ public R<?> assignComplain(@Valid @RequestBody SetProblemTypeDto dto) {
+ // 判断是否管理员
+ complaintService.setProblemType(getLoginUserInfo(),dto);
+ return R.ok();
+ }
+
+
/**
* 评价诉求
--
Gitblit v1.7.1