信访大屏后端1.8

src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaint12337Controller.java

@@ -0,0 +1,81 @@
+package com.biutag.supervision.controller.data;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.biutag.supervision.pojo.Result;
+import com.biutag.supervision.pojo.dto.DataDataPetitionComplainDistribute;
+import com.biutag.supervision.pojo.dto.DataDataPetitionComplainDistribute12337;
+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.DataPetition12337Vo;
+import com.biutag.supervision.service.DataPetition12337Service;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@RequiredArgsConstructor
+@RequestMapping("data/petitionComplaint12337")
+@RestController
+public class DataPetitionComplaint12337Controller {
+
+
+    private final DataPetition12337Service dataPetition12337Service;
+
+
+    /**
+     * 12337 分页列表
+     * @param queryParam
+     * @return
+     */
+    @GetMapping
+    public Result<Page<DataPetition12337Vo>> list(DataPetitionComplaintQueryParam queryParam) {
+        Page<DataPetition12337> dataPetition12337Page = dataPetition12337Service.page(queryParam);
+        Page<DataPetition12337Vo> dataPetition12337VoPage =null;
+        // 获取分页内容并转换为 DataPetition12337Vo 对象
+        if ( dataPetition12337Page !=null ){
+            List<DataPetition12337> records = dataPetition12337Page.getRecords();
+            ArrayList<DataPetition12337Vo> voList = new ArrayList<>();
+            for (DataPetition12337 oneRecord : records) {
+                DataPetition12337Vo dataPetition12337Vo = new DataPetition12337Vo();
+                BeanUtils.copyProperties(oneRecord,dataPetition12337Vo);
+                voList.add(dataPetition12337Vo);
+            }
+            dataPetition12337VoPage = new Page<>(dataPetition12337Page.getCurrent(), dataPetition12337Page.getSize(), dataPetition12337Page.getTotal());
+            dataPetition12337VoPage.setRecords(voList);
+        }
+
+        return Result.success(dataPetition12337VoPage);
+    }
+
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @DeleteMapping("{id}")
+    public Result<Boolean> del(@PathVariable String id) {
+        return Result.success(dataPetition12337Service.removeById(id));
+    }
+
+    /**
+     * 下发
+     */
+    @PostMapping("distribute")
+    public Result<Boolean> distribute(@RequestBody DataDataPetitionComplainDistribute12337 dataDistribute) {
+        return Result.success(dataPetition12337Service.distribution(dataDistribute));
+    }
+
+
+
+
+
+
+}

src/main/java/com/biutag/supervision/controller/datav/DataPetitionComplaintViewController.java

@@ -1,29 +1,30 @@
 package com.biutag.supervision.controller.datav;
 
 
-import cn.hutool.core.util.NumberUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.biutag.supervision.constants.enums.DepartGroupEnum;
 import com.biutag.supervision.constants.enums.RepeatEnum;
 import com.biutag.supervision.mapper.DataPetitionComplaintMapper;
 import com.biutag.supervision.pojo.Result;
 import com.biutag.supervision.pojo.dto.CaseVerifDepart;
-import com.biutag.supervision.pojo.entity.DataPetitionComplaint;
 import com.biutag.supervision.pojo.vo.RecentMailTrendByDayVo;
 import com.biutag.supervision.pojo.vo.RecentMailTrendByMonthVo;
 import com.biutag.supervision.service.DataPetitionComplaintService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -40,7 +41,6 @@ public class DataPetitionComplaintViewController {
 
     /**
      * 信访数据大屏统计
-     *
      * @param beginTime
      * @param endTime
      * @return
@@ -78,14 +78,10 @@ public class DataPetitionComplaintViewController {
     }
 
     /**
-     * 信访数据大屏信访趋势统计
+     * 信访数据大屏信访趋势统计（按日）
      */
     @GetMapping("/getRecentlyMailTrendByDay")
-    public Result<JSONObject> getRecentlyMailTrendByDay(@RequestParam Integer sourcesCode,
-                                                   @RequestParam Integer days,
-                                                   @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime,
-                                                   @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime
-    ) {
+    public Result<JSONObject> getRecentlyMailTrendByDay(@RequestParam Integer sourcesCode, @RequestParam Integer days, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
         JSONObject jsonObject = new JSONObject();
         // 库中的数据  2024/10/24   22
         List<RecentMailTrendByDayVo> recentMailTrendVoList = dataPetitionComplaintService.getRecentlyMailTrendByDay(sourcesCode, days, endTime);
@@ -115,11 +111,15 @@ public class DataPetitionComplaintViewController {
     }
 
 
-
+    /**
+     * 信访数据大屏信访趋势统计（按月）
+     *
+     * @param sourcesCode
+     * @param year
+     * @return
+     */
     @GetMapping("/getRecentlyMailTrendMonth")
-    public Result<JSONObject> getRecentlyMailTrendByMonth(@RequestParam Integer sourcesCode,
-                                                   @RequestParam Integer year
-    ) {
+    public Result<JSONObject> getRecentlyMailTrendByMonth(@RequestParam Integer sourcesCode, @RequestParam Integer year) {
         JSONObject jsonObject = new JSONObject();
         List<RecentMailTrendByMonthVo> recentMailTrendVoList = dataPetitionComplaintService.getRecentlyMailTrendByMonth(sourcesCode, String.valueOf(year));
         ArrayList<String> monthList = new ArrayList<>();
@@ -134,7 +134,50 @@ public class DataPetitionComplaintViewController {
     }
 
 
-
+    /**
+     * 信访数据大屏12337信访趋势统计（按月）
+     *
+     * @param year
+     * @return
+     */
+    @GetMapping("/getRecentlyMailTrendByMonth12337")
+    public Result<JSONObject> getRecentlyMailTrendByMonth12337(@RequestParam Integer year) {
+        JSONObject jsonObject = new JSONObject();
+        List<RecentMailTrendByMonthVo> recentMailTrendVoList = dataPetitionComplaintService.getRecentlyMailTrendByMonth12337(String.valueOf(year));
+        ArrayList<String> monthList = new ArrayList<>();
+        ArrayList<String> totalList = new ArrayList<>();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
+        // 要展示到的月份   从那个月开始
+        YearMonth endMonth = YearMonth.of(year, 12);
+        YearMonth startMonth = YearMonth.of(year, 1);
+        for (RecentMailTrendByMonthVo recentMailTrendByMonthVo : recentMailTrendVoList) {
+            YearMonth trendMonth = YearMonth.parse(recentMailTrendByMonthVo.getMonthTime(), formatter);
+            while (startMonth.isBefore(trendMonth)) {
+                String res = startMonth.format(formatter);
+                monthList.add(res);  // 添加到monthList
+                totalList.add("0"); // 插入没有数据的月份，总数为0
+                startMonth = startMonth.plusMonths(1);
+            }
+            String res = trendMonth.format(formatter);
+            monthList.add(res);
+            totalList.add(recentMailTrendByMonthVo.getTotal());
+            startMonth = trendMonth.plusMonths(1);
+        }
+        // 添加从最后一个有数据的月份到当前月份的缺失月份
+        while (!startMonth.isAfter(endMonth)) {
+            String res = startMonth.format(formatter);
+            monthList.add(res);  // 添加到monthList
+            totalList.add("0"); // 插入没有数据的月份，总数为0
+            startMonth = startMonth.plusMonths(1);
+        }
+        // 截取月份
+        List<String> monthOnlyList = monthList.stream()
+                .map(date -> date.substring(date.indexOf('-') + 1))
+                .collect(Collectors.toList());
+        jsonObject.fluentPut("monthList", monthOnlyList);
+        jsonObject.fluentPut("totalList", totalList);
+        return Result.success(jsonObject);
+    }
 
 
 }

src/main/java/com/biutag/supervision/controller/datav/DataScreenController.java

@@ -0,0 +1,45 @@
+package com.biutag.supervision.controller.datav;
+
+import com.biutag.supervision.pojo.Result;
+import com.biutag.supervision.service.DataScreenService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author: sh
+ * @date: 20224/11/5
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("datav/dataScreen")
+public class DataScreenController {
+
+
+    private final DataScreenService dataScreenService;
+
+
+    /**
+     * todo 获取地图数据
+     */
+    @GetMapping("/mapData")
+    public Result<List<Map<String, Object>>> mapData(@RequestParam Map<String, Object> params) {
+        if (params.isEmpty()) {
+            return Result.success(dataScreenService.mapData());
+        } else {
+            String deptId = params.get("id").toString();
+//            return Result.success(dataScreenService.mapCountyData(deptId));
+        }
+        return null;
+    }
+
+}

src/main/java/com/biutag/supervision/mapper/DataPetition12337Mapper.java

@@ -2,6 +2,10 @@ package com.biutag.supervision.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.biutag.supervision.pojo.entity.DataPetition12337;
+import com.biutag.supervision.pojo.vo.RecentMailTrendByMonthVo;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
 * @author 舒云
@@ -11,6 +15,14 @@ import com.biutag.supervision.pojo.entity.DataPetition12337;
 */
 public interface DataPetition12337Mapper extends BaseMapper<DataPetition12337> {
 
+
+    @Select("SELECT DATE_FORMAT(dpc.discover_time, '%Y-%m') AS monthTime, COUNT(*) total " +
+            "            FROM data_petition_12337 dpc " +
+            "            WHERE   YEAR(dpc.discover_time) = #{year} " +
+            "            GROUP BY monthTime " +
+            "            ORDER BY monthTime asc;")
+    List<RecentMailTrendByMonthVo> selectRecentlyMailTrendByMonth12337(String year);
+
 }
 
 

src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java

@@ -15,6 +15,7 @@ public interface DataPetitionComplaintMapper extends BaseMapper<DataPetitionComp
 
     /**
      * 查询初访重访
+     *
      * @param departId
      * @param Repeat
      * @param beginTime
@@ -32,6 +33,7 @@ public interface DataPetitionComplaintMapper extends BaseMapper<DataPetitionComp
 
     /**
      * 查询领导阅信接访
+     *
      * @param departId
      * @param beginTime
      * @param endTime
@@ -48,7 +50,7 @@ public interface DataPetitionComplaintMapper extends BaseMapper<DataPetitionComp
 
 
     /**
-     * 缠访闹访县局排行
+     * 缠访闹访分县市局排行
      * @param id
      * @param isEntanglement
      * @param beginTime
@@ -83,8 +85,6 @@ public interface DataPetitionComplaintMapper extends BaseMapper<DataPetitionComp
     List<RecentMailTrendByDayVo> selectRecentlyMailTrendByDay(Integer sourcesCode, String frontDay, String currentDay);
 
 
-
-
     @Select("SELECT DATE_FORMAT(dpc.discovery_time, '%Y-%m') AS monthTime, COUNT(*) total " +
             "FROM data_petition_complaint dpc " +
             "WHERE   YEAR(dpc.discovery_time) = #{year} " +
@@ -95,4 +95,5 @@ public interface DataPetitionComplaintMapper extends BaseMapper<DataPetitionComp
 
 
 
+
 }

src/main/java/com/biutag/supervision/pojo/dto/DataDataPetitionComplainDistribute12337.java

@@ -0,0 +1,38 @@
+package com.biutag.supervision.pojo.dto;
+
+import com.biutag.supervision.pojo.entity.DataPetition12337;
+import com.biutag.supervision.pojo.entity.DataPetitionComplaint;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author wxc
+ * @date 2024/10/24
+ */
+@Setter
+@Getter
+public class DataDataPetitionComplainDistribute12337 {
+
+    List<DataPetition12337> data = new ArrayList<>();
+
+    // 办理时限
+    @NotBlank
+    private String timeLimit;
+
+    // 最大签收时长(天)
+    private Integer maxSignDuration;
+
+    // 最大办理时长(天)
+    private Integer maxHandleDuration;
+
+    // 最大延期时长(天)
+    private Integer maxExtensionDuration;
+
+    // 审批流程
+    @NotBlank
+    private String approvalFlow;
+}

src/main/java/com/biutag/supervision/pojo/entity/DataCaseVerif.java

@@ -71,4 +71,8 @@ public class DataCaseVerif {
     // 分发状态
     private String distributionState;
 
+    // 是否属实
+    @TableField("is_real")
+    private Integer isReal;
+
 }

src/main/java/com/biutag/supervision/pojo/entity/DataPetition12337.java

@@ -3,9 +3,11 @@ package com.biutag.supervision.pojo.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * 
@@ -17,488 +19,593 @@ public class DataPetition12337 implements Serializable {
     /**
      * 唯一编号
      */
-    @TableId
-    private String only_id;
+    @TableId(value = "only_id")
+    private String onlyId;
 
     /**
      * 外网线索编号
      */
-    private String external_id;
+    @TableField(value = "external_id")
+    private String externalId;
 
     /**
      * 内网线索编号
      */
-    private String inner_id;
+    @TableField(value = "inner_id")
+    private String innerId;
 
     /**
      * 单机版线索编号
      */
-    private String stand_alone;
+    @TableField(value = "stand_alone")
+    private String standAlone;
 
     /**
      * 信息受理登记时间
      */
-    private String discover_time;
+    @TableField(value = "discover_time")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm")
+    private LocalDateTime discoverTime;
 
     /**
      * 线索来源
      */
-    private String letter_source;
+    @TableField(value = "letter_source")
+    private String letterSource;
 
     /**
      * 举报人姓名
      */
+    @TableField(value = "name")
     private String name;
 
     /**
      * 手机号码
      */
+    @TableField(value = "phone")
     private String phone;
 
     /**
      * 身份证号
      */
-    private String id_code;
+    @TableField(value = "id_code")
+    private String idCode;
 
     /**
      * 举报人（省）
      */
-    private String reporter_provincial;
+    @TableField(value = "reporter_provincial")
+    private String reporterProvincial;
 
     /**
      * 举报人（市）
      */
-    private String reporter_city;
+    @TableField(value = "reporter_city")
+    private String reporterCity;
 
     /**
      * 举报人（县）
      */
-    private String reporter_county;
+    @TableField(value = "reporter_county")
+    private String reporterCounty;
 
     /**
      * 现住地详址
      */
+    @TableField(value = "address")
     private String address;
 
     /**
      * 是否政法干警
      */
-    private String is_law_police;
+    @TableField(value = "is_law_police")
+    private String isLawPolice;
 
     /**
      * 被举报人姓名
      */
-    private String reported_name;
+    @TableField(value = "reported_name")
+    private String reportedName;
 
     /**
      * 所属系统
      */
-    private String belong_system;
+    @TableField(value = "belong_system")
+    private String belongSystem;
 
     /**
      * 人员类别
      */
-    private String person_type;
+    @TableField(value = "person_type")
+    private String personType;
 
     /**
      * 被举报人所在地（省）
      */
-    private String reported_provincial;
+    @TableField(value = "reported_provincial")
+    private String reportedProvincial;
 
     /**
      * 被举报人所在地（市）
      */
-    private String reported_city;
+    @TableField(value = "reported_city")
+    private String reportedCity;
 
     /**
      * 被举报人所在地（县）
      */
-    private String reported_county;
+    @TableField(value = "reported_county")
+    private String reportedCounty;
 
     /**
      * 单位名称
      */
-    private String org_name;
+    @TableField(value = "org_name")
+    private String orgName;
 
     /**
      * 单位所属层级
      */
-    private String org_level;
+    @TableField(value = "org_level")
+    private String orgLevel;
 
     /**
      * 具体职务
      */
-    private String job_name;
+    @TableField(value = "job_name")
+    private String jobName;
 
     /**
      * 职级
      */
-    private String job_level;
+    @TableField(value = "job_level")
+    private String jobLevel;
 
     /**
      * 被举报单位名称
      */
-    private String reported_org_name;
+    @TableField(value = "reported_org_name")
+    private String reportedOrgName;
 
     /**
      * 被举报单位所属系统
      */
-    private String reported_org_belong;
+    @TableField(value = "reported_org_belong")
+    private String reportedOrgBelong;
 
     /**
      * 被举报单位所在地（省）
      */
-    private String reported_org_provincial;
+    @TableField(value = "reported_org_provincial")
+    private String reportedOrgProvincial;
 
     /**
      * 被举报单位所在地（市）
      */
-    private String reported_org_city;
+    @TableField(value = "reported_org_city")
+    private String reportedOrgCity;
 
     /**
      * 被举报单位所在地（县）
      */
-    private String reported_org_county;
+    @TableField(value = "reported_org_county")
+    private String reportedOrgCounty;
 
     /**
      * 被举报单位单位所属层级
      */
-    private String reported_org_level;
+    @TableField(value = "reported_org_level")
+    private String reportedOrgLevel;
 
     /**
      * 涉嫌违纪问题项目
      */
-    private String against_pro_project;
+    @TableField(value = "against_pro_project")
+    private String againstProProject;
 
     /**
      * 涉嫌贪污贿赂类犯罪
      */
-    private String corruption_guilt;
+    @TableField(value = "corruption_guilt")
+    private String corruptionGuilt;
 
     /**
      * 涉嫌渎职类犯罪
      */
-    private String omission_guilt;
+    @TableField(value = "omission_guilt")
+    private String omissionGuilt;
 
     /**
      * 涉嫌侵犯公民人身权利类犯罪
      */
-    private String invade_entitlement_guilt;
+    @TableField(value = "invade_entitlement_guilt")
+    private String invadeEntitlementGuilt;
 
     /**
      * 涉嫌侵犯财产类犯罪
      */
-    private String invade_finance_guilt;
+    @TableField(value = "invade_finance_guilt")
+    private String invadeFinanceGuilt;
 
     /**
      * 其他
      */
-    private String other_guilt;
+    @TableField(value = "other_guilt")
+    private String otherGuilt;
 
     /**
      * 顽瘴痼疾项目
      */
-    private String hard_pro_project;
+    @TableField(value = "hard_pro_project")
+    private String hardProProject;
 
     /**
      * 涉嫌违纪违法事项
      */
-    private String wjwf_project;
+    @TableField(value = "wjwf_project")
+    private String wjwfProject;
 
     /**
      * 转办时间
      */
-    private String pass_time;
+    @TableField(value = "pass_time")
+    private String passTime;
 
     /**
      * 转办单位
      */
-    private String pass_org;
+    @TableField(value = "pass_org")
+    private String passOrg;
 
     /**
      * 核查时间
      */
-    private String review_time;
+    @TableField(value = "review_time")
+    private String reviewTime;
 
     /**
      * 核查单位
      */
-    private String review_org;
+    @TableField(value = "review_org")
+    private String reviewOrg;
 
     /**
      * 核查人
      */
-    private String review_person_name;
+    @TableField(value = "review_person_name")
+    private String reviewPersonName;
 
     /**
      * 核查人联系方式
      */
-    private String review_person_phone;
+    @TableField(value = "review_person_phone")
+    private String reviewPersonPhone;
 
     /**
      * 被核查人类别
      */
-    private String reviewed_person_type;
+    @TableField(value = "reviewed_person_type")
+    private String reviewedPersonType;
 
     /**
      * 被核查人是否属于领导班子成员
      */
-    private String reviewed_person_isleader;
+    @TableField(value = "reviewed_person_isleader")
+    private String reviewedPersonIsleader;
 
     /**
      * 是否核查完结
      */
-    private String reviewed_isover;
+    @TableField(value = "reviewed_isover")
+    private String reviewedIsover;
 
     /**
      * 核查简要情况
      */
-    private String review_des;
+    @TableField(value = "review_des")
+    private String reviewDes;
 
     /**
      * 办理结果
      */
-    private String process_result;
+    @TableField(value = "process_result")
+    private String processResult;
 
     /**
      * 是否进行线索初核
      */
-    private String is_first_view;
+    @TableField(value = "is_first_view")
+    private String isFirstView;
 
     /**
      * 核查组组长
      */
-    private String review_leader;
+    @TableField(value = "review_leader")
+    private String reviewLeader;
 
     /**
      * (核查组组长)联系方式
      */
-    private String review_leader_phone;
+    @TableField(value = "review_leader_phone")
+    private String reviewLeaderPhone;
 
     /**
      * 初核情况
      */
-    private String first_view_des;
+    @TableField(value = "first_view_des")
+    private String firstViewDes;
 
     /**
      * 是否立案审查调查
      */
-    private String is_register_case;
+    @TableField(value = "is_register_case")
+    private String isRegisterCase;
 
     /**
      * 立案审查调查情况
      */
-    private String register_case_des;
+    @TableField(value = "register_case_des")
+    private String registerCaseDes;
 
     /**
      * 是否处分处理
      */
-    private String is_punish;
+    @TableField(value = "is_punish")
+    private String isPunish;
 
     /**
      * 处理结论形态
      */
-    private String process_res_type;
+    @TableField(value = "process_res_type")
+    private String processResType;
 
     /**
      * 处理结论结果
      */
-    private String process_res_des;
+    @TableField(value = "process_res_des")
+    private String processResDes;
 
     /**
      * 处分处理情况
      */
-    private String punish_des;
+    @TableField(value = "punish_des")
+    private String punishDes;
 
     /**
      * 是否适用自查从宽政策
      */
-    private String is_tolerant;
+    @TableField(value = "is_tolerant")
+    private String isTolerant;
 
     /**
      * 是否办结
      */
-    private String is_over;
+    @TableField(value = "is_over")
+    private String isOver;
 
     /**
      * 联系时间
      */
-    private String contact_time;
+    @TableField(value = "contact_time")
+    private String contactTime;
 
     /**
      * 联系单位
      */
-    private String contact_org;
+    @TableField(value = "contact_org")
+    private String contactOrg;
 
     /**
      * 联系人
      */
-    private String contact_person_name;
+    @TableField(value = "contact_person_name")
+    private String contactPersonName;
 
     /**
      * 联系方式
      */
-    private String contact_type;
+    @TableField(value = "contact_type")
+    private String contactType;
 
     /**
      * 与举报人联系沟通详情
      */
-    private String contact_reporter_des;
+    @TableField(value = "contact_reporter_des")
+    private String contactReporterDes;
 
     /**
      * 超期未反馈原因
      */
-    private String overtime_reason;
+    @TableField(value = "overtime_reason")
+    private String overtimeReason;
 
     /**
      * 是否申请异议
      */
-    private String is_dissent;
+    @TableField(value = "is_dissent")
+    private String isDissent;
 
     /**
      * 目标省份
      */
-    private String aim_provincial;
+    @TableField(value = "aim_provincial")
+    private String aimProvincial;
 
     /**
      * 申请人
      */
-    private String apply_person_name;
+    @TableField(value = "apply_person_name")
+    private String applyPersonName;
 
     /**
      * 联系方式
      */
-    private String apply_person_phone;
+    @TableField(value = "apply_person_phone")
+    private String applyPersonPhone;
 
     /**
      * 申请原因
      */
-    private String apply_reason;
+    @TableField(value = "apply_reason")
+    private String applyReason;
 
     /**
      * 异议处理方式
      */
-    private String dissent_handle;
+    @TableField(value = "dissent_handle")
+    private String dissentHandle;
 
     /**
      * 处理说明
      */
-    private String dissent_handle_explain;
+    @TableField(value = "dissent_handle_explain")
+    private String dissentHandleExplain;
 
     /**
      * 是否存在附件
      */
-    private String is_annex;
+    @TableField(value = "is_annex")
+    private String isAnnex;
 
     /**
      * 附件文件名
      */
-    private String annex_name;
+    @TableField(value = "annex_name")
+    private String annexName;
 
     /**
      * 线索举报时间
      */
-    private String report_time;
+    @TableField(value = "report_time")
+    private String reportTime;
 
     /**
      * 导入时间
      */
-    private String enter_time;
+    @TableField(value = "enter_time")
+    private String enterTime;
 
     /**
      * 分发时间
      */
-    private String distribute_time;
+    @TableField(value = "distribute_time")
+    private String distributeTime;
 
     /**
      * 是否违纪违法线索
      */
-    private String is_against_clue;
+    @TableField(value = "is_against_clue")
+    private String isAgainstClue;
 
     /**
      * 是否涉法涉诉线索
      */
-    private String is_appeal_clue;
+    @TableField(value = "is_appeal_clue")
+    private String isAppealClue;
 
     /**
      * 是否范围外线索
      */
-    private String is_overround_clue;
+    @TableField(value = "is_overround_clue")
+    private String isOverroundClue;
 
     /**
      * 是否无效线索
      */
-    private String is_invalid_clue;
+    @TableField(value = "is_invalid_clue")
+    private String isInvalidClue;
 
     /**
      * 是否重点线索
      */
-    private String is_important_clue;
+    @TableField(value = "is_important_clue")
+    private String isImportantClue;
 
     /**
      * 线索是否重复
      */
-    private String is_repeat_clue;
+    @TableField(value = "is_repeat_clue")
+    private String isRepeatClue;
 
     /**
      * 重复线索组别
      */
-    private String repeat_clue_type;
+    @TableField(value = "repeat_clue_type")
+    private String repeatClueType;
 
     /**
      * 线索是否进行了机筛
      */
-    private String is_machine;
+    @TableField(value = "is_machine")
+    private String isMachine;
 
     /**
      * 机筛线索时间
      */
-    private String machine_tme;
+    @TableField(value = "machine_tme")
+    private String machineTme;
 
     /**
      * 线索是否经过人工筛查
      */
-    private String is_person;
+    @TableField(value = "is_person")
+    private String isPerson;
 
     /**
      * 人工筛查线索时间
      */
-    private String person_time;
+    @TableField(value = "person_time")
+    private String personTime;
 
     /**
      * 是否关注线索
      */
-    private String is_care;
+    @TableField(value = "is_care")
+    private String isCare;
 
     /**
      * 关注时间
      */
-    private String care_time;
+    @TableField(value = "care_time")
+    private String careTime;
 
     /**
      * 操作时间
      */
-    private String handle_time;
+    @TableField(value = "handle_time")
+    private String handleTime;
 
     /**
      * 二级机构id
      */
-    private String second_depart_id;
+    @TableField(value = "second_depart_id")
+    private String secondDepartId;
 
     /**
      * 二级机构名字
      */
-    private String second_depart_name;
+    @TableField(value = "second_depart_name")
+    private String secondDepartName;
 
     /**
      * 三级机构id
      */
-    private String third_depart_id;
+    @TableField(value = "third_depart_id")
+    private String thirdDepartId;
 
     /**
      * 三级机构简称
      */
-    private String third_depart_name;
+    @TableField(value = "third_depart_name")
+    private String thirdDepartName;
+
+
+    /**
+     * 下发状态
+     */
+    @TableField(value = "distributionState")
+    private String distributionState;
+
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

src/main/java/com/biutag/supervision/pojo/param/DataCaseVerifQueryParam.java

@@ -20,4 +20,6 @@ public class DataCaseVerifQueryParam extends BasePage {
     private String thingDesc;
 
     private String distributionState;
+
+    private String checkStatus; // 是否属实
 }

src/main/java/com/biutag/supervision/pojo/vo/DataPetition12337Vo.java

@@ -0,0 +1,173 @@
+package com.biutag.supervision.pojo.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 
+ * @TableName data_petition_12337
+ */
+@Data
+public class DataPetition12337Vo implements Serializable {
+    /**
+     * 唯一编号
+     */
+    private String onlyId;
+
+
+
+    /**
+     * 信息受理登记时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm")
+    private LocalDateTime discoverTime;
+
+    /**
+     * 线索来源
+     */
+    private String letterSource;
+
+    /**
+     * 举报人姓名
+     */
+    private String name;
+
+    /**
+     * 手机号码
+     */
+    private String phone;
+
+    /**
+     * 身份证号
+     */
+    private String idCode;
+
+    /**
+     * 现住地详址
+     */
+    private String address;
+
+
+
+    /**
+     * 被举报人姓名
+     */
+    private String reportedName;
+
+
+
+    /**
+     * 人员类别
+     */
+    private String personType;
+
+
+
+    /**
+     * 单位名称
+     */
+    private String orgName;
+
+
+    /**
+     * 具体职务
+     */
+    private String jobName;
+
+
+
+    /**
+     * 被举报单位名称
+     */
+    private String reportedOrgName;
+
+
+
+    /**
+     * 涉嫌违纪问题项目
+     */
+    private String againstProProject;
+
+    /**
+     * 涉嫌贪污贿赂类犯罪
+     */
+    private String corruptionGuilt;
+
+    /**
+     * 涉嫌渎职类犯罪
+     */
+    private String omissionGuilt;
+
+    /**
+     * 涉嫌侵犯公民人身权利类犯罪
+     */
+    private String invadeEntitlementGuilt;
+
+    /**
+     * 涉嫌侵犯财产类犯罪
+     */
+    private String invadeFinanceGuilt;
+
+    /**
+     * 其他
+     */
+    private String otherGuilt;
+
+    /**
+     * 顽瘴痼疾项目
+     */
+    private String hardProProject;
+
+    /**
+     * 涉嫌违纪违法事项
+     */
+    private String wjwfProject;
+
+
+
+    /**
+     * 办理结果
+     */
+    private String processResult;
+
+
+    /**
+     * 是否办结
+     */
+    private String isOver;
+
+    /**
+     * 二级机构id
+     */
+    private String secondDepartId;
+
+    /**
+     * 二级机构名字
+     */
+    private String secondDepartName;
+
+    /**
+     * 三级机构id
+     */
+    private String thirdDepartId;
+
+    /**
+     * 三级机构简称
+     */
+    private String thirdDepartName;
+
+    /**
+     * 下发状态
+     */
+    private String distributionState;
+
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/biutag/supervision/service/DataCaseVerifService.java

@@ -32,6 +32,7 @@ public class DataCaseVerifService extends ServiceImpl<DataCaseVerifMapper, DataC
         LambdaQueryWrapper<DataCaseVerif> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.like(StrUtil.isNotBlank(queryParam.getOriginId()), DataCaseVerif::getOriginId, queryParam.getOriginId())
                 .like(StrUtil.isNotBlank(queryParam.getThingDesc()), DataCaseVerif::getThingDesc, queryParam.getThingDesc())
+                .eq(StrUtil.isNotBlank(queryParam.getCheckStatus()), DataCaseVerif::getIsReal, queryParam.getCheckStatus())
                 .eq(StrUtil.isNotBlank(queryParam.getDistributionState()), DataCaseVerif::getDistributionState, queryParam.getDistributionState())
                 .orderByDesc(DataCaseVerif::getCreateTime);
         return page(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper);

src/main/java/com/biutag/supervision/service/DataPetition12337Service.java

@@ -0,0 +1,105 @@
+package com.biutag.supervision.service;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.biutag.supervision.constants.enums.DistributionStateEnum;
+import com.biutag.supervision.constants.enums.HostLevelEnums;
+import com.biutag.supervision.constants.enums.ProblemSourcesEnum;
+import com.biutag.supervision.mapper.DataPetition12337Mapper;
+import com.biutag.supervision.pojo.dto.DataDataPetitionComplainDistribute;
+import com.biutag.supervision.pojo.dto.DataDataPetitionComplainDistribute12337;
+import com.biutag.supervision.pojo.dto.NegativeDto;
+import com.biutag.supervision.pojo.entity.DataPetition12337;
+import com.biutag.supervision.pojo.entity.DataPetitionComplaint;
+import com.biutag.supervision.pojo.param.DataPetitionComplaintQueryParam;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author 舒云
+ * @description 针对表【data_petition_12337】的数据库操作Service实现
+ * @createDate 2024-11-04 10:50:37
+ */
+@Service
+@RequiredArgsConstructor
+public class DataPetition12337Service extends ServiceImpl<DataPetition12337Mapper, DataPetition12337> {
+    private final NegativeService negativeService;
+
+    public Page<DataPetition12337> page(DataPetitionComplaintQueryParam queryParam) {
+        LambdaQueryWrapper<DataPetition12337> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.like(StrUtil.isNotBlank(queryParam.getOriginId()), DataPetition12337::getOnlyId, queryParam.getOriginId())
+                .like(StrUtil.isNotBlank(queryParam.getThingDesc()), DataPetition12337::getWjwfProject, queryParam.getThingDesc())
+                // 按创建时间倒序排序
+                .orderByDesc(DataPetition12337::getDiscoverTime);
+        // 如果 discoveryTime 有两个值（表示时间范围），则添加范围查询条件
+        if (queryParam.getDiscoveryTime().size() == 2) {
+            queryWrapper.between(DataPetition12337::getDiscoverTime, queryParam.getDiscoveryTime().get(0), queryParam.getDiscoveryTime().get(1));
+        }
+
+        // 如果 responderKey 和 responderValue 都不为空，则根据 responderKey 匹配相应的字段
+        if (StrUtil.isNotBlank(queryParam.getResponderKey()) && StrUtil.isNotBlank(queryParam.getResponderValue())) {
+            switch (queryParam.getResponderKey()) {
+                case "name":
+                    queryWrapper.like(DataPetition12337::getName, queryParam.getResponderValue());
+                    break;
+                case "phone":
+                    queryWrapper.like(DataPetition12337::getPhone, queryParam.getResponderValue());
+                    break;
+            }
+        }
+        return page(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper);
+    }
+
+
+    /**
+     * 下发
+     * @param dataDistribute
+     * @return
+     */
+    public boolean distribution(DataDataPetitionComplainDistribute12337 dataDistribute) {
+        dataDistribute.getData().forEach(item -> {
+            NegativeDto negativeDto = new NegativeDto();
+            negativeDto.setOriginId(item.getOnlyId());
+            negativeDto.setDiscoveryTime(item.getDiscoverTime());
+            negativeDto.setProblemSourcesCode("24");
+            negativeDto.setProblemSources("12337信访");
+//            negativeDto.setBusinessTypeCode(BusinessTypeEnum.ABWW);
+//            negativeDto.setBusinessTypeName();
+            negativeDto.setResponderName(item.getName());
+            negativeDto.setContactPhone(item.getPhone());
+            negativeDto.setThingDesc(item.getWjwfProject());
+            String departId;
+            String departName;
+            if (StrUtil.isBlank(item.getThirdDepartId())) {
+                departId = item.getSecondDepartId();
+                departName = item.getSecondDepartName();
+            } else {
+                departId = item.getThirdDepartId();
+                departName = item.getThirdDepartName();
+            }
+            negativeDto.setInvolveDepartId(departId);
+            negativeDto.setInvolveDepartName(departName);
+            negativeDto.setHostLevel(HostLevelEnums.SECOND.getValue());
+
+            negativeDto.setApprovalFlow(dataDistribute.getApprovalFlow());
+            negativeDto.setDepartId(departId);
+            negativeDto.setDepartName(departName);
+            negativeDto.setTimeLimit(dataDistribute.getTimeLimit());
+            negativeDto.setMaxSignDuration(dataDistribute.getMaxSignDuration());
+            negativeDto.setMaxHandleDuration(dataDistribute.getMaxHandleDuration());
+            negativeDto.setMaxExtensionDuration(dataDistribute.getMaxExtensionDuration());
+            negativeDto.setCaseNumber(item.getOnlyId());
+            negativeService.save(negativeDto);
+            update(new LambdaUpdateWrapper<DataPetition12337>().eq(DataPetition12337::getOnlyId, item.getOnlyId())
+                    .set(DataPetition12337::getDistributionState, DistributionStateEnum.DISTRIBUTED.getValue()));
+        });
+        return true;
+    }
+}
+
+
+
+

src/main/java/com/biutag/supervision/service/DataPetition12337ServiceImpl.java

@@ -1,22 +0,0 @@
-package com.biutag.supervision.service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.biutag.supervision.mapper.DataPetition12337Mapper;
-import com.biutag.supervision.pojo.entity.DataPetition12337;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-/**
- * @author 舒云
- * @description 针对表【data_petition_12337】的数据库操作Service实现
- * @createDate 2024-11-04 10:50:37
- */
-@Service
-@RequiredArgsConstructor
-public class DataPetition12337ServiceImpl extends ServiceImpl<DataPetition12337Mapper, DataPetition12337> {
-
-}
-
-
-
-

src/main/java/com/biutag/supervision/service/DataPetitionComplaintService.java

@@ -164,18 +164,18 @@ public class DataPetitionComplaintService extends ServiceImpl<DataPetitionCompla
         leaderViewQueryWrapper.isNotNull("receiving_leader_name");
         leaderViewQueryWrapper.between("discovery_time", beginTime, endTime);
         Long leaderViewMail = dataPetitionComplaintMapper.selectCount(leaderViewQueryWrapper);
-        // 闹访  1：闹  2：不闹
+        // 闹访  1：闹  0：不闹
         QueryWrapper<DataPetitionComplaint> tangleQueryWrapper = new QueryWrapper<>();
         tangleQueryWrapper.eq("entanglement_visits", 1);
         tangleQueryWrapper.between("discovery_time", beginTime, endTime);
         Long tangleMail = dataPetitionComplaintMapper.selectCount(tangleQueryWrapper);
-        // 集访   1：集    2：不集
+        // 集访   1：集    0：不集
         QueryWrapper<DataPetitionComplaint> massQueryWrapper = new QueryWrapper<>();
         massQueryWrapper.eq("mass_visits", 1);
         massQueryWrapper.between("discovery_time", beginTime, endTime);
         Long massMail = dataPetitionComplaintMapper.selectCount(massQueryWrapper);
         // 总数
-        long totalMail = countryMail+policeMail+5534+total12337;
+        long totalMail = countryMail+policeMail+total12337;
 
         JSONObject overview = new JSONObject()
                 // 信访总数（起）
@@ -224,9 +224,17 @@ public class DataPetitionComplaintService extends ServiceImpl<DataPetitionCompla
         return recentMailTrendVos;
     }
 
+    // 按月统计信访趋势
     public List<RecentMailTrendByMonthVo> getRecentlyMailTrendByMonth(Integer sourcesCode, String year) {
         List<RecentMailTrendByMonthVo> recentMailTrendVos =
                 dataPetitionComplaintMapper.selectRecentlyMailTrendByMonth(MailTrendSourcesEnum.getMappedCodeByCode(sourcesCode), year);
         return recentMailTrendVos;
     }
+
+
+    public List<RecentMailTrendByMonthVo> getRecentlyMailTrendByMonth12337(String year) {
+        List<RecentMailTrendByMonthVo> recentMailTrendVos =
+                dataPetition12337Mapper.selectRecentlyMailTrendByMonth12337(year);
+        return recentMailTrendVos;
+    }
 }

src/main/java/com/biutag/supervision/service/DataScreenService.java

@@ -0,0 +1,18 @@
+package com.biutag.supervision.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@RequiredArgsConstructor
+@Service
+public class DataScreenService extends ServiceImpl {
+
+
+    public List<Map<String, Object>> mapData() {
+      return null;
+    }
+}