diff --git a/src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java b/src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java index 893fbad..1a65920 100644 --- a/src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java +++ b/src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java @@ -18,6 +18,7 @@ import com.biutag.supervision.pojo.dto.DataPetitionComplaintImportDto; import com.biutag.supervision.pojo.entity.DataPetitionComplaint; import com.biutag.supervision.pojo.entity.SupDepart; import com.biutag.supervision.pojo.param.DataPetitionComplaintQueryParam; +import com.biutag.supervision.pojo.vo.DataPetitionComplaintVo; import com.biutag.supervision.service.DataPetitionComplaintService; import com.biutag.supervision.service.SupDepartService; import jakarta.validation.ConstraintViolation; @@ -51,7 +52,7 @@ public class DataPetitionComplaintController { private final Validator validator; @GetMapping - public Result> list(DataPetitionComplaintQueryParam queryParam) { + public Result> list(DataPetitionComplaintQueryParam queryParam) { return Result.success(dataPetitionComplaintService.page(queryParam)); } diff --git a/src/main/java/com/biutag/supervision/controller/sensitiveperception/ProfileDepartController.java b/src/main/java/com/biutag/supervision/controller/sensitiveperception/ProfileDepartController.java index 96f8c1e..d7c7853 100644 --- a/src/main/java/com/biutag/supervision/controller/sensitiveperception/ProfileDepartController.java +++ b/src/main/java/com/biutag/supervision/controller/sensitiveperception/ProfileDepartController.java @@ -76,7 +76,8 @@ public class ProfileDepartController { SupDepart depart = departService.getById(departId); profileDepart.getDepartInfo() .setName(depart.getShortName()) - .setShortName(depart.getShortName()); + .setShortName(depart.getShortName()) + .setDepartImg(depart.getImg()); List polices = policeService.listAllByDepartId(departId); profileDepart.getDepartInfo().setMainRole(polices.stream().filter(item -> "正职".equals(item.getPosition())).findFirst().map(SupPolice::getName).orElse(null)); profileDepart.getDepartInfo().setDeputyRole(polices.stream().filter(item -> "副职".equals(item.getPosition())).map(SupPolice::getName).toList()); diff --git a/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java b/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java index efe3584..a598456 100644 --- a/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java @@ -1,9 +1,13 @@ package com.biutag.supervision.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.biutag.supervision.pojo.dto.CaseVerifDepart; import com.biutag.supervision.pojo.entity.DataPetitionComplaint; import com.biutag.supervision.pojo.vo.*; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.Date; @@ -12,6 +16,8 @@ import java.util.List; public interface DataPetitionComplaintMapper extends BaseMapper { + Page queryPage(@Param("page") Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + /** * 查询初访重访 * diff --git a/src/main/java/com/biutag/supervision/pojo/domain/ProfileDepart.java b/src/main/java/com/biutag/supervision/pojo/domain/ProfileDepart.java index f7998f2..43ea4b1 100644 --- a/src/main/java/com/biutag/supervision/pojo/domain/ProfileDepart.java +++ b/src/main/java/com/biutag/supervision/pojo/domain/ProfileDepart.java @@ -49,6 +49,7 @@ public class ProfileDepart { public static class DepartInfo { private String name; private String shortName; + private String departImg; // 所长 private String mainRole; // 副所长 diff --git a/src/main/java/com/biutag/supervision/pojo/dto/DataDataPetitionComplainDistribute.java b/src/main/java/com/biutag/supervision/pojo/dto/DataDataPetitionComplainDistribute.java index 7f8a4b8..7200398 100644 --- a/src/main/java/com/biutag/supervision/pojo/dto/DataDataPetitionComplainDistribute.java +++ b/src/main/java/com/biutag/supervision/pojo/dto/DataDataPetitionComplainDistribute.java @@ -34,4 +34,12 @@ public class DataDataPetitionComplainDistribute { // 审批流程 @NotBlank private String approvalFlow; + + private String businessTypeCode; + + private String businessTypeName; + + private List involveProblem; + + private String policeType; } diff --git a/src/main/java/com/biutag/supervision/pojo/entity/DataPetitionComplaint.java b/src/main/java/com/biutag/supervision/pojo/entity/DataPetitionComplaint.java index 2e8fd6b..4091db5 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/DataPetitionComplaint.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/DataPetitionComplaint.java @@ -1,6 +1,5 @@ package com.biutag.supervision.pojo.entity; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Getter; diff --git a/src/main/java/com/biutag/supervision/pojo/entity/SupDepart.java b/src/main/java/com/biutag/supervision/pojo/entity/SupDepart.java index 58532fa..54e01b7 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/SupDepart.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/SupDepart.java @@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import lombok.Getter; import lombok.Setter; -import java.time.LocalDateTime; - @Setter @Getter public class SupDepart { @@ -84,4 +82,5 @@ public class SupDepart { // private String statisticsGroupId; + private String img; } \ No newline at end of file diff --git a/src/main/java/com/biutag/supervision/pojo/model/DepartNegativeModel.java b/src/main/java/com/biutag/supervision/pojo/model/DepartNegativeModel.java index 9249d06..12ec20c 100644 --- a/src/main/java/com/biutag/supervision/pojo/model/DepartNegativeModel.java +++ b/src/main/java/com/biutag/supervision/pojo/model/DepartNegativeModel.java @@ -16,6 +16,7 @@ public class DepartNegativeModel { private String departId; private String departName; private String parentDepartName; + // //民警人数 private Integer policeSize; diff --git a/src/main/java/com/biutag/supervision/pojo/param/DataPetitionComplaintQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/DataPetitionComplaintQueryParam.java index 79f9247..b6cf5b3 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/DataPetitionComplaintQueryParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/DataPetitionComplaintQueryParam.java @@ -28,4 +28,6 @@ public class DataPetitionComplaintQueryParam extends BasePage { private String thingDesc; + private String distributionState; + } diff --git a/src/main/java/com/biutag/supervision/pojo/vo/DataPetitionComplaintVo.java b/src/main/java/com/biutag/supervision/pojo/vo/DataPetitionComplaintVo.java new file mode 100644 index 0000000..0371e6c --- /dev/null +++ b/src/main/java/com/biutag/supervision/pojo/vo/DataPetitionComplaintVo.java @@ -0,0 +1,80 @@ +package com.biutag.supervision.pojo.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; + +/** + * 信访投诉 + */ +@Setter +@Getter +public class DataPetitionComplaintVo { + + // 信件编号 + private String originId; + + // 投诉渠道 + private String channelForFilingComplaints; + + // 受理层级 + private String acceptanceLevel; + + // 登记时间 + private LocalDateTime discoveryTime; + + // 投诉人 + private String responderName; + + // 投诉人电话 + private String responderPhone; + + // 初重信访 + private String initialPetition; + + // 缠访闹访 + private Boolean entanglementVisits; + + // 群众集访 + private Boolean massVisits; + + // 涉嫌问题 + private String involveProblem; + + // 业务类别 + private String businessTypeName; + + // 涉及警种名称 + private String policeTypeName; + + // 具体内容 + private String thingDesc; + + + + // 涉及单位 二级 + private String secondDepartId; + + private String secondDepartName; + + // 所对 + private String thirdDepartId; + + private String thirdDepartName; + + private LocalDateTime createTime; + + private LocalDateTime updateTime; + + // 来源 + private String problemSourcesCode; + + // 分发状态 + private String distributionState; + + private String negativeId; + +} \ No newline at end of file diff --git a/src/main/java/com/biutag/supervision/pojo/vo/DepartTree.java b/src/main/java/com/biutag/supervision/pojo/vo/DepartTree.java index 19a0a90..a9bdcac 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/DepartTree.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/DepartTree.java @@ -32,6 +32,8 @@ public class DepartTree { private String updatedAt; + private String img; + private List children = new ArrayList<>(); private boolean hasChildren = false; diff --git a/src/main/java/com/biutag/supervision/service/DataPetitionComplaintService.java b/src/main/java/com/biutag/supervision/service/DataPetitionComplaintService.java index 727579d..824dfe5 100644 --- a/src/main/java/com/biutag/supervision/service/DataPetitionComplaintService.java +++ b/src/main/java/com/biutag/supervision/service/DataPetitionComplaintService.java @@ -15,6 +15,7 @@ import com.biutag.supervision.pojo.dto.*; import com.biutag.supervision.pojo.entity.DataPetition12337; import com.biutag.supervision.pojo.entity.DataPetitionComplaint; import com.biutag.supervision.pojo.param.DataPetitionComplaintQueryParam; +import com.biutag.supervision.pojo.vo.DataPetitionComplaintVo; import com.biutag.supervision.pojo.vo.RecentMailTrendByDayVo; import com.biutag.supervision.pojo.vo.RecentMailTrendByMonthVo; import lombok.RequiredArgsConstructor; @@ -37,26 +38,27 @@ public class DataPetitionComplaintService extends ServiceImpl page(DataPetitionComplaintQueryParam queryParam) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(DataPetitionComplaint::getProblemSourcesCode, queryParam.getProblemSourcesCode()) - .like(StrUtil.isNotBlank(queryParam.getOriginId()), DataPetitionComplaint::getOriginId, queryParam.getOriginId()) - .like(StrUtil.isNotBlank(queryParam.getThingDesc()), DataPetitionComplaint::getThingDesc, queryParam.getThingDesc()) - .orderByDesc(DataPetitionComplaint::getCreateTime); + public Page page(DataPetitionComplaintQueryParam queryParam) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("pc.problem_sources_code", queryParam.getProblemSourcesCode()) + .like(StrUtil.isNotBlank(queryParam.getOriginId()), "pc.origin_Id", queryParam.getOriginId()) + .like(StrUtil.isNotBlank(queryParam.getThingDesc()), "pc.thing_desc", queryParam.getThingDesc()) + .eq(StrUtil.isNotBlank(queryParam.getDistributionState()), "pc.distributionState", queryParam.getDistributionState()) + .orderByDesc("pc.create_time"); if (queryParam.getDiscoveryTime().size() == 2) { - queryWrapper.between(DataPetitionComplaint::getDiscoveryTime, queryParam.getDiscoveryTime().get(0), queryParam.getDiscoveryTime().get(1)); + queryWrapper.between("pc.discovery_time", queryParam.getDiscoveryTime().get(0), queryParam.getDiscoveryTime().get(1)); } if (StrUtil.isNotBlank(queryParam.getResponderKey()) && StrUtil.isNotBlank(queryParam.getResponderValue())) { switch (queryParam.getResponderKey()) { case "name": - queryWrapper.like(DataPetitionComplaint::getResponderName, queryParam.getResponderValue()); + queryWrapper.like("pc.responder_name", queryParam.getResponderValue()); break; case "phone": - queryWrapper.like(DataPetitionComplaint::getResponderPhone, queryParam.getResponderValue()); + queryWrapper.like("pc.responder_phone", queryParam.getResponderValue()); break; } } - return page(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper); + return baseMapper.queryPage(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper); } public boolean save(DataPetitionComplaintDto dto) { @@ -96,8 +98,10 @@ public class DataPetitionComplaintService extends ServiceImpl + + + + + +