diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfHzxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfHzxxController.java index b3225e53..7c66d215 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfHzxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfHzxxController.java @@ -110,7 +110,7 @@ public class BsSgcDfHzxxController extends BaseController BsSgcDfSafeJbxx byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class) .eq(BsSgcDfSafeJbxx::getDikeCode, dikeCode)); - byId.setHzStatus("1"); + byId.setHzStatus("0"); bsSgcSzSafeJbxxService.updateById(byId); return toAjax(bsSgcSzHzxxService.save(bsSgcSzHzxx)); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzHzxxController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzHzxxController.java index f465af2f..4cfb6aa9 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzHzxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzHzxxController.java @@ -106,7 +106,7 @@ public class BsSgcSzHzxxController extends BaseController String wagaCode = bsSgcSzHzxx.getWagaCode(); BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class) .eq(BsSgcSzSafeJbxx::getWagaCode, wagaCode)); - byId.setHzStatus("1"); + byId.setHzStatus("0"); bsSgcSzSafeJbxxService.updateById(byId); return toAjax(bsSgcSzHzxxService.save(bsSgcSzHzxx)); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzQqhj.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzQqhj.java index 327734cb..04853525 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzQqhj.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzQqhj.java @@ -106,7 +106,7 @@ public class BsSgcSzQqhj extends BaseEntity private String wagaName; @TableField(exist = false) private String wagaType; - @TableField(exist = false) + private String wagaCode; @TableField(exist = false) diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzQqhjService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzQqhjService.java index d303701c..52cb7f0e 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzQqhjService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzQqhjService.java @@ -42,7 +42,7 @@ public class BsSgcSzQqhjService extends BaseService params = sp.getParams(); // 根据搜索参数中的数据和参数获取列表 - List list = bsSgcSzQqhjMapper.getList(data.getId(),data.getWagaName(),data.getWagaType(),data.getWagaId(), + List list = bsSgcSzQqhjMapper.getList(data.getId(),data.getWagaName(),data.getWagaType(),data.getWagaCode(), sysXzqhService.getSubString(data.getAdcd()),(String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize()); // 创建分页对象 diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzQqhjMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzQqhjMapper.xml index e4278178..517ca51f 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzQqhjMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzQqhjMapper.xml @@ -32,13 +32,13 @@ - and waga_name like concat('%',#{wagaName},'%') + and sj.waga_name like concat('%',#{wagaName},'%') - and waga_code =#{wagaCode} + and sq.waga_code =#{wagaCode} - and waga_type=#{wagaType} + and sj.waga_type=#{wagaType}