1、国家信访投诉，数据批量导入（根据国家信访模板）以及问题批量下发功能完善；

2、公安局信访投诉，数据批量导入（根据公安信访模板）以及问题批量下发功能完善；

3、组织机构管理新增照片上传功能，在单位问题详情照片展示；

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<Page<DataPetitionComplaint>> list(DataPetitionComplaintQueryParam queryParam) {
+    public Result<Page<DataPetitionComplaintVo>> list(DataPetitionComplaintQueryParam queryParam) {
         return Result.success(dataPetitionComplaintService.page(queryParam));
     }
 

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<SupPolice> 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());

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<DataPetitionComplaint> {
 
 
+    Page<DataPetitionComplaintVo> queryPage(@Param("page") Page<DataPetitionComplaint> page, @Param(Constants.WRAPPER) QueryWrapper<DataPetitionComplaint> queryWrapper);
+
     /**
      * 查询初访重访
      *

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;
         // 副所长

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<String> involveProblem;
+
+    private String policeType;
 }

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;

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;
 }

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;

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;
+
 }

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;
+
+}

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<DepartTree> children = new ArrayList<>();
 
     private boolean hasChildren = false;

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<DataPetitionCompla
 
     private final DataPetition12337Mapper dataPetition12337Mapper;
 
-    public Page<DataPetitionComplaint> page(DataPetitionComplaintQueryParam queryParam) {
+    public Page<DataPetitionComplaintVo> page(DataPetitionComplaintQueryParam queryParam) {
-        LambdaQueryWrapper<DataPetitionComplaint> queryWrapper = new LambdaQueryWrapper<>();
+        QueryWrapper<DataPetitionComplaint> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(DataPetitionComplaint::getProblemSourcesCode, queryParam.getProblemSourcesCode())
+        queryWrapper.eq("pc.problem_sources_code", queryParam.getProblemSourcesCode())
-                .like(StrUtil.isNotBlank(queryParam.getOriginId()), DataPetitionComplaint::getOriginId, queryParam.getOriginId())
+                .like(StrUtil.isNotBlank(queryParam.getOriginId()), "pc.origin_Id", queryParam.getOriginId())
-                .like(StrUtil.isNotBlank(queryParam.getThingDesc()), DataPetitionComplaint::getThingDesc, queryParam.getThingDesc())
+                .like(StrUtil.isNotBlank(queryParam.getThingDesc()), "pc.thing_desc", queryParam.getThingDesc())
-                .orderByDesc(DataPetitionComplaint::getCreateTime);
+                .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<DataPetitionCompla
             negativeDto.setDiscoveryTime(item.getDiscoveryTime());
             negativeDto.setProblemSourcesCode(item.getProblemSourcesCode());
             negativeDto.setProblemSources(ProblemSourcesEnum.get(item.getProblemSourcesCode()).getLabel());
-//            negativeDto.setBusinessTypeCode(BusinessTypeEnum.ABWW);
+            negativeDto.setBusinessTypeCode(dataDistribute.getBusinessTypeCode());
-//            negativeDto.setBusinessTypeName();
+            negativeDto.setBusinessTypeName(dataDistribute.getBusinessTypeName());
+            negativeDto.setPoliceType(dataDistribute.getPoliceType());
+            negativeDto.setInvolveProblem(dataDistribute.getInvolveProblem());
             negativeDto.setResponderName(item.getResponderName());
             negativeDto.setContactPhone(item.getResponderPhone());
             negativeDto.setThingDesc(item.getThingDesc());

src/main/resources/mapper/DataPetitionComplaintMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.biutag.supervision.mapper.DataPetitionComplaintMapper">
+
+    <select id="queryPage" resultType="com.biutag.supervision.pojo.vo.DataPetitionComplaintVo">
+        SELECT
+            pc.*, n.id negative_id
+        FROM
+            data_petition_complaint pc
+                LEFT JOIN negative n ON n.originId = pc.origin_id
+            ${ew.getCustomSqlSegment}
+    </select>
+
+</mapper>