From 2fbf2df4c2b7e983d73a03e0369ff71bd65dbab6 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Sun, 9 Apr 2023 12:37:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/KcErrorreportController.java | 2 +- .../controller/KcGongkaikeController.java | 12 ++++++++++++ .../modules/kc/kcGongkaike/entity/KcGongkaike.java | 9 +++++---- .../kc/kcGongkaike/mapper/KcGongkaikeMapper.java | 6 ++++++ .../kc/kcGongkaike/mapper/xml/KcGongkaikeMapper.xml | 10 ++++++++++ .../kc/kcGongkaike/service/IKcGongkaikeService.java | 4 ++++ .../service/impl/KcGongkaikeServiceImpl.java | 7 +++++++ .../kc/kcYuyue/controller/KcYuyueController.java | 2 +- 8 files changed, 46 insertions(+), 6 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/controller/KcErrorreportController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/controller/KcErrorreportController.java index aae83e79..520ae482 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/controller/KcErrorreportController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/controller/KcErrorreportController.java @@ -84,7 +84,7 @@ public class KcErrorreportController extends JeecgController add(@RequestBody KcErrorreport kcErrorreport) { kcErrorreportService.save(kcErrorreport); - return Result.OK("添加成功！"); + return Result.OK("提交报错信息成功！"); } /** diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/controller/KcGongkaikeController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/controller/KcGongkaikeController.java index 9b5f78c9..9064c37b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/controller/KcGongkaikeController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/controller/KcGongkaikeController.java @@ -171,4 +171,16 @@ public class KcGongkaikeController extends JeecgController> getIndexList(KcGongkaike kcGongkaike, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kcGongkaike, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = kcGongkaikeService.getIndexList(page, queryWrapper); + return Result.OK(pageList); + } + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/entity/KcGongkaike.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/entity/KcGongkaike.java index ef001ffe..e7229a0c 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/entity/KcGongkaike.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/entity/KcGongkaike.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -98,4 +96,7 @@ public class KcGongkaike implements Serializable { @Excel(name = "类别", width = 15) @ApiModelProperty(value = "类别") private java.lang.String hxrlb; + + @TableField(exist = false) + private String type; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/mapper/KcGongkaikeMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/mapper/KcGongkaikeMapper.java index 75add3e8..4c72b57b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/mapper/KcGongkaikeMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/mapper/KcGongkaikeMapper.java @@ -2,9 +2,14 @@ package org.jeecg.modules.kc.kcGongkaike.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.kc.kcGongkaike.entity.KcGongkaike; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jetbrains.annotations.Contract; /** * @Description: kc_gongkaike @@ -14,4 +19,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface KcGongkaikeMapper extends BaseMapper { + IPage getIndexList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/mapper/xml/KcGongkaikeMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/mapper/xml/KcGongkaikeMapper.xml index 1c53c731..2ccb8236 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/mapper/xml/KcGongkaikeMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/mapper/xml/KcGongkaikeMapper.xml @@ -2,4 +2,14 @@ + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/service/IKcGongkaikeService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/service/IKcGongkaikeService.java index 48aa801c..74ec358d 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/service/IKcGongkaikeService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/service/IKcGongkaikeService.java @@ -1,5 +1,8 @@ package org.jeecg.modules.kc.kcGongkaike.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.kc.kcGongkaike.entity.KcGongkaike; import com.baomidou.mybatisplus.extension.service.IService; @@ -11,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IKcGongkaikeService extends IService { + IPage getIndexList(Page page, QueryWrapper queryWrapper); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/service/impl/KcGongkaikeServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/service/impl/KcGongkaikeServiceImpl.java index f0210f6b..528f66b4 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/service/impl/KcGongkaikeServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/service/impl/KcGongkaikeServiceImpl.java @@ -1,5 +1,8 @@ package org.jeecg.modules.kc.kcGongkaike.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.kc.kcGongkaike.entity.KcGongkaike; import org.jeecg.modules.kc.kcGongkaike.mapper.KcGongkaikeMapper; import org.jeecg.modules.kc.kcGongkaike.service.IKcGongkaikeService; @@ -16,4 +19,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class KcGongkaikeServiceImpl extends ServiceImpl implements IKcGongkaikeService { + @Override + public IPage getIndexList(Page page, QueryWrapper queryWrapper) { + return baseMapper.getIndexList(page,queryWrapper); + } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcYuyue/controller/KcYuyueController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcYuyue/controller/KcYuyueController.java index 1ec6ebee..0b410dc2 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcYuyue/controller/KcYuyueController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcYuyue/controller/KcYuyueController.java @@ -112,7 +112,7 @@ public class KcYuyueController extends JeecgController @DeleteMapping(value = "/delete") public Result delete(@RequestParam(name="id",required=true) String id) { kcYuyueService.removeById(id); - return Result.OK("删除成功!"); + return Result.OK("取消预约成功!"); } /**