fix: 1、视频督察地图详情、地图涉及数据调整和优化；2、现场督察统计周期调整、拒绝问题涉及方面数据不准、涉企问题数据不准的问题；3、民意感知项目下发的排序；4、信访投诉的台帐导入功能完善。

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

@@ -108,12 +108,35 @@ public class DataPetitionComplaintController {
                         }
                     }
                 } else {
-                    if (StrUtil.isNotBlank(data.getTurnAround())) {
-                        String departPart = data.getTurnAround().replace("公安", "");
+                    //具体承办单位
+                    if (StrUtil.isNotBlank(data.getHandleDepartName())){
+                        String deparPart = data.getHandleDepartName().replace("长沙市公安局", "").replace("公安","");;
+                        List<SupDepart> departs = departService.list(new LambdaQueryWrapper<SupDepart>().like(SupDepart::getShortName,deparPart));
+                        if (departs.size() == 1) {
+                            data.setDepartId(departs.get(0).getId());
+                        }
+                    }
+                    else if (StrUtil.isNotBlank(data.getTurnAround())) {
+                        //转往处
+                        String departPart = data.getTurnAround().replace("长沙市公安局", "").replace("公安","");
                         List<SupDepart> departs = departService.list(new LambdaQueryWrapper<SupDepart>().eq(SupDepart::getShortName, departPart));
                         if (departs.size() == 1) {
                             data.setDepartId(departs.get(0).getId());
                         }
+                    }else {
+
+                        if (!"长沙市公安局".equals(data.getRegister())){
+                            String departPart;
+                            departPart = data.getRegister().replace("长沙市公安局", "").replace("公安", "");
+                            List<SupDepart> departs = departService.list(new LambdaQueryWrapper<SupDepart>().eq(SupDepart::getShortName, departPart));
+                            if (departs.size() == 1) {
+                                data.setDepartId(departs.get(0).getId());
+                            }
+                        }
+
+
+
+
                     }
                 }
 

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

@@ -1,5 +1,6 @@
 package com.biutag.supervision.controller.datav;
 
+import cn.hutool.core.date.DateTime;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.biutag.supervision.mapper.NegativeMapper;
@@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
@@ -32,9 +34,10 @@ public class DataVJwpyController {
     @GetMapping
     public Result<JSONObject> selectDistribution(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
                                                  @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime){
+
         List<DistributionVo> list = negativeMapper.getDistributionByTime(beginTime,endTime);
         List<SupDictData> supDictDataList =   supDictDataService.list( new LambdaQueryWrapper<SupDictData>().eq(SupDictData::getDictType,"businessType"));
-        list.forEach(s->{
+        list.stream().sorted(Comparator.comparingInt(DistributionVo::getTotalNum).reversed()).forEach(s->{
             Optional<SupDictData> supDictData =   supDictDataList.stream().filter(v->v.getDictValue().equals(s.getName())).findFirst();
             supDictData.ifPresent(dictData -> s.setName(dictData.getDictLabel()));
         });

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

@@ -122,9 +122,16 @@ public class DataVVideoSuperviseController {
     @GetMapping("/getVideoSuperviseMap")
     public Result<JSONObject> getVideoSuperviseMap(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
                                                    @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
+        endTime =DateUtil.endOfDay(endTime);
         // 地图数据
         List<VideoSuperviseMapIconVo> videoSuperviseMapIconVoList = Optional.ofNullable(negativeMapper.getVideoSuperviseMapIconInfo(beginTime, endTime)).
                 orElseGet(ArrayList::new);
+        List<EchartsVo> list =negativeMapper.selectRelativePer(beginTime,endTime);
+        videoSuperviseMapIconVoList.forEach(s->{
+          int relativePer =   list.stream().filter(b->b.getName().contains(s.getDepartId())).toList().get(0).getValue();
+          s.setRelativePer(relativePer);
+        });
+
         JSONObject data = new JSONObject().fluentPut("videoSuperviseMapIconVoList", videoSuperviseMapIconVoList);
         return Result.success(data);
     }

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

@@ -282,6 +282,21 @@ public interface NegativeMapper extends BaseMapper<Negative> {
             "GROUP BY sd.short_name; ")
     List<VideoSuperviseMapIconVo> getVideoSuperviseMapIconInfo(Date beginTime, Date endTime);
 
+    /**
+     * 涉及人
+     * */
+    @Select(" select " +
+            " sup.id as name, " +
+            " count(*) as value " +
+            " from negative_problem_relation npr " +
+            " LEFT JOIN negative ng on npr.negativeId = ng.id " +
+            " LEFT JOIN sup_depart sup on sup.id = ng.second_involve_depart_id  " +
+            " WHERE " +
+            " ng.crtTime BETWEEN #{beginTime} AND #{endTime} " +
+            " and sup.statistics_group_id = 3 " +
+            " GROUP BY sup.id "
+            )
+    List<EchartsVo> selectRelativePer(Date beginTime, Date endTime);
 
 // endregion
 

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

@@ -43,6 +43,8 @@ public class DataPetitionComplaintImportDto {
     @ExcelProperty({"信访日期"})
     private String discoveryTime;
 
+    @ExcelProperty({"登记单位"})
+    private String register;
 
     // 问题发生地
     @ExcelProperty({"问题发生地"})
@@ -95,4 +97,4 @@ public class DataPetitionComplaintImportDto {
     private String departId;
 
 
-}
+}

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

@@ -9,10 +9,10 @@ public class DistributionVo {
     //项目类型名
     private String name;
     //查实数
-    private String checkStatusNum;
+    private int checkStatusNum;
     //办结数
-    private String processingNum;
+    private int processingNum;
     //总数
-    private String totalNum;
+    private int totalNum;
 
 }