luofl
2025-03-18 7a85ab9deb97520738896059c51ce71c4112b56f
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
@@ -523,10 +523,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 +563,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 +607,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 +694,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);
    }
@@ -781,7 +815,11 @@
            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);
@@ -1172,7 +1210,7 @@
        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());