springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintAuditRecord.java
@@ -135,4 +135,8 @@ @TableField("audit_time") private Date auditTime; @ApiModelProperty("申请人联系方式") @TableField("apply_phone") private String applyPhone; } springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/query/AppStaticsQuery.java
@@ -15,7 +15,7 @@ @ApiModelProperty("通用-上级-区域ID") private String areaId; @ApiModelProperty("通用-上级-区域层级") @ApiModelProperty("通用-上级-区域层级 -1:全部") private Integer tier; @ApiModelProperty("第二部分-时间类型 1：近7天， 2：近15天， 3：近30天") springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/AppComplaintRejectVO.java
@@ -25,12 +25,18 @@ @ApiModelProperty("申请人") private String reporter; @ApiModelProperty("申请人联系方式") private String reporterPhone; @ApiModelProperty("审批时间") private Date auditTime; @ApiModelProperty("审批人") private String auditorName; @ApiModelProperty("审批人联系方式") private String auditorPhone; @ApiModelProperty("驳回理由") private String rejectReason;
@@ -25,6 +25,6 @@ @ApiModelProperty("子节点") private List<RegionVO> children; @ApiModelProperty("层级") @ApiModelProperty("层级 1：市 2：区县 3：街道 4：社区") private Integer tier; } springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
@@ -779,6 +779,7 @@ complaintAuditRecord.setReporterLevel(reporterLevel); complaintAuditRecord.setReporterId(reporterId); complaintAuditRecord.setApplyName(reporter); complaintAuditRecord.setApplyPhone(phone); complaintAuditRecordService.save(complaintAuditRecord); } @@ -1037,6 +1038,7 @@ record1.setDepartmentName(departmentName); // 冗余申请人名称 record1.setApplyName(reporter); record1.setApplyPhone(loginUserInfoVO.getPhone()); complaintAuditRecordService.save(record1); } @@ -1671,7 +1673,7 @@ targetId = partyMember.getId(); } else if (identity.equals(2)) { //上级 if (StringUtils.isBlank(query.getAreaId())) { if (Objects.nonNull(query.getTier()) && !query.getTier().equals(-1)) { accountLevel = systemUserLevel.getLevel(); switch (systemUserLevel.getLevel()) { case 1: @@ -1691,6 +1693,9 @@ targetId = systemUserLevel.getCommunityId(); break; } }else { targetId = Long.valueOf(query.getAreaId()); accountLevel = query.getTier(); } } return baseMapper.queryCompliantList(targetId, accountLevel, loginUserInfo); springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/ComplaintMapper.xml
@@ -620,6 +620,8 @@ scar.report_type, scar.superior_id, scar.sort, scar.auditor_phone, scar.apply_phone AS reporterPhone, sc.serial_number, sc.latitude, sc.longitude,
