From 1225d4cea1e230164b7dd9d410d129d13ac1be78 Mon Sep 17 00:00:00 2001 From: luofl <1442745593@qq.com> Date: 星期三, 19 三月 2025 17:46:58 +0800 Subject: [PATCH] 修改按钮权限 --- springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java index ef8e807..e897645 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java @@ -15,6 +15,7 @@ import com.panzhihua.common.redis.RedisUtils; import com.panzhihua.sangeshenbian.dao.ComplaintMapper; import com.panzhihua.sangeshenbian.enums.AuditStatusEnum; +import com.panzhihua.sangeshenbian.enums.ComplaintExportEnum; import com.panzhihua.sangeshenbian.enums.ProcessStatusEnum; import com.panzhihua.sangeshenbian.enums.RateEnum; import com.panzhihua.sangeshenbian.enums.ReportTypeEnum; @@ -454,7 +455,7 @@ } ComplaintVO detail = baseMapper.getDetail(id); if (detail.getStatus().equals(0)) { - List<ComplaintFlow> list = complaintFlowService.lambdaQuery().eq(ComplaintFlow::getComplaintId, id).orderByAsc(ComplaintFlow::getCreateTime).list(); + List<ComplaintFlow> list = complaintFlowService.lambdaQuery().eq(ComplaintFlow::getComplaintId, id).orderByAsc(ComplaintFlow::getSort).list(); detail.setComplaintFlows(list); } //查询办理进度 @@ -940,6 +941,8 @@ if (Objects.isNull(complaintAuditRecord)) { throw new ServiceException("诉求延期申请不存在"); } + complaintAuditRecord.setAuditorName(systemUser.getName()); + complaintAuditRecord.setAuditorPhone(systemUser.getPhone()); //审核通过后,设置诉求延期 if (complaintAuditRecord.getAuditType().equals(1) && complaintAuditRecord.getAuditStatus().equals(0) && dto.getAuditResult().equals(1)) { Complaint complaint = getById(complaintAuditRecord.getComplaintId()); @@ -1089,7 +1092,7 @@ //查询诉求流转记录 List<ComplaintFlow> complaintFlows = complaintFlowService.lambdaQuery() .eq(ComplaintFlow::getComplaintId, id) - .orderByAsc(ComplaintFlow::getCreateTime) + .orderByAsc(ComplaintFlow::getSort) .list(); complaintVO.setComplaintFlows(complaintFlows); //查询评价 @@ -1211,12 +1214,12 @@ } // 在文本中直接使用换行符 map.put("complaintProgress", sb.toString()); - map.put("status", ProcessStatusEnum.getDescriptionByCode(complaint.getStatus())); + map.put("status", ComplaintExportEnum.getEnumByCode(complaint.getStatus()).getDesc()); if (2 == type) { //查询诉求评价 ComplaintComment complaintComment = complaintCommentService.lambdaQuery().eq(ComplaintComment::getComplaintId, id).last("LIMIT 1").one(); if (Objects.nonNull(complaintComment)) { - map.put("rateStr", RateEnum.getEnumByCode(complaintComment.getRate())); + map.put("rateStr", RateEnum.getEnumByCode(complaintComment.getRate()).getDesc()); } } response.setContentType("application/octet-stream"); -- Gitblit v1.7.1