From c0bf937175d21c62396b2abef57fd4725537a0c6 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Sun, 13 Aug 2023 12:21:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/KcKetangSuibiController.java | 13 ++++++++++++- .../kc/kcKetangSuibi/entity/KcKetangSuibi.java | 3 +++ .../ktgl/controller/KcKetangbiaoController.java | 16 ++++++++++++++++ .../modules/kc/ktgl/entity/KcKetangbiao.java | 15 +++++++++++---- .../kc/ktgl/mapper/KcKetangbiaoMapper.java | 2 ++ .../kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml | 10 ++++++++-- .../kc/ktgl/service/IKcKetangbiaoService.java | 2 ++ .../service/impl/KcKetangbiaoServiceImpl.java | 5 +++++ 8 files changed, 59 insertions(+), 7 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/controller/KcKetangSuibiController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/controller/KcKetangSuibiController.java index bede44d9..5f5a6946 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/controller/KcKetangSuibiController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/controller/KcKetangSuibiController.java @@ -3,6 +3,8 @@ package org.jeecg.modules.kc.kcKetangSuibi.controller; import java.util.Arrays; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.modules.kc.kcKetangSuibi.entity.KcKetangSuibi; @@ -69,7 +71,16 @@ public class KcKetangSuibiController extends JeecgController add(@RequestBody KcKetangSuibi kcKetangSuibi) { - kcKetangSuibiService.save(kcKetangSuibi); + if(StringUtils.isNotBlank(kcKetangSuibi.getKetangbiaoId())){ + QueryWrapper kcKetangSuibiQueryWrapper = new QueryWrapper<>(); + kcKetangSuibiQueryWrapper.eq("ketangbiao_id",kcKetangSuibi.getKetangbiaoId()); + kcKetangSuibiQueryWrapper.eq("user_id",kcKetangSuibi.getUserId()); + kcKetangSuibiService.remove(kcKetangSuibiQueryWrapper); + kcKetangSuibiService.save(kcKetangSuibi); + }else{ + kcKetangSuibiService.save(kcKetangSuibi); + } + return Result.OK("添加成功！"); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/entity/KcKetangSuibi.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/entity/KcKetangSuibi.java index a89a22c0..ad45bd08 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/entity/KcKetangSuibi.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/entity/KcKetangSuibi.java @@ -64,6 +64,9 @@ public class KcKetangSuibi implements Serializable { @Excel(name = "笔记内容", width = 15) @ApiModelProperty(value = "笔记内容") private java.lang.String notes; + /**笔记内容*/ + private java.lang.String title; + private java.lang.String sbType; @TableField(exist = false) private String kcmc; 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 236e29f6..b6d411f9 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 @@ -771,4 +771,20 @@ public class KcKetangbiaoController extends JeecgController> getKtsbMorelist(KcKetangbiao kcKetangbiao, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kcKetangbiao, req.getParameterMap()); + queryWrapper.ge(StringUtils.isNotBlank(kcKetangbiao.getStartTime()),"a.create_time",kcKetangbiao.getStartTime());// + queryWrapper.le(StringUtils.isNotBlank(kcKetangbiao.getEndTime()),"a.create_time",kcKetangbiao.getEndTime()+" 23:59:59");// + queryWrapper.le(StringUtils.isNotBlank(kcKetangbiao.getUserid()),"a.user_id",kcKetangbiao.getUserid());// + queryWrapper.orderByDesc("a.create_time"); + Page page = new Page(pageNo, pageSize); + IPage pageList = kcKetangbiaoService.getKtsbMorelist(page, queryWrapper); + return Result.OK(pageList); + } + } 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 9285e9c7..a7555058 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 @@ -38,10 +38,11 @@ public class KcKetangbiao implements Serializable { // @ApiModelProperty(value = "创建人登录名称") // private java.lang.String createBy; // /**创建日期*/ -// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") -// @DateTimeFormat(pattern="yyyy-MM-dd") -// @ApiModelProperty(value = "创建日期") -// private java.util.Date createTime; + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "创建日期") + @TableField(exist = false) + private java.util.Date createTime; // /**更新人登录名称*/ // @ApiModelProperty(value = "更新人登录名称") // private java.lang.String updateBy; @@ -300,4 +301,10 @@ public class KcKetangbiao implements Serializable { @TableField(exist = false) private String xspjPjf; + @TableField(exist = false) + private String sbType; + @TableField(exist = false) + private String title; + @TableField(exist = false) + private String notes; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java index 089444fe..06684c44 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java @@ -56,4 +56,6 @@ public interface KcKetangbiaoMapper extends BaseMapper { KcKetangbiao getScoreById(KcKetangbiao kcKetangbiao); IPage indexYkktzsPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + IPage getKtsbMorelist(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } 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 4893a2d0..4514bb39 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 @@ -557,11 +557,11 @@ @@ -611,5 +611,11 @@ + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java index 3db9f3ad..953576ff 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java @@ -58,4 +58,6 @@ public interface IKcKetangbiaoService extends IService { KcKetangbiao getScoreById(KcKetangbiao kcKetangbiao); IPage indexYkktzsPage(Page page, QueryWrapper qw3); + + IPage getKtsbMorelist(Page page, QueryWrapper queryWrapper); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java index 9a4d4dfc..29306959 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java @@ -116,4 +116,9 @@ public class KcKetangbiaoServiceImpl extends ServiceImpl indexYkktzsPage(Page page, QueryWrapper qw3) { return baseMapper.indexYkktzsPage(page,qw3); } + + @Override + public IPage getKtsbMorelist(Page page, QueryWrapper queryWrapper) { + return baseMapper.getKtsbMorelist(page,queryWrapper); + } }