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

mitao

2025-03-18 35168aa5267f61747fe4dbb4a35f0e1a7bdbd7e1

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

@@ -33,6 +33,7 @@
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;

@@ -523,10 +524,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 +564,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);
@@ -589,6 +611,7 @@
        int reporterLevel;
        Long reporterId = null;
        String departmentName = "";
        String reporter = "";
        if (identityInformationVO.getIdentity() == 1) {
            PartyMember partyMember = partyMemberService.getPartyMemberByPhone(phone);
            superiorId = partyMember.getCommunityId();
@@ -596,6 +619,7 @@
            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) {
@@ -603,6 +627,7 @@
            }
            reportType = accountLevel - 1;
            reporterLevel = accountLevel;
            reporter = adminUser.getName();

            // 使用基本类型比较并补充默认分支
            if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
@@ -670,7 +695,7 @@
        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());
@@ -786,6 +811,8 @@
        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());
@@ -1214,8 +1241,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());
        ClassPathResource resource = new ClassPathResource("template/" + fileName + ".docx");
        XWPFTemplate.compile(resource.getFile()).render(map).writeAndClose(response.getOutputStream());
    }