diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java
index da4918ae..4dec8ced 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java
@@ -62,6 +62,11 @@ public class BsSgcDfAqrwController extends BaseController
         return AjaxResult.success(list);
     }
 
+    @GetMapping("/warn")
+    public AjaxResult getWarn(){
+        return AjaxResult.success(bsSgcSzAqrwService.getWarnList());
+    }
+
 
     @GetMapping("/getList/{taskId}")
     public AjaxResult getList(@PathVariable String taskId) {
diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java
index f8e5f042..cb6fd5d6 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java
@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -119,9 +120,79 @@ public class BsSgcDfBzbpController extends BaseController
             }
             return bsSgcDfBzbpService.selectPage(sp, adcd);
         }
-//        return bsSgcDfBzbpService.selectPage(sp);
     }
 
+
+    @PostMapping("/statistics")
+    @ApiOperation("堤防标识标牌列表")
+    public Map<String,Integer> getStatistics(@RequestBody SearchParam<BsSgcDfBzbp> sp)
+    {
+
+        BsSgcDfBzbp projectInfo = sp.getData();
+        String adcd = null;
+        if (projectInfo != null) {
+            adcd = projectInfo.getAdcd();
+        }
+
+        SysUser sysUser = UserUtils.getUser();
+        if (sysUser.getUserName().equals("admin")) {
+            if (projectInfo != null && projectInfo.getAdcd() != null) {
+                String infoAdcd = projectInfo.getAdcd();
+                QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
+                sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd);
+                SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
+                if (xzqh.getLayer()==5) {
+                    infoAdcd = xzqh.getXzqhdm().substring(0, 2);
+
+                } else if (xzqh.getLayer()==4) {
+                    infoAdcd = xzqh.getXzqhdm().substring(0, 4);
+
+                }else {
+                    infoAdcd = xzqh.getXzqhdm();
+                }
+                return bsSgcDfBzbpService.getStatistics(sp,infoAdcd);
+            }else {
+                return bsSgcDfBzbpService.getStatistics(sp,null);
+            }
+
+        }else if (adcd == null) {
+            SysUser user = UserUtils.getUser();
+            String deptId = user.getDeptId();
+            SysDept sysDept = sysDeptService.get(deptId);
+            String xzqhId = sysDept.getXzqhId();
+            SysXzqh xzqh = sysXzqhService.getById(xzqhId);
+            String substring = "";
+            if (xzqh.getLayer()==5) {
+                substring = xzqh.getXzqhdm().substring(0, 2);
+
+            } else if (xzqh.getLayer()==4) {
+                substring = xzqh.getXzqhdm().substring(0, 4);
+
+            }else {
+                substring = xzqh.getXzqhdm();
+            }
+
+            return bsSgcDfBzbpService.getStatistics(sp,substring);
+        }else {
+
+            QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
+            sysXzqhQueryWrapper.eq("XZQHDM", adcd);
+
+            SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
+            if (xzqh.getLayer()==5) {
+                adcd = xzqh.getXzqhdm().substring(0, 2);
+
+            } else if (xzqh.getLayer()==4) {
+                adcd = xzqh.getXzqhdm().substring(0, 4);
+
+            }else {
+                adcd = xzqh.getXzqhdm();
+            }
+            return bsSgcDfBzbpService.getStatistics(sp, adcd);
+        }
+    }
+
+
     /**
      * 导出堤防标识标牌列表
      */
diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJfglController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJfglController.java
index 02cf9c39..f508f9c1 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJfglController.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJfglController.java
@@ -1,5 +1,6 @@
 package com.kms.yg.df.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.kms.common.utils.BaseEntityUtils;
 import com.kms.yg.df.domain.BsSgcDfDagl;
@@ -112,4 +113,15 @@ public class BsSgcDfJfglController extends BaseController
     {
         return AjaxResult.success(bsSgcDfDaglMapper.deleteById(ids));
     }
+
+
+    @ApiOperation("经费管理删除")
+    @Log(title = "经费管理删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("/all/{dikeCode}")
+    public AjaxResult removeAll(@PathVariable String dikeCode)
+    {
+        LambdaQueryWrapper<BsSgcDfJfgl>lw=new LambdaQueryWrapper<>();
+
+        return AjaxResult.success(bsSgcDfJfglService.remove(lw.eq(BsSgcDfJfgl::getDikeCode,dikeCode)));
+    }
 }
diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfQqhj.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfQqhj.java
index 53cba1d6..2d48afe2 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfQqhj.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfQqhj.java
@@ -107,4 +107,11 @@ public class BsSgcDfQqhj extends BaseEntity
     @TableField(exist = false)
     private String adcd;
 
+
+    private String pointLatitudeLongitudeList;
+    private String lineLatitudeLongitudeList;
+    private String allLatitudeLongitudeList;
+    private String pointLatitudeLongitudeListV2;
+    private String lineLatitudeLongitudeListV2;
+    private String allLatitudeLongitudeListV2;
 }
diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfAqrwMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfAqrwMapper.java
index ea107c09..600e4f66 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfAqrwMapper.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfAqrwMapper.java
@@ -1,6 +1,7 @@
 package com.kms.yg.df.mapper;
 
 import com.kms.yg.df.domain.BsSgcDfAqrw;
+import com.kms.yg.sz.domain.BsSgcSzAqrw;
 import com.kms.yg.sz.domain.dto.NumDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -52,4 +53,7 @@ public interface BsSgcDfAqrwMapper extends BaseMapper<BsSgcDfAqrw> {
 
     Map<String,Integer> getStatistics(@Param("startDate") String startDate, @Param("endDate")String endDate,
                                       @Param("adcd")String xzqh, @Param("layer")String layer);
+
+    List<BsSgcDfAqrw> getList(@Param("adcd")String xzqh, @Param("layer")String layer);
+
 }
diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzbpMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzbpMapper.java
index 0e1b5d81..14e564f1 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzbpMapper.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzbpMapper.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kms.yg.df.domain.BsSgcDfBzbp;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 堤防标识标牌Mapper接口
@@ -17,4 +18,5 @@ import java.util.List;
 public interface BsSgcDfBzbpMapper extends BaseMapper<BsSgcDfBzbp> {
 
     List<BsSgcDfBzbp> selectList1(@Param("pageNum") int pageNum,@Param("pageSize") int pageSize,@Param("embankmentName") String embankmentCode,@Param("adcd") String adcd);
+    List<Map<String,Object>> getStatistics(@Param("embankmentName") String embankmentCode,@Param("adcd")String adcd);
 }
diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java
index 1fed75ea..3917750b 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java
@@ -6,16 +6,21 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kms.common.utils.UserUtils;
 import com.kms.system.domain.SysXzqh;
+import com.kms.system.service.SysDeptService;
 import com.kms.system.service.SysXzqhService;
 import com.kms.yg.df.domain.BsSgcDfAqrw;
 import com.kms.yg.df.domain.BsSgcDfDfrw;
 import com.kms.yg.df.mapper.BsSgcDfAqrwMapper;
 import com.kms.yg.df.mapper.BsSgcDfDfrwMapper;
 import com.kms.yg.df.mapper.BsSgcDfSafeJbxxMapper;
+import com.kms.yg.sz.domain.BsSgcSzAqrw;
 import com.kms.yg.sz.domain.dto.AqrwDto;
 import com.kms.yg.sz.domain.dto.NumDto;
 import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.core.domain.entity.SysDept;
+import com.shuili.common.core.domain.entity.SysUser;
 import com.shuili.common.core.service.BaseService;
 import com.shuili.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,6 +58,9 @@ public class BsSgcDfAqrwService extends BaseService<BsSgcDfAqrwMapper, BsSgcDfAq
     @Autowired
     private BsSgcDfDfrwService bsSgcDfDfrwService;
 
+    @Autowired
+    private  SysDeptService sysDeptService;
+
 
 
     public IPage selectPage(SearchParam<BsSgcDfAqrw> sp, String adcd) {
@@ -87,6 +95,19 @@ public class BsSgcDfAqrwService extends BaseService<BsSgcDfAqrwMapper, BsSgcDfAq
 
     }
 
+    public List<BsSgcDfAqrw>getWarnList(){
+        SysUser user = UserUtils.getUser();
+        String deptId = user.getDeptId();
+        SysDept sysDept = sysDeptService.get(deptId);
+        String xzqhId = sysDept.getXzqhId();
+        SysXzqh xzqh = sysXzqhService.getById(xzqhId);
+        Integer layer =xzqh.getLayer();
+        List<BsSgcDfAqrw> list = bsSgcDfAqrwMapper.getList(xzqh.getXzqhdm(), String.valueOf(layer));
+        return list;
+
+    }
+
+
     public void saveOther(BsSgcDfAqrw bsSgcDfAqrw) {
         //获取水闸ids
         String[] sluiceIds = bsSgcDfAqrw.getDikeCodes();
diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java
index 07356fbb..384449ec 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java
@@ -10,6 +10,7 @@ import com.shuili.common.core.service.BaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -61,4 +62,17 @@ public class BsSgcDfBzbpService extends BaseService<BsSgcDfBzbpMapper, BsSgcDfBz
         return bsSgcDfBzbpPage;
     }
 
+
+    public Map<String,Integer>getStatistics(SearchParam<BsSgcDfBzbp> sp, String adcd){
+        BsSgcDfBzbp projectInfo = sp.getData();
+
+        List<Map<String, Object>> statistics = bsSgcDfBzbpMapper.getStatistics(projectInfo.getDikeName(), adcd);
+        Map<String,Integer>map=new HashMap<>();
+        for ( Map<String,Object>integerMap:statistics){
+            map.put((String) integerMap.get("name"), Math.toIntExact((Long) integerMap.get("num")));
+        }
+
+        return  map;
+    }
+
 }
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqrwController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqrwController.java
index 268a949b..04477af6 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqrwController.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqrwController.java
@@ -188,6 +188,11 @@ public class BsSgcSzAqrwController extends BaseController
         return AjaxResult.success();
     }
 
+    @GetMapping("/warn")
+    public AjaxResult getWarn(){
+        return AjaxResult.success(bsSgcSzAqrwService.getWarnList());
+    }
+
     /**
      * 删除水闸安全鉴定任务信息
      */
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java
index f2e6766e..d1c1f042 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java
@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -131,6 +132,71 @@ public class BsSgcSzBzbpController extends BaseController
         }
     }
 
+    @PostMapping("/statistics")
+    @ApiOperation("水闸标识标牌列表")
+    public Map<String,Integer> getStatistics(@RequestBody SearchParam<BsSgcSzBzbp> sp)
+    {
+        BsSgcSzBzbp projectInfo = sp.getData();
+        String adcd = null;
+        if (projectInfo != null) {
+            adcd = projectInfo.getAdcd();
+        }
+
+        SysUser sysUser = UserUtils.getUser();
+        if (sysUser.getUserName().equals("admin")) {
+            if (projectInfo != null && projectInfo.getAdcd() != null) {
+                String infoAdcd = projectInfo.getAdcd();
+                QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
+                sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd);
+                SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
+                if (xzqh.getLayer()==5) {
+                    infoAdcd = xzqh.getXzqhdm().substring(0, 2);
+
+                } else if (xzqh.getLayer()==4) {
+                    infoAdcd = xzqh.getXzqhdm().substring(0, 4);
+
+                }else {
+                    infoAdcd = xzqh.getXzqhdm();
+                }
+                return bsSgcSzBzbpService.getStatistics(sp,infoAdcd);
+            }else {
+                return bsSgcSzBzbpService.getStatistics(sp,null);
+            }
+
+        }else if (adcd == null) {
+            SysUser user = UserUtils.getUser();
+            SysDept dept = user.getDept();
+            SysXzqh xzqh = sysXzqhService.getById(dept.getXzqhId());
+            String substring = "";
+            if (xzqh.getLayer()==5) {
+                substring = xzqh.getXzqhdm().substring(0, 2);
+
+            } else if (xzqh.getLayer()==4) {
+                substring = xzqh.getXzqhdm().substring(0, 4);
+
+            }else {
+                substring = xzqh.getXzqhdm();
+            }
+
+            return bsSgcSzBzbpService.getStatistics(sp,substring);
+        }else {
+
+            QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
+            sysXzqhQueryWrapper.eq("XZQHDM", adcd);
+            SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
+            if (xzqh.getLayer()==5) {
+                adcd = xzqh.getXzqhdm().substring(0, 2);
+
+            } else if (xzqh.getLayer()==4) {
+                adcd = xzqh.getXzqhdm().substring(0, 4);
+
+            }else {
+                adcd = xzqh.getXzqhdm();
+            }
+            return bsSgcSzBzbpService.getStatistics(sp, adcd);
+        }
+    }
+
     /**
      * 导出水闸标识标牌列表
      */
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzJfglController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzJfglController.java
index ece8a12b..d5bfa3fb 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzJfglController.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzJfglController.java
@@ -1,5 +1,6 @@
 package com.kms.yg.sz.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.kms.common.utils.BaseEntityUtils;
 import com.kms.yg.sz.domain.BsSgcSzJfgl;
@@ -107,4 +108,14 @@ public class BsSgcSzJfglController extends BaseController
     {
         return toAjax(bsSgcSzJfglService.removeByIds(Arrays.asList(ids)));
     }
+
+
+    @ApiOperation("经费管理删除")
+    @Log(title = "经费管理删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("/all/{wagaCode}")
+    public AjaxResult removeBySzId(@PathVariable String wagaCode)
+    {
+        LambdaQueryWrapper<BsSgcSzJfgl>lw=new LambdaQueryWrapper<>();
+        return toAjax(bsSgcSzJfglService.remove(lw.eq(BsSgcSzJfgl::getWagaCode,wagaCode)));
+    }
 }
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqrw.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqrw.java
index cf708910..73ef7af8 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqrw.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqrw.java
@@ -95,6 +95,9 @@ public class BsSgcSzAqrw extends BaseEntity
 
     private String taskName;
 
+    @TableField(exist = false)
+    private String total;
+
    /* public void setWagaIds(String[] idArray) {
         this.wagaIds = String.join(",", idArray);
     }
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqrwMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqrwMapper.java
index 4671cfcd..7e078c54 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqrwMapper.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqrwMapper.java
@@ -54,4 +54,6 @@ public interface BsSgcSzAqrwMapper extends BaseMapper<BsSgcSzAqrw> {
 
     Map<String,Integer> getStatistics(@Param("startDate") String startDate,@Param("endDate")String endDate,
                                       @Param("adcd")String xzqh,@Param("layer")String layer);
+
+    List<BsSgcSzAqrw> getList( @Param("adcd")String xzqh,@Param("layer")String layer);
 }
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzbpMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzbpMapper.java
index 20c21beb..b78e8a42 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzbpMapper.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzbpMapper.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kms.yg.sz.domain.BsSgcSzBzbp;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 水闸标识标牌Mapper接口
@@ -17,4 +18,6 @@ import java.util.List;
 public interface BsSgcSzBzbpMapper extends BaseMapper<BsSgcSzBzbp> {
 
     List<BsSgcSzBzbp> selectList1(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize, @Param("wagaName") String sluiceName, @Param("adcd") String adcd);
+    List<Map<String,Object>> getStatistics(@Param("wagaName") String sluiceName, @Param("adcd")String adcd);
+
 }
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java
index 37753b6c..8635b7c7 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java
@@ -7,8 +7,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kms.common.utils.UserUtils;
 import com.kms.system.domain.SysXzqh;
+import com.kms.system.service.SysDeptService;
 import com.kms.system.service.SysXzqhService;
+import com.kms.yg.df.domain.BsSgcDfAqrw;
 import com.kms.yg.sz.domain.BsSgcSzAqrw;
 import com.kms.yg.sz.domain.BsSgcSzSzrw;
 import com.kms.yg.sz.domain.dto.AqrwDto;
@@ -17,6 +20,8 @@ import com.kms.yg.sz.mapper.BsSgcSzAqrwMapper;
 import com.kms.yg.sz.mapper.BsSgcSzSafeJbxxMapper;
 import com.kms.yg.sz.mapper.BsSgcSzSzrwMapper;
 import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.core.domain.entity.SysDept;
+import com.shuili.common.core.domain.entity.SysUser;
 import com.shuili.common.core.service.BaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -51,6 +56,9 @@ public class BsSgcSzAqrwService extends BaseService<BsSgcSzAqrwMapper, BsSgcSzAq
     @Autowired
     private BsSgcSzSzrwService bsSgcSzSzrwService;
 
+    @Autowired
+    private SysDeptService sysDeptService;
+
 
 
     public IPage selectPage(SearchParam<BsSgcSzAqrw> sp, String adcd) {
@@ -142,6 +150,17 @@ public class BsSgcSzAqrwService extends BaseService<BsSgcSzAqrwMapper, BsSgcSzAq
 
         bsSgcSzAqrwMapper.updateById(bsSgcSzAqrw);
 
+    }
+    public List<BsSgcSzAqrw>getWarnList(){
+        SysUser user = UserUtils.getUser();
+        String deptId = user.getDeptId();
+        SysDept sysDept = sysDeptService.get(deptId);
+        String xzqhId = sysDept.getXzqhId();
+        SysXzqh xzqh = sysXzqhService.getById(xzqhId);
+        Integer layer =xzqh.getLayer();
+        List<BsSgcSzAqrw> list = bsSgcSzAqrwMapper.getList(xzqh.getXzqhdm(), String.valueOf(layer));
+        return list;
+
     }
 
     public List<AqrwDto> getList(String taskId) {
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java
index a2519ca3..e25e9275 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java
@@ -3,6 +3,7 @@ package com.kms.yg.sz.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kms.yg.df.domain.BsSgcDfBzbp;
 import com.kms.yg.sz.domain.BsSgcSzBzbp;
 import com.kms.yg.sz.mapper.BsSgcSzBzbpMapper;
 import com.shuili.common.core.domain.SearchParam;
@@ -10,6 +11,7 @@ import com.shuili.common.core.service.BaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -63,4 +65,16 @@ public class BsSgcSzBzbpService extends BaseService<BsSgcSzBzbpMapper, BsSgcSzBz
         return bzbpPage;
     }
 
+    public Map<String,Integer>getStatistics(SearchParam<BsSgcSzBzbp> sp, String adcd){
+        BsSgcSzBzbp projectInfo = sp.getData();
+
+        List<Map<String, Object>> statistics = bsSgcSzBzbpMapper.getStatistics(projectInfo.getWagaName(), adcd);
+        Map<String,Integer>map=new HashMap<>();
+
+        for ( Map<String,Object>integerMap:statistics){
+            map.put((String) integerMap.get("name"), Math.toIntExact((Long) integerMap.get("num")));
+        }
+        return  map;
+    }
+
 }
diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml
index 719a38c8..e484ce40 100644
--- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml
@@ -129,5 +129,34 @@
         </if>
     </select>
 
+    <resultMap id="BsSgcDfAqrw" type="BsSgcDfAqrw">
+        <result property="taskName" column="task_name"/>
+        <result property="planCompletionTime" column="plan_completion_time"/>
+        <result property="createTime" column="time"/>
+    </resultMap>
+
+    <select id="getList" resultMap="BsSgcDfAqrw">
+        SELECT
+        ss.task_name,
+        plan_completion_time,
+        CURRENT_TIMESTAMP() as time
+        FROM bs_sgc_df_aqrw ss
+        where 1=1
+        <if test="adcd != null and adcd != ''and adcd != null and adcd != ''">
+            <if test="layer==5">
+                and ss.adcd like  concat(LEFT(#{adcd},2),'%')
+            </if>
+            <if test="layer==4">
+                and ss.adcd like  concat(LEFT(#{adcd},4),'%')
+            </if>
+            <if test="layer==3">
+                and ss.adcd like  concat(LEFT(#{adcd},6),'%')
+            </if>
+        </if>
+        and ss.incompletion_number>0
+        AND CURDATE() BETWEEN ss.plan_completion_time - INTERVAL 5 DAY AND ss.plan_completion_time
+        group by id;
+    </select>
+
 
 </mapper>
diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml
index 183d8d83..7b7f5ebb 100644
--- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml
@@ -38,4 +38,20 @@
         ORDER BY create_time DESC
         LIMIT #{pageNum}, #{pageSize}
     </select>
+
+
+    <select id="getStatistics" resultType="java.util.Map">
+        SELECT qh.NAME as name,count(1) as num
+        FROM bs_sgc_df_bzbp bp
+        inner join sys_xzqh qh on bp.adcd= LEFT(qh.XZQHDM,6) AND RIGHT(qh.XZQHDM, 6) = '000000'
+        <where>
+            <if test="embankmentName != null and embankmentName != ''">
+                embankment_name like concat('%', #{embankmentName}, '%')
+            </if>
+            <if test="adcd != null and adcd != ''">
+                and adcd like concat(#{adcd},'%')
+            </if>
+        </where>
+        GROUP BY adcd
+    </select>
 </mapper>
diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml
index 2b829768..ff606d80 100644
--- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml
@@ -130,5 +130,34 @@
     </select>
 
 
+    <resultMap id="BsSgcSzAqrw" type="BsSgcSzAqrw">
+        <result property="taskName" column="task_name"/>
+        <result property="planCompletionTime" column="plan_completion_time"/>
+        <result property="createTime" column="time"/>
+    </resultMap>
+
+    <select id="getList" resultMap="BsSgcSzAqrw">
+        SELECT
+            ss.task_name,
+           plan_completion_time,
+        CURRENT_TIMESTAMP() as time
+        FROM bs_sgc_sz_aqrw ss
+        where 1=1
+        <if test="adcd != null and adcd != ''and adcd != null and adcd != ''">
+            <if test="layer==5">
+                 and ss.adcd like  concat(LEFT(#{adcd},2),'%')
+            </if>
+            <if test="layer==4">
+                and ss.adcd like  concat(LEFT(#{adcd},4),'%')
+            </if>
+            <if test="layer==3">
+                and ss.adcd like  concat(LEFT(#{adcd},6),'%')
+            </if>
+        </if>
+        and ss.incompletion_number>0
+        AND CURDATE() BETWEEN ss.plan_completion_time - INTERVAL 5 DAY AND ss.plan_completion_time
+        group by id;
+    </select>
+
 
 </mapper>
diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml
index b3d33096..325adf8c 100644
--- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml
@@ -38,4 +38,20 @@
         ORDER BY create_time DESC
         LIMIT #{pageNum}, #{pageSize}
     </select>
+
+
+    <select id="getStatistics" resultType="java.util.Map">
+        SELECT qh.NAME as name,count(1) as num
+        FROM bs_sgc_sz_bzbp bp
+        inner join sys_xzqh qh on bp.adcd= LEFT(qh.XZQHDM,6) AND RIGHT(qh.XZQHDM, 6) = '000000'
+        <where>
+            <if test="wagaName != null and wagaName != ''">
+                waga_name like concat('%', #{wagaName}, '%')
+            </if>
+            <if test="adcd != null and adcd != ''">
+                and adcd like concat(#{adcd},'%')
+            </if>
+        </where>
+        GROUP BY adcd
+    </select>
 </mapper>