fix: 禁闭完善

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

@@ -60,6 +60,8 @@ public class DataVRightsComfortController {
     @GetMapping
     public Result<DataRightsComfortModel> rightsComfort(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
                                                         @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
+
+
         DataRightsComfortModel result = new DataRightsComfortModel();
         // 异步
         Date finalEndTime = DateUtil.endOfDay(endTime);
@@ -125,7 +127,7 @@ public class DataVRightsComfortController {
                 }),
                 CompletableFutureUtil.runSyncObject(()->{
                     //案件类别 - 行政
-                    result.setAdministrativeCaseList(rpcApplyMapper.selectCaseData( beginTime,  endTime,"2"));
+                    result.setAdministrativeCaseList(rpcApplyMapper.selectCaseData( beginTime,  finalEndTime,"2"));
                 }),
 
                 CompletableFutureUtil.runSyncObject(() -> {
@@ -154,6 +156,7 @@ public class DataVRightsComfortController {
     @GetMapping("/getComfortSituation")
     public Result<JSONObject> getComfortSituation(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
                                                   @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
+        endTime = DateUtil.endOfDay(endTime);
         List<PieItem> comfortSituationList = rpcApplyMapper.selectComfortSituation(beginTime, endTime);
         JSONObject data = new JSONObject().fluentPut("comfortSituationList", comfortSituationList);
         return Result.success(data);
@@ -166,6 +169,7 @@ public class DataVRightsComfortController {
     @GetMapping("getComfortMapIcon")
     public Result<JSONObject> getComfortMapIcon(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
                                              @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
+        Date finalEndTime = DateUtil.endOfDay(endTime);
         // 信访数据总数概览
         List<ComfortMapIconVo> res = new ArrayList<>();
         // 查询所有分县市局
@@ -180,7 +184,7 @@ public class DataVRightsComfortController {
             String departId = re.getDepartId();
 
             List<RpcApply> list = rpcApplyService.list(new LambdaQueryWrapper<RpcApply>()
-                    .between(RpcApply::getCrtTime, beginTime, endTime)
+                    .between(RpcApply::getCrtTime, beginTime, finalEndTime)
                     .eq(RpcApply::getSecondDepartId,departId)
                     .eq(RpcApply::getType, RpcApplyTypeEnum.RIGHTS_PROTECTION.getValue()));
             Set<String> caseNumbers = list.stream().map(RpcApply::getCaseNumber).collect(Collectors.toSet());
@@ -190,7 +194,7 @@ public class DataVRightsComfortController {
             // 受侵害人数
             re.setVictimNumber(list.size());
             // 打击处理人数
-            List<String> tortNames = rpcInfringerResultMapper.selectNamesByOrgTime(beginTime, endTime,departId);
+            List<String> tortNames = rpcInfringerResultMapper.selectNamesByOrgTime(beginTime, finalEndTime,departId);
             long initialListSize = tortNames.size();
             long hitPersonNumber = tortNames.stream()
                     .filter(s -> s.contains(",")) // 筛选出包含逗号的名称
@@ -204,11 +208,11 @@ public class DataVRightsComfortController {
             //抚慰金额
             CompletableFutureUtil.runSyncObject(() -> {
 
-                re.setComfortMoney(rpcApplyMapper.selectComfortMoneyBarByOrg(beginTime, endTime, departId));
+                re.setComfortMoney(rpcApplyMapper.selectComfortMoneyBarByOrg(beginTime, finalEndTime, departId));
             });
             CompletableFutureUtil.runSyncObject(() -> {
                 //  抚慰人数
-                re.setComfortPersonNumber(rpcApplyService.orgCount(beginTime, endTime, RpcApplyTypeEnum.COMFORT.getValue(), departId));
+                re.setComfortPersonNumber(rpcApplyService.orgCount(beginTime, finalEndTime, RpcApplyTypeEnum.COMFORT.getValue(), departId));
             });
         }
 
@@ -224,6 +228,7 @@ public class DataVRightsComfortController {
     @GetMapping("/getPoliceHurtSituationAndHurtType")
     public Result<JSONObject> getPoliceHurtSituationAndHurtType(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
                                                                 @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
+        endTime = DateUtil.endOfDay(endTime);
         List<EchartsVo> policeHurtSituationList = rpcApplyMapper.getPoliceHurtSituation(beginTime, endTime);  // 人数情况
         List<EchartsVo> policeHurtTypeList = rpcApplyMapper.getPoliceHurtType(beginTime, endTime);  // 受伤类别
         JSONObject data = new JSONObject()
@@ -236,6 +241,7 @@ public class DataVRightsComfortController {
     @GetMapping("/getCaseAriseSituationRate")
     public Result<JSONObject> getCaseAriseSituationRate(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
                                                         @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
+        endTime = DateUtil.endOfDay(endTime);
         // 发案环节
         List<EchartsVo> incidentLinkList =rpcApplyMapper.getIncidentLink(beginTime, endTime);
         // 发案警种

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

@@ -98,7 +98,7 @@ public class Confinement {
     @TableField("investigate_unit")
     private String investigateUnit;
 
-    @TableField("备注")
+    @TableField("remark")
     private String remark;
 
 }