diff --git a/src/main/java/com/whdc/component/MyPostConstruct.java b/src/main/java/com/whdc/component/MyPostConstruct.java
index 332dd1c..9422c67 100644
--- a/src/main/java/com/whdc/component/MyPostConstruct.java
+++ b/src/main/java/com/whdc/component/MyPostConstruct.java
@@ -195,7 +195,9 @@ public class MyPostConstruct {
     public void recoveryShAddressBookSpotCheck() {
         boolean update = shAddressBookService.lambdaUpdate()
                 .set(ShAddressBook::getIsSpotCheck, 0)
+                .set(ShAddressBook::getCallStatus, 0)
                 .eq(ShAddressBook::getIsSpotCheck, 1)
+                .eq(ShAddressBook::getDel, 1)
                 .update();
         log.info("恢复山洪负责人抽查状态定时任务执行结果: " + update);
     }
diff --git a/src/main/java/com/whdc/controller/ShCallWordController.java b/src/main/java/com/whdc/controller/ShCallWordController.java
index ef8c6db..f8fad4d 100644
--- a/src/main/java/com/whdc/controller/ShCallWordController.java
+++ b/src/main/java/com/whdc/controller/ShCallWordController.java
@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -69,11 +70,11 @@ public class ShCallWordController {
         return ResultJson.ok(service.removeById(id));
     }
 
-//    @ApiOperation(value = "列表")
-//    @PostMapping("/list")
-//    public ResultJson<List<ShCallWord>> list() {
-//        return ResultJson.ok(service.lambdaQuery().list());
-//    }
+    @ApiOperation(value = "列表")
+    @PostMapping("/list")
+    public ResultJson<List<ShCallWord>> list(@RequestBody ShCallWordDto dto) {
+        return ResultJson.ok(service.list(dto));
+    }
 
     @ApiOperation(value = "分页")
     @PostMapping("/page")
diff --git a/src/main/java/com/whdc/mapper/ShCallWordMapper.java b/src/main/java/com/whdc/mapper/ShCallWordMapper.java
index d9fa4cb..b96f007 100644
--- a/src/main/java/com/whdc/mapper/ShCallWordMapper.java
+++ b/src/main/java/com/whdc/mapper/ShCallWordMapper.java
@@ -7,6 +7,8 @@ import com.whdc.model.entity.ShCallWord;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 描述: 备注
  * author: xusan
@@ -17,4 +19,6 @@ public interface ShCallWordMapper extends BaseMapper<ShCallWord> {
 
     IPage<ShCallWord> page(@Param("page") IPage<ShCallWord> page, @Param("dto") ShCallWordDto dto);
 
+    List<ShCallWord> page(@Param("dto") ShCallWordDto dto);
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/whdc/model/dto/ShCallWordDto.java b/src/main/java/com/whdc/model/dto/ShCallWordDto.java
index 2c32f59..2dfe994 100644
--- a/src/main/java/com/whdc/model/dto/ShCallWordDto.java
+++ b/src/main/java/com/whdc/model/dto/ShCallWordDto.java
@@ -7,8 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.util.Date;
-
 /**
  * Description:
  * Created by XuSan on 2024/7/31.
@@ -24,10 +22,10 @@ public class ShCallWordDto extends FindPageDto {
 
 
     @ApiModelProperty(value = "开始时间")
-    private Date stm;
+    private String stm;
 
     @ApiModelProperty(value = "结束时间")
-    private Date etm;
+    private String etm;
 
     @Schema(description="责任人类型1 行政责任人,包保责任人")
     private String shAbType1;
diff --git a/src/main/java/com/whdc/model/dto/ShPeriodDto.java b/src/main/java/com/whdc/model/dto/ShPeriodDto.java
index 5dc220d..d3675b5 100644
--- a/src/main/java/com/whdc/model/dto/ShPeriodDto.java
+++ b/src/main/java/com/whdc/model/dto/ShPeriodDto.java
@@ -7,8 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.util.Date;
-
 /**
  * Description:
  * Created by XuSan on 2024/7/31.
@@ -24,10 +22,10 @@ public class ShPeriodDto extends FindPageDto {
 
 
     @ApiModelProperty(value = "开始时间")
-    private Date stm;
+    private String stm;
 
     @ApiModelProperty(value = "结束时间")
-    private Date etm;
+    private String etm;
 
     @Schema(description="防汛周期")
     private String name;
diff --git a/src/main/java/com/whdc/service/ShCallWordService.java b/src/main/java/com/whdc/service/ShCallWordService.java
index 8e9e806..9be716b 100644
--- a/src/main/java/com/whdc/service/ShCallWordService.java
+++ b/src/main/java/com/whdc/service/ShCallWordService.java
@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.whdc.model.dto.ShCallWordDto;
 import com.whdc.model.entity.ShCallWord;
 
+import java.util.List;
+
 /**
  * 描述: 备注
  * author: xusan
@@ -14,6 +16,7 @@ import com.whdc.model.entity.ShCallWord;
 public interface ShCallWordService extends IService<ShCallWord>
 {
     IPage<ShCallWord> page(ShCallWordDto dto);
+    List<ShCallWord> list(ShCallWordDto dto);
 }
 
 
diff --git a/src/main/java/com/whdc/service/impl/ShAddressBookServiceImpl.java b/src/main/java/com/whdc/service/impl/ShAddressBookServiceImpl.java
index 442e403..8e689bc 100644
--- a/src/main/java/com/whdc/service/impl/ShAddressBookServiceImpl.java
+++ b/src/main/java/com/whdc/service/impl/ShAddressBookServiceImpl.java
@@ -83,6 +83,41 @@ public class ShAddressBookServiceImpl extends ServiceImpl<ShAddressBookMapper, S
         String finalType1Str1 = type1Str;
         AtomicInteger sort = new AtomicInteger(0);
         appends.forEach(o -> {
+
+            // 设置负责区域
+            switch (finalType1Str1) {
+                case "行政责任人":{
+//                    type1Str = "行政责任人";
+                    String type2 = o.getType2();
+                    if (StringUtils.isNotBlank(type2)){
+                        if (type2.contains("市")){
+                            o.setLand(o.getCity());
+                        }else if (type2.contains("县")){
+                            o.setLand(o.getCounty());
+                        }else if (type2.contains("乡")){
+                            o.setLand(o.getArea());
+                        }else if (type2.contains("村")){
+                            o.setLand(o.getVillage());
+                        }
+                    }}
+                    break;
+                case "包保责任人":{
+//                    type1Str = "包保责任人";
+                    String type2 = o.getType2();
+                    if (StringUtils.isNotBlank(type2)){
+                        if (type2.contains("市")){
+                            o.setLand(o.getCounty());
+                        }else if (type2.contains("县")){
+                            o.setLand(o.getArea());
+                        }else if (type2.contains("乡")){
+                            o.setLand(o.getVillage());
+                        }
+                    }}
+                    break;
+                default:
+                    throw new MyException("参数错误");
+            }
+
             o.setType1(finalType1Str1);
             if (Objects.isNull(o.getSort())) {
                 o.setSort(sort.getAndIncrement());
diff --git a/src/main/java/com/whdc/service/impl/ShCallWordServiceImpl.java b/src/main/java/com/whdc/service/impl/ShCallWordServiceImpl.java
index 1cd3fab..de40bd9 100644
--- a/src/main/java/com/whdc/service/impl/ShCallWordServiceImpl.java
+++ b/src/main/java/com/whdc/service/impl/ShCallWordServiceImpl.java
@@ -8,6 +8,8 @@ import com.whdc.model.entity.ShCallWord;
 import com.whdc.service.ShCallWordService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 import static com.whdc.model.MyConstant.REDIS_KEY;
 
 
@@ -25,4 +27,9 @@ public class ShCallWordServiceImpl extends ServiceImpl<ShCallWordMapper, ShCallW
     public IPage<ShCallWord> page(ShCallWordDto dto) {
         return getBaseMapper().page(dto.getPage(), dto);
     }
+
+    @Override
+    public List<ShCallWord> list(ShCallWordDto dto) {
+        return getBaseMapper().page(dto);
+    }
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6984b54..375d68a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,3 +1,4 @@
+
 server:
   port: 20020
   servlet:
diff --git a/src/main/resources/mapper/ShPeriodMapper.xml b/src/main/resources/mapper/ShPeriodMapper.xml
index 8882213..0e3b03c 100644
--- a/src/main/resources/mapper/ShPeriodMapper.xml
+++ b/src/main/resources/mapper/ShPeriodMapper.xml
@@ -13,7 +13,7 @@
             AND T.CREATE_TIME BETWEEN #{dto.stm} AND #{dto.etm}
         </if>
         <if test="dto.name != null and dto.name != '' ">
-            AND T.NAME = #{dto.name}
+            AND T.NAME LIKE CONCAT('%', #{dto.name}, '%')
         </if>
 
         ORDER BY T.CREATE_TIME DESC