From 6739a2d689361254fdd3bc08a88359522e17d487 Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Thu, 29 Jun 2023 00:13:38 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B46=E6=9C=8829=E6=97=A5=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=81=87=E5=88=A0=E9=99=A4=EF=BC=88=E8=AF=BE=E5=A0=82?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kc/ktgl/controller/KcKetangbiaoController.java | 14 ++++++++++++-- .../jeecg/modules/kc/ktgl/entity/KcKetangbiao.java | 6 ++++++ .../kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml | 1 + 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java index 6b4b59c4..2002d8c2 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java @@ -15,6 +15,7 @@ import cn.hutool.core.date.DateField; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.google.common.collect.Maps; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.CommonAPI; @@ -149,7 +150,11 @@ public class KcKetangbiaoController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { - kcKetangbiaoService.removeById(id); + UpdateWrapper uw = new UpdateWrapper<>(); + uw.set("is_delete",1); + uw.eq("id",id); +// kcKetangbiaoService.removeById(id); + kcKetangbiaoService.update(uw); return Result.OK("删除成功!"); } @@ -164,7 +169,12 @@ public class KcKetangbiaoController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.kcKetangbiaoService.removeByIds(Arrays.asList(ids.split(","))); +// this.kcKetangbiaoService.removeByIds(Arrays.asList(ids.split(","))); + UpdateWrapper uw = new UpdateWrapper<>(); + uw.set("is_delete",1); + uw.in("id",Arrays.asList(ids.split(","))); +// kcKetangbiaoService.removeById(id); + kcKetangbiaoService.update(uw); return Result.OK("批量删除成功!"); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java index 40d082b7..422aece0 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java @@ -242,6 +242,12 @@ public class KcKetangbiao implements Serializable { @Excel(name = "状态", width = 15) @ApiModelProperty(value = "状态") private java.lang.String zt; + /**是否删除（0：未删除，1：已删除）*/ + @Excel(name = "是否删除（0：未删除，1：已删除）", width = 15) + @ApiModelProperty(value = "是否删除（0：未删除，1：已删除）") + private java.lang.Integer isDelete; + + @TableField(exist = false) private String jssj; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml index ed6565de..f72f5470 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml @@ -43,6 +43,7 @@ left join xxhbjxljbxx jxljbxx on jsjbxx.jxlh = jxljbxx.jzwh left join kc_jieci jc on ktb.hh = jc.jieci + and ktb.is_delete = 0 and (ktb.skjs like concat('%',#{kcKetangbiao.ywmc},'%') or ktb.kcmc like concat('%',#{kcKetangbiao.ywmc},'%') )