lyf
/
fxkh-txl-service
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

备注新增列表查询,分页查询修改,防汛周期分页查询修改,正式环境前后端部署,

master
徐杰盟 2024-08-02 17:13:58 +08:00
parent a8dedb325e
commit b6d9107218
10 changed files with 63 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/whdc/component/MyPostConstruct.java
View File

@ -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);
}

11
src/main/java/com/whdc/controller/ShCallWordController.java
View File

@ -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")

4
src/main/java/com/whdc/mapper/ShCallWordMapper.java
View File

@ -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);
}

6
src/main/java/com/whdc/model/dto/ShCallWordDto.java
View File

@ -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;

6
src/main/java/com/whdc/model/dto/ShPeriodDto.java
View File

@ -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;

3
src/main/java/com/whdc/service/ShCallWordService.java
View File

@ -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);
}

35
src/main/java/com/whdc/service/impl/ShAddressBookServiceImpl.java
View File

@ -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());

7
src/main/java/com/whdc/service/impl/ShCallWordServiceImpl.java
View File

@ -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);
}
}

1
src/main/resources/application.yml
View File

@ -1,3 +1,4 @@
server:
port: 20020
servlet:

2
src/main/resources/mapper/ShPeriodMapper.xml
View File

@ -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