Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0

mitao

2025-03-20 a84913e3d7da9ecdda96b258a342ad45a6c98e20

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java

@@ -13,8 +13,10 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
import com.panzhihua.common.redis.RedisUtils;
import com.panzhihua.sangeshenbian.config.AutoColumnWidthStrategy;
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 +456,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);
        }
        //查询办理进度
@@ -819,6 +821,7 @@
        Long superiorId;
        int reportType;
        String departmentName = "";
        String reporter = "";
        if (identityInformation.getIdentity() == 1) {
            PartyMember partyMember = partyMemberService.getPartyMemberByPhone(loginUserInfoVO.getPhone());
            superiorId = partyMember.getCommunityId();
@@ -827,12 +830,14 @@
            }
            reportType = ReportTypeEnum.COMMUNITY.getCode();
            departmentName = partyMember.getDistricts() + "-" + partyMember.getStreet() + "-" + partyMember.getCommunity();
            reporter = partyMember.getName();
        } else if (identityInformation.getIdentity() == 2 && systemUser != null) {
            int accountLevel = systemUser.getAccountLevel(); // 改为基本类型
            if (accountLevel == 1) {
                throw new ServiceException("市级账号,无法延期申请！");
            }
            reportType = accountLevel - 1;
            reporter = systemUser.getName();

            // 使用基本类型比较并补充默认分支
            if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
@@ -889,7 +894,7 @@
        record1.setCreateTime(new Date(System.currentTimeMillis()));
        record1.setUpdateBy(loginUserInfoVO.getUserId());
        record1.setUpdateTime(new Date(System.currentTimeMillis()));
        record1.setReporter(loginUserInfoVO.getNickName());
        record1.setReporter(reporter);
        record1.setReportType(reportType);
        record1.setSuperiorId(superiorId);
        record1.setSort(count + 1);
@@ -937,6 +942,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());
@@ -1086,7 +1093,7 @@
        //查询诉求流转记录
        List<ComplaintFlow> complaintFlows = complaintFlowService.lambdaQuery()
                .eq(ComplaintFlow::getComplaintId, id)
                .orderByAsc(ComplaintFlow::getCreateTime)
                .orderByAsc(ComplaintFlow::getSort)
                .list();
        complaintVO.setComplaintFlows(complaintFlows);
        //查询评价
@@ -1111,6 +1118,7 @@
        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
        EasyExcel.write(response.getOutputStream(), ComplaintExcel.class)
                .sheet("诉求数据")
                .registerWriteHandler(new AutoColumnWidthStrategy())
                .doWrite(complaintExcels);
    }

@@ -1208,12 +1216,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");