springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/MimeTypeUtils.java
@@ -36,7 +36,10 @@ // 视频格式 "mp4", "avi", "rmvb", "pdf" }; "pdf" , //音频 "mp3","mpeg" }; public static String getExtension(String prefix) { springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/SystemUserController.java
@@ -417,6 +417,65 @@ log.info("获取行政区划层级联动数据：{}", list); return R.ok(list); } @GetMapping("/getAdministrativeDivisionTwo") @ApiOperation(value = "获取行政区划层级联动数据--2.0.1", tags = {"三个身边后台-人员管理"}) @ApiImplicitParams({ }) @OperLog(operModul = "三个身边后台",operType = 0,businessType = "获取行政区划层级联动数据--2.0.1") public R<ArrayList<RegionVO>> getAdministrativeDivisionTwo(){ ArrayList<RegionVO> regionVOS = new ArrayList<>(); regionVOS.add(new RegionVO("1","市",new ArrayList<>(),1)); List<BcRegion> list = bcRegionService.list(new LambdaQueryWrapper<BcRegion>().eq(BcRegion::getDeleteFlag, 0).eq(BcRegion::getParentId, 510400)); ArrayList<RegionVO> regionList = new ArrayList<>(); list.forEach(e->{ RegionVO regionVO = new RegionVO(); regionVO.setId(e.getRegionCode()); regionVO.setName(e.getRegionName()); regionVO.setTier(2); regionList.add(regionVO); }); regionVOS.add(new RegionVO("2","区县",regionList,2)); List<ComStreet> list1 = comStreetService.list(new LambdaQueryWrapper<ComStreet>().in(ComStreet::getAreaCode, regionList.stream().map(RegionVO::getId).collect(Collectors.toList()))); for (RegionVO regionVO : regionList) { ArrayList<RegionVO> list2 = new ArrayList<>(); List<ComStreet> collect = list1.stream().filter(e -> e.getAreaCode().toString().equals(regionVO.getId())).collect(Collectors.toList()); collect.forEach(e->{ RegionVO regionVO1 = new RegionVO(); regionVO1.setId(e.getStreetId()); regionVO1.setName(e.getName()); regionVO1.setTier(3); list2.add(regionVO1); }); regionVO.setChildren(list2); } regionVOS.add(new RegionVO("3","街道",regionList,3)); List<ComAct> list2 = comActService.list(); for (RegionVO regionVO : regionList) { List<RegionVO> children = regionVO.getChildren(); for (RegionVO child : children) { List<ComAct> collect = list2.stream().filter(e -> e.getStreetId().toString().equals(child.getId())).collect(Collectors.toList()); ArrayList<RegionVO> list3 = new ArrayList<>(); collect.forEach(e->{ RegionVO regionVO2 = new RegionVO(); regionVO2.setId(e.getCommunityId().toString()); regionVO2.setName(e.getName()); regionVO2.setTier(4); list3.add(regionVO2); }); child.setChildren(list3); } } regionVOS.add(new RegionVO("4","社区",regionList,4)); return R.ok(regionVOS); } @GetMapping("/regionTree") @ApiOperation(value = "获取区县-街道-社区树",tags = {"三个身边后台-人员管理"}) public R<List<RegionVO>> regionTree(){ @@ -435,7 +494,8 @@ String jsapiTicket = SignatureUtil.getJsApiTicket(accessToken); String nonceStr = UUID.randomUUID().toString().replace("-", ""); String timestamp = String.valueOf(System.currentTimeMillis() / 1000); String url = "https://huacheng.psciio.com/web/sangeshenbian/"; // 当前页面的URL，不包含#及其后面部分 // String url = "https://huacheng.psciio.com/web/sangeshenbian/"; // 当前页面的URL，不包含#及其后面部分 String url = "http://192.168.110.91:8080/#/pages/Appeal/Appeal/"; // 当前页面的URL，不包含#及其后面部分 String signature = SignatureUtil.getSignature(jsapiTicket, nonceStr, timestamp, url);
@@ -5,6 +5,7 @@ import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo; import com.panzhihua.sangeshenbian.model.entity.Complaint; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.panzhihua.sangeshenbian.model.query.AppStaticsQuery; import com.panzhihua.sangeshenbian.model.query.ComplaintQuery; import com.panzhihua.sangeshenbian.model.vo.AppComplaintRejectVO; import com.panzhihua.sangeshenbian.model.vo.ComplaintTodoVO; @@ -104,5 +105,5 @@ Page<AppComplaintRejectVO> queryRejectRecordPage(Page<ComplaintVO> page, @Param("keyword") String keyword, @Param("accountLevel") Integer accountLevel, @Param("targetId") Long targetId); List<Complaint> queryCompliantList(Long targetId, Integer accountLevel, LoginUserInfoVO loginUserInfo); List<Complaint> queryCompliantList(@Param("targetId") Long targetId, @Param("accountLevel") Integer accountLevel, @Param("loginUserInfo") LoginUserInfoVO loginUserInfo, @Param("query")AppStaticsQuery query); } 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/entity/SystemUserLevel.java
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -54,6 +55,7 @@ private String community; @ApiModelProperty(value = "社区ID") @JsonFormat(shape = JsonFormat.Shape.STRING) private Long communityId; @ApiModelProperty(value = "是否纪检组监督账号 1：是；0：否") 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;
@@ -2,7 +2,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import java.util.List; @@ -12,6 +14,8 @@ */ @Data @ApiModel("区域视图对象") @AllArgsConstructor @NoArgsConstructor public class RegionVO { @ApiModelProperty("主键id") private String id; @@ -21,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/ComplaintProgressServiceImpl.java
@@ -1,13 +1,12 @@ package com.panzhihua.sangeshenbian.service.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.exceptions.ServiceException; import com.panzhihua.sangeshenbian.dao.ComplaintProgressMapper; import com.panzhihua.sangeshenbian.model.dto.ComplaintProcessDTO; import com.panzhihua.sangeshenbian.model.entity.ComplaintProgress; import com.panzhihua.sangeshenbian.dao.ComplaintProgressMapper; import com.panzhihua.sangeshenbian.service.IComplaintProgressService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.Objects; @@ -24,7 +23,7 @@ public class ComplaintProgressServiceImpl extends ServiceImpl<ComplaintProgressMapper, ComplaintProgress> implements IComplaintProgressService { @Override public void edit(ComplaintProcessDTO dto) { if (Objects.nonNull(dto.getId())) { if (Objects.isNull(dto.getId())) { throw new ServiceException("办理进度id不能为空"); } ComplaintProgress complaintProgress = BeanUtil.copyProperties(dto, ComplaintProgress.class); 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,9 +1693,12 @@ targetId = systemUserLevel.getCommunityId(); break; } }else { targetId = Long.valueOf(query.getAreaId()); accountLevel = query.getTier(); } } return baseMapper.queryCompliantList(targetId, accountLevel, loginUserInfo); return baseMapper.queryCompliantList(targetId, accountLevel, loginUserInfo,query); } }
@@ -94,7 +94,7 @@ private List<RegionVO> buildDistrictLevelTree(String districtCode) { List<RegionVO> streets = systemUserMapper.getStreet(districtCode); streets.forEach(street -> { street.setTier(2); street.setTier(3); List<RegionVO> communities = systemUserMapper.getCommunity(street.getId()); communities.forEach(c -> c.setTier(4)); street.setChildren(communities); springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/ComplaintMapper.xml
@@ -619,7 +619,9 @@ scar.latest_flag, scar.report_type, scar.superior_id, scar.sort scar.sort, scar.auditor_phone, scar.apply_phone AS reporterPhone, sc.serial_number, sc.latitude, sc.longitude,
