fix:1、禁闭管理涉及问题下发； 2、信访大屏数字布局调整；3、信访大屏湖南地图数据展示

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

@@ -113,7 +113,7 @@ public class DataVMailViewController {
      */
     @Operation(summary = "信访数据中央地图小图标数据")
     @GetMapping("/getMailMapIcon")
-    @Cacheable(cacheNames = "Supervision:Screen:MailMap", key = "#beginTime.getTime()+'_'+#endTime.getTime()")
+//    @Cacheable(cacheNames = "Supervision:Screen:MailMap", key = "#beginTime.getTime()+'_'+#endTime.getTime()")
     public Result<JSONObject> getMailMapIcon(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
                                              @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
         // 信访数据总数概览

src/main/java/com/biutag/supervision/controller/work/ConfinementController.java

@@ -56,6 +56,15 @@ public class ConfinementController {
     public Result<Page<ConfinementVo>> list(ConfinementQueryParam param) {
         return Result.success(confinementService.page(param));
     }
+
+    /**
+     * 无用户权限判断的分页查询
+     * */
+    @GetMapping("listALl")
+    public Result<Page<ConfinementVo>> listAll(ConfinementQueryParam param){
+        return Result.success(confinementService.GetExportData(param));
+
+    }
     /**
      * 新增
      * */

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

@@ -191,10 +191,10 @@ public interface DataPetitionComplaintMapper extends BaseMapper<DataPetitionComp
 
     @Select("select  count(*)  " +
             "from data_petition_complaint dpc  " +
-            "LEFT JOIN sup_depart sd ON dpc.third_depart_id=sd.id " +
+            "LEFT JOIN sup_depart sd ON dpc.second_depart_id=sd.id " +
             "where problem_sources_code=#{problemSourcesCode} " +
-            "and sd.pid=#{departId} " +
-            "and discovery_time BETWEEN #{beginTime} AND #{endTime} ")
+            "and sd.id=#{departId} " +
+            "and create_time BETWEEN #{beginTime} AND #{endTime} ")
     Long selectMailBySourceCode(Date beginTime, Date endTime, String problemSourcesCode, String departId);
 
 

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

@@ -30,6 +30,6 @@ public interface SupExternalDepartMapper extends BaseMapper<SupExternalDepart> {
      * @param source
      * @return
      */
-    @Select("SELECT external_id FROM sup_external_depart sed WHERE source=#{source} AND internal_id =#{departId}")
+    @Select("SELECT external_id FROM sup_external_depart sed WHERE sed.source=#{source} AND sed.internal_id =#{departId}")
     String getExIdByInId(String departId, String source);
 }

src/main/java/com/biutag/supervision/pojo/domain/Blame.java

@@ -38,6 +38,12 @@ public class Blame {
     // 涉及人部门名称
     private String blameDepartName;
 
+    //涉及禁闭id
+    private String confinementId;
+
+    //领导禁闭id
+    private String leadConfinementId;
+
     // 人员属性
     private String ivPersonType;
 

src/main/java/com/biutag/supervision/pojo/domain/NegativeVo.java

@@ -53,6 +53,10 @@ public class NegativeVo {
 
     // 涉及人身份证
     private String responderIdCard;
+    //涉及禁闭id
+    private String confinementId;
+    //领导禁闭id
+    private String leadConfinementId;
 
     // 业务类型
     private String businessTypeCode;

src/main/java/com/biutag/supervision/pojo/dto/flow/VerifyData.java

@@ -1,5 +1,6 @@
 package com.biutag.supervision.pojo.dto.flow;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.biutag.supervision.pojo.vo.FileVo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.NotBlank;
@@ -126,6 +127,11 @@ public class VerifyData {
         @NotBlank
         private String superviseMeasuresName;
 
+        //涉及禁闭id
+        private String confinementId;
+        //领导禁闭id
+        private String leadConfinementId;
+
         // 主观方面
         @NotBlank
         private String subjectiveAspectCode;

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

@@ -25,6 +25,13 @@ public class NegativeBlame {
     @TableField("blameFlag")
     private String blameFlag;
 
+    //涉及禁闭id
+    @TableField("confinementId")
+    private String confinementId;
+    //领导禁闭id
+    @TableField("leadConfinementId")
+    private String leadConfinementId;
+
     // 涉及人员
     @TableField("involveFlag")
     private String involveFlag;

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

@@ -1,5 +1,6 @@
 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.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -56,10 +57,6 @@ public class DataMailService extends ServiceImpl<DataPetitionComplaintMapper, Da
         Long countryMail = dataPetitionComplaintMapper.selectCount(countryQueryWrapper);
 
 
-
-
-
-
         // 公安部信访
         QueryWrapper<DataPetitionComplaint> policeQueryWrapper = new QueryWrapper<>();
         policeQueryWrapper.eq("problem_sources_code", 22);
@@ -93,13 +90,31 @@ public class DataMailService extends ServiceImpl<DataPetitionComplaintMapper, Da
             String departId = re.getDepartId();
             Long countryTotal = dataPetitionComplaintMapper.selectMailBySourceCode(beginTime, endTime, GJXFPT.getValue(), departId);
             Long policeTotal = dataPetitionComplaintMapper.selectMailBySourceCode(beginTime, endTime, GABXF.getValue(), departId);
-            Long commissionerTotal = getCommissionerTotal(beginTime, endTime, re);
-            Long numTotal = dataPetition12337Mapper.select12337MailBySourceCode(beginTime, endTime, departId);
+
+//            Long commissionerTotal = getCommissionerTotal(beginTime, endTime, re);
+
+//            Long numTotal = dataPetition12337Mapper.select12337MailBySourceCode(beginTime, endTime, departId);
+
+            // 12337
+            Long numTotal = negativeService.count(new LambdaQueryWrapper<Negative>().between(Negative::getCrtTime, beginTime, endTime).eq(Negative::getHandleSecondDepartId,departId).eq(Negative::getProblemSourcesCode, ProblemSourcesEnum.XF12337.getValue()));
+            // 局长信箱
+            Long commissionerTotal = negativeService.count(new LambdaQueryWrapper<Negative>().between(Negative::getCrtTime, beginTime, endTime).eq(Negative::getHandleSecondDepartId,departId).eq(Negative::getProblemSourcesCode, ProblemSourcesEnum.JZXX.getValue()));
+
+
+
             Long total = countryTotal + policeTotal + commissionerTotal + numTotal;
+            //国家信访
             re.setCountryTotal(countryTotal.toString());
+            //公安部信访
             re.setPoliceTotal(policeTotal.toString());
+            //局长信箱
             re.setCommissionerTotal(commissionerTotal.toString());
+            //12337信访
             re.setNumTotal(numTotal.toString());
+
+
+
+
             re.setTotal(total.toString());
         }
         return res;
@@ -110,11 +125,16 @@ public class DataMailService extends ServiceImpl<DataPetitionComplaintMapper, Da
         // 1、查出这个VO里面的departID所对应的局长信箱的部门ID
         String exDepartId = supExternalDepartMapper.getExIdByInId(re.getDepartId(), EX_SOURCE);
         // 2、按照时间来看看有多少条数据
+        if(StrUtil.isNotEmpty(exDepartId)){
             QueryWrapper<Mail> mailWrapper = new QueryWrapper<>();
             mailWrapper.between("create_time", beginTime, endTime);
             mailWrapper.eq("mail_state", VALID_SIGN);
             mailWrapper.eq("second_dept_id", exDepartId);
             return mailMapper.selectCount(mailWrapper);
+        }else{
+            return 0L;
+        }
+
     }