Merge branch 'dev-2.0' of http://120.76.84.145:10101/gitblit/r/java/zhihuis...

mitao

2025-03-18 9502f1dc2f8367957c07bd53eaf0005c9a14ed82

Merge branch 'dev-2.0' of http://120.76.84.145:10101/gitblit/r/java/zhihuishenqu into dev-2.0

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintAuditRecord.java

@@ -92,6 +92,12 @@
    @ApiModelProperty("上报人")
    private String reporter;

    @ApiModelProperty("上报人id")
    private Long reporterId;

    @ApiModelProperty("上报人层级 1=市级账号，2=区县账号，3=街道账号，4=社区账号 5=党员账号")
    private Integer reporterLevel;

    @ApiModelProperty("所属部门")
    private String departmentName;


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

@@ -18,6 +18,7 @@

import javax.annotation.Resource;
import java.util.Date;
import java.util.Objects;

/**
 * <p>
@@ -35,6 +36,7 @@
    private final IComStreetService comStreetService;
    private final IComActService comActService;
    private final UserService userService;
    private final IPartyMemberService partyMemberService;

    @Override
    public void createFlow(ComplaintAuditRecord record, Integer type,Long userId) {
@@ -51,7 +53,7 @@
    }

    private String getFlowName(Integer reportType, Long superiorId) {
        String name;
        String name = "";
        if (reportType == ReportTypeEnum.COMMUNITY.getCode()) {
            ComAct byId = comActService.getById(superiorId);
            name = byId.getName();
@@ -63,11 +65,15 @@
                    .eq(BcRegion::getRegionCode, superiorId));
            name = bcRegion.getRegionName();
        } else {
            R<LoginUserInfoVO> userR = userService.getUserInfoByUserId(String.valueOf(superiorId));
            if (!R.isOk(userR)) {
                throw new ServiceException("获取用户信息失败");
//            R<LoginUserInfoVO> userR = userService.getUserInfoByUserId(String.valueOf(superiorId));
//            if (!R.isOk(userR)) {
//                throw new ServiceException("获取用户信息失败");
//            }
//            name =  null == userR.getData() ? "" : userR.getData().getNickName();
            PartyMember partyMember = partyMemberService.getById(superiorId);
            if (Objects.nonNull(partyMember)) {
                name = partyMember.getName();
            }
            name =  null == userR.getData() ? "" : userR.getData().getNickName();
        }
        return name;
    }

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

@@ -586,11 +586,15 @@

        Long superiorId;
        int reportType;
        int reporterLevel;
        Long reporterId = null;
        String departmentName = "";
        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();
        } else if (identityInformationVO.getIdentity() == 2) {
            int accountLevel = adminUser.getAccountLevel(); // 改为基本类型
@@ -598,14 +602,18 @@
                throw new ServiceException("市级账号,无法上报！");
            }
            reportType = accountLevel - 1;
            reporterLevel = accountLevel;

            // 使用基本类型比较并补充默认分支
            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 {
@@ -668,6 +676,8 @@
        complaintAuditRecord.setComment(dto.getComment());
        complaintAuditRecord.setSort(count + 1);
        complaintAuditRecord.setDepartmentName(departmentName);
        complaintAuditRecord.setReporterLevel(reporterLevel);
        complaintAuditRecord.setReporterId(reporterId);
        complaintAuditRecordService.save(complaintAuditRecord);
    }

@@ -781,7 +791,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 +1186,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());

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/ComplaintMapper.xml

@@ -190,6 +190,8 @@
        sc.over_time_days,
        sc.latitude,
        sc.longitude,
        sc.report_user_name,
        sc.report_user_phone,
        scar.audit_type,
        scar.audit_status,
        scar.comment,