diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVMailViewController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVMailViewController.java index 36ce3c2..9ee6547 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVMailViewController.java +++ b/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 getMailMapIcon(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { // 信访数据总数概览 diff --git a/src/main/java/com/biutag/supervision/controller/work/ConfinementController.java b/src/main/java/com/biutag/supervision/controller/work/ConfinementController.java index c2f8a78..eeba1da 100644 --- a/src/main/java/com/biutag/supervision/controller/work/ConfinementController.java +++ b/src/main/java/com/biutag/supervision/controller/work/ConfinementController.java @@ -56,6 +56,15 @@ public class ConfinementController { public Result> list(ConfinementQueryParam param) { return Result.success(confinementService.page(param)); } + + /** + * 无用户权限判断的分页查询 + * */ + @GetMapping("listALl") + public Result> listAll(ConfinementQueryParam param){ + return Result.success(confinementService.GetExportData(param)); + + } /** * 新增 * */ diff --git a/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java b/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java index a2def7a..b9714d3 100644 --- a/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java @@ -191,10 +191,10 @@ public interface DataPetitionComplaintMapper extends BaseMapper { * @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); -} \ No newline at end of file +} diff --git a/src/main/java/com/biutag/supervision/pojo/domain/Blame.java b/src/main/java/com/biutag/supervision/pojo/domain/Blame.java index ddc660c..21eaa20 100644 --- a/src/main/java/com/biutag/supervision/pojo/domain/Blame.java +++ b/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; diff --git a/src/main/java/com/biutag/supervision/pojo/domain/NegativeVo.java b/src/main/java/com/biutag/supervision/pojo/domain/NegativeVo.java index ddda479..8914886 100644 --- a/src/main/java/com/biutag/supervision/pojo/domain/NegativeVo.java +++ b/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; diff --git a/src/main/java/com/biutag/supervision/pojo/dto/flow/VerifyData.java b/src/main/java/com/biutag/supervision/pojo/dto/flow/VerifyData.java index 37a6724..41360aa 100644 --- a/src/main/java/com/biutag/supervision/pojo/dto/flow/VerifyData.java +++ b/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; diff --git a/src/main/java/com/biutag/supervision/pojo/entity/NegativeBlame.java b/src/main/java/com/biutag/supervision/pojo/entity/NegativeBlame.java index 7b02caf..065b56a 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/NegativeBlame.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/NegativeBlame.java @@ -13,11 +13,11 @@ import java.time.LocalDateTime; @Getter public class NegativeBlame { - // + // @TableId("blameId") private String blameId; - // + // @TableField("negativeId") private String negativeId; @@ -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; @@ -224,23 +231,23 @@ public class NegativeBlame { @TableField("statisticsPersonType") private String statisticsPersonType; - // + // @TableField("crtTime") private LocalDateTime crtTime; - // + // @TableField("updTime") private LocalDateTime updTime; - // + // @TableField("status") private String status; - // + // @TableField("crtUser") private String crtUser; - // + // @TableField("updUser") private String updUser; @@ -248,4 +255,4 @@ public class NegativeBlame { private String type; -} \ No newline at end of file +} diff --git a/src/main/java/com/biutag/supervision/service/DataMailService.java b/src/main/java/com/biutag/supervision/service/DataMailService.java index 1c1cc55..ecdf3d6 100644 --- a/src/main/java/com/biutag/supervision/service/DataMailService.java +++ b/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 policeQueryWrapper = new QueryWrapper<>(); policeQueryWrapper.eq("problem_sources_code", 22); @@ -93,13 +90,31 @@ public class DataMailService extends ServiceImpl().between(Negative::getCrtTime, beginTime, endTime).eq(Negative::getHandleSecondDepartId,departId).eq(Negative::getProblemSourcesCode, ProblemSourcesEnum.XF12337.getValue())); + // 局长信箱 + Long commissionerTotal = negativeService.count(new LambdaQueryWrapper().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 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); + if(StrUtil.isNotEmpty(exDepartId)){ + QueryWrapper 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; + } + }