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

mitao

2025-03-18 d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256

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

@@ -33,11 +33,13 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -410,7 +412,7 @@

        //状态为已办结，判断评价按钮
        int count = complaintCommentService.count(new LambdaQueryWrapper<ComplaintComment>().eq(ComplaintComment::getComplaintId, vo.getId()).eq(ComplaintComment::getDelFlag, 0));
        if (vo.getStatus() == 3 && 0 == count) {
        if ((vo.getStatus() == 3 || vo.getStatus() == 8) && 0 == count) {
            if (systemUserByPhone.isPresent()) {
                SystemUser systemUser = systemUserByPhone.get();
                Integer accountLevel = systemUser.getAccountLevel();
@@ -523,10 +525,27 @@
     */
    @Override
    public void saveProcess(ComplaintProcessDTO dto, LoginUserInfoVO loginUserInfoVO) {
        //获取当前身份
        IdentityInformation identityInformationVO = identityInformationService.getIdentityInformation(loginUserInfoVO);

        List<PermissionsVO> permissions = identityInformationVO.getPermissions();
        if (permissions.isEmpty()) {
            throw new ServiceException("请先完善个人信息");
        }
        //上级
        String name = "";
        if (identityInformationVO.getIdentity() == 2) {
            //1=党员，2=管理员
            SystemUser systemUser = identityInformationVO.getSystemUser();
            name =   systemUser.getName();
        }else if (identityInformationVO.getIdentity() == 1){
            PartyMember partyMember = identityInformationVO.getPartyMember();
            name = partyMember.getName();
        }
        ComplaintProgress complaintProgress = BeanUtil.copyProperties(dto, ComplaintProgress.class);
        complaintProgress.setCreateTime(new Date());
        complaintProgress.setCreateBy(loginUserInfoVO.getUserId());
        complaintProgress.setCreateByName(loginUserInfoVO.getNickName());
        complaintProgress.setCreateByName(name);
        complaintProgressService.save(complaintProgress);
    }

@@ -546,18 +565,22 @@
            throw new ServiceException("请先完善个人信息");
        }
        Integer accountLevel = null;
        String name = "";
        //上级
        if (identityInformationVO.getIdentity() == 2) {
            //1=党员，2=管理员
            SystemUser systemUser = identityInformationVO.getSystemUser();
            accountLevel = systemUser.getAccountLevel();
            name =   systemUser.getName();
        }else if (identityInformationVO.getIdentity() == 1){
            accountLevel = 5;
            PartyMember partyMember = identityInformationVO.getPartyMember();
            name = partyMember.getName();
        }
        Complaint complaint = BeanUtil.copyProperties(dto, Complaint.class);
        complaint.setUpdateTime(new Date());
        complaint.setCompletionUserId(loginUserInfoVO.getUserId());
        complaint.setCompletionUsername(loginUserInfoVO.getNickName());
        complaint.setCompletionUsername(name);
        complaint.setCompletionUserPhone(loginUserInfoVO.getPhone());
        complaint.setCompletionTime(new Date());
        complaint.setCompletionUserLevel(accountLevel);
@@ -586,26 +609,37 @@

        Long superiorId;
        int reportType;
        int reporterLevel;
        Long reporterId = null;
        String departmentName = "";
        String reporter = "";
        if (identityInformationVO.getIdentity() == 1) {
            PartyMember partyMember = partyMemberService.getPartyMemberByPhone(phone);
            superiorId = partyMember.getCommunityId();
            reporterId = partyMember.getId();
            reportType = 4;
            reporterLevel = 5;
            departmentName = partyMember.getDistricts() + "-" + partyMember.getStreet() + "-" + partyMember.getCommunity();
            reporter = partyMember.getName();
        } else if (identityInformationVO.getIdentity() == 2) {
            int accountLevel = adminUser.getAccountLevel(); // 改为基本类型
            if (accountLevel == 1) {
                throw new ServiceException("市级账号,无法上报！");
            }
            reportType = accountLevel - 1;
            reporterLevel = accountLevel;
            reporter = adminUser.getName();

            // 使用基本类型比较并补充默认分支
            if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
                superiorId = Long.parseLong(adminUser.getStreetId());
                reporterId = adminUser.getCommunityId();
            } else if (accountLevel == ReportTypeEnum.STREET.getCode()) {
                superiorId = Long.parseLong(adminUser.getDistrictsCode());
                reporterId = Long.parseLong(adminUser.getStreetId());
            } else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
                superiorId = 510400L; // 攀枝花市
                reporterId = Long.parseLong(adminUser.getDistrictsCode());
            } else if (accountLevel == ReportTypeEnum.PARTY.getCode()) {
                superiorId = adminUser.getCommunityId();
            } else {
@@ -662,12 +696,14 @@
        complaintAuditRecord.setCreateTime(new Date());
        complaintAuditRecord.setUpdateBy(loginUserInfoVO.getUserId());
        complaintAuditRecord.setUpdateTime(new Date());
        complaintAuditRecord.setReporter(loginUserInfoVO.getNickName());
        complaintAuditRecord.setReporter(reporter);
        complaintAuditRecord.setReportType(reportType);
        complaintAuditRecord.setSuperiorId(superiorId);
        complaintAuditRecord.setComment(dto.getComment());
        complaintAuditRecord.setSort(count + 1);
        complaintAuditRecord.setDepartmentName(departmentName);
        complaintAuditRecord.setReporterLevel(reporterLevel);
        complaintAuditRecord.setReporterId(reporterId);
        complaintAuditRecordService.save(complaintAuditRecord);
    }

@@ -776,12 +812,18 @@
        if (Objects.isNull(complaintAuditRecord)) {
            throw new ServiceException("上报申请记录不存在");
        }
        complaintAuditRecord.setAuditorName(systemUser.getName());
        complaintAuditRecord.setAuditorPhone(systemUser.getPhone());
        if (complaintReporAuditDTO.getAuditResult().equals(1)) {
            complaintAuditRecord.setAuditStatus(1);
            complaintAuditRecord.setAuditorId(loginUserInfoVO.getUserId());
            complaintAuditRecordService.updateById(complaintAuditRecord);
            //创建流程
            complaintFlowService.createFlow(complaintAuditRecord, 0, loginUserInfoVO.getUserId());
            ComplaintAuditRecord complaintAuditRecord2 = new ComplaintAuditRecord();
            complaintAuditRecord2.setComplaintId(complaintReporAuditDTO.getId());
            complaintAuditRecord2.setSuperiorId(complaintAuditRecord.getReporterId());
            complaintAuditRecord2.setReportType(complaintAuditRecord.getReporterLevel());
            complaintFlowService.createFlow(complaintAuditRecord2, 0, loginUserInfoVO.getUserId());
        } else {
            complaintAuditRecord.setRejectReason(complaintReporAuditDTO.getRejectReason());
            complaintAuditRecord.setAuditStatus(2);
@@ -1146,10 +1188,10 @@
        String fileName = "";
        switch (type) {
            case 1:
                fileName = "社区问题单";
                fileName = "community_question.docx";
                break;
            case 2:
                fileName = "问题处理单";
                fileName = "question_handle.docx";
                if (Objects.nonNull(partyMember)) {
                    community = community + "-" + partyMember.getServiceTarget();
                }
@@ -1165,14 +1207,14 @@
                if (Objects.nonNull(record)) {
                    reportType = record.getReportType();
                }
                fileName = "协调通知单";
                fileName = "notice.docx";
                break;
        }
        Map<String, Object> map = new HashMap<>();
        map.put("community", community);
        map.put("problemType", complaint.getProblemType());
        map.put("descriptionContent", complaint.getDescriptionContent());
        map.put("reportType", ReportTypeEnum.getDescriptionByCode(reportType));
        map.put("reportType", reportType == null ? "" : ReportTypeEnum.getDescriptionByCode(reportType));
        map.put("partyOrganization", Objects.nonNull(partyMember) ? partyMember.getPartyOrganization() : "");
        map.put("name", complaint.getName());
        map.put("contactNumber", complaint.getContactNumber());
@@ -1200,8 +1242,8 @@
        response.setContentType("application/octet-stream");
        String fileNameEncode = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20");
        response.setHeader("Content-disposition", "attachment;filename=\"" + fileNameEncode + ".docx" + "\"");
        String fileTemplateName = FileUtil.getPath() + "template/" + fileName + ".docx";
        XWPFTemplate.compile(fileTemplateName).render(map).writeAndClose(response.getOutputStream());
        InputStream resourceAsStream = this.getClass().getResourceAsStream("/template/" + fileName);
        XWPFTemplate.compile(resourceAsStream).render(map).writeAndClose(response.getOutputStream());
    }


@@ -1222,7 +1264,7 @@
            String content = "第一行内容\n第二行内容\n第三行内容";
            map.put("complaintProgress", content);
            map.put("status", "处理中");
            XWPFTemplate.compile("F:\\DeskTop\\zhihuishequ\\springcloud_k8s_panzhihuazhihuishequ\\service_sangeshenbian\\src\\main\\resources\\template\\社区问题单.docx").render(map).writeToFile("F:\\DeskTop\\社区.docx");
            XWPFTemplate.compile("F:\\DeskTop\\zhihuishequ\\springcloud_k8s_panzhihuazhihuishequ\\service_sangeshenbian\\src\\main\\resources\\template\\community_question.docx").render(map).writeToFile("F:\\DeskTop\\社区.docx");
        } catch (IOException e) {
            e.printStackTrace();
        }