From 24d28ecef995ec2f7c7ff2caf2848ae45b80bc4d Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Sat, 15 Apr 2023 15:54:32 +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 | 3 +- .../kcErrorreport/entity/KcErrorreport.java | 31 ++++++++++++++--- .../mapper/KcErrorreportMapper.java | 3 ++ .../mapper/xml/KcErrorreportMapper.xml | 33 +++++++++++++++++++ .../service/IKcErrorreportService.java | 3 ++ .../impl/KcErrorreportServiceImpl.java | 6 ++++ .../kc/kcGongkaike/entity/KcGongkaike.java | 8 +++++ .../mapper/xml/KcGongkaikeMapper.xml | 1 + .../controller/KcNoticeController.java | 4 --- .../modules/kc/kcNotice/entity/KcNotice.java | 12 +++---- 10 files changed, 88 insertions(+), 16 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 520ae482..b4a62f64 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 @@ -67,9 +67,8 @@ public class KcErrorreportController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(kcErrorreport, req.getParameterMap()); Page page = new Page(pageNo, pageSize); - IPage pageList = kcErrorreportService.page(page, queryWrapper); + IPage pageList = kcErrorreportService.selectPageList(page, kcErrorreport); return Result.OK(pageList); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/entity/KcErrorreport.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/entity/KcErrorreport.java index 50047a6e..9dda37f4 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/entity/KcErrorreport.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/entity/KcErrorreport.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; @@ -97,9 +95,34 @@ public class KcErrorreport implements Serializable { /**是否出镜，0-出镜，1-不出镜*/ @Excel(name = "是否出镜，0-出镜，1-不出镜", width = 15) @ApiModelProperty(value = "是否出镜，0-出镜，1-不出镜") + @Dict(dicCode = "sfcj") private java.lang.Integer sfcj; @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期") private java.util.Date createTime; + + + @TableField(exist = false) + private java.lang.String college; + @TableField(exist = false) + private java.lang.String kcmc; + @TableField(exist = false) + private java.lang.String kkdw; + @TableField(exist = false) + private java.lang.String ktskrq; + @TableField(exist = false) + private java.lang.String hh; + @TableField(exist = false) + @Dict(dicCode = "sfcj") + private java.lang.String ktbsfcj; + @TableField(exist = false) + private java.lang.String startTime; + @TableField(exist = false) + private java.lang.String endTime; + @TableField(exist = false) + private java.lang.String szdw; + + + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/mapper/KcErrorreportMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/mapper/KcErrorreportMapper.java index 56cf4109..13bd00cc 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/mapper/KcErrorreportMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/mapper/KcErrorreportMapper.java @@ -2,6 +2,8 @@ package org.jeecg.modules.kc.kcErrorreport.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.kc.kcErrorreport.entity.KcErrorreport; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface KcErrorreportMapper extends BaseMapper { + IPage selectPageList(Page page, KcErrorreport kcErrorreport); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/mapper/xml/KcErrorreportMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/mapper/xml/KcErrorreportMapper.xml index 633f5c0a..a7d19ef2 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/mapper/xml/KcErrorreportMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/mapper/xml/KcErrorreportMapper.xml @@ -2,4 +2,37 @@ + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/service/IKcErrorreportService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/service/IKcErrorreportService.java index 6e91d80a..f5613807 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/service/IKcErrorreportService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/service/IKcErrorreportService.java @@ -1,5 +1,7 @@ package org.jeecg.modules.kc.kcErrorreport.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.kc.kcErrorreport.entity.KcErrorreport; import com.baomidou.mybatisplus.extension.service.IService; @@ -11,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IKcErrorreportService extends IService { + IPage selectPageList(Page page, KcErrorreport kcErrorreport); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/service/impl/KcErrorreportServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/service/impl/KcErrorreportServiceImpl.java index 2f5b553c..bad01c30 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/service/impl/KcErrorreportServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/service/impl/KcErrorreportServiceImpl.java @@ -1,5 +1,7 @@ package org.jeecg.modules.kc.kcErrorreport.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.kc.kcErrorreport.entity.KcErrorreport; import org.jeecg.modules.kc.kcErrorreport.mapper.KcErrorreportMapper; import org.jeecg.modules.kc.kcErrorreport.service.IKcErrorreportService; @@ -16,4 +18,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class KcErrorreportServiceImpl extends ServiceImpl implements IKcErrorreportService { + @Override + public IPage selectPageList(Page page, KcErrorreport kcErrorreport) { + return baseMapper.selectPageList(page,kcErrorreport); + } } 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 e7229a0c..add6d0ee 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 @@ -97,6 +97,14 @@ public class KcGongkaike implements Serializable { @ApiModelProperty(value = "类别") private java.lang.String hxrlb; + + @ApiModelProperty(value = "图片名称2") + private java.lang.String tpmc2; + + @ApiModelProperty(value = "图片名称3") + private java.lang.String tpmc3; + + @TableField(exist = false) private String type; } 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 2ccb8236..3dc7afae 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 @@ -12,4 +12,5 @@ ) a ${ew.customSqlSegment} + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcNotice/controller/KcNoticeController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcNotice/controller/KcNoticeController.java index eeac4939..e66572a6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcNotice/controller/KcNoticeController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcNotice/controller/KcNoticeController.java @@ -81,7 +81,6 @@ public class KcNoticeController extends JeecgController add(@RequestBody KcNotice kcNotice) { kcNoticeService.save(kcNotice); @@ -96,7 +95,6 @@ public class KcNoticeController extends JeecgController edit(@RequestBody KcNotice kcNotice) { kcNoticeService.updateById(kcNotice); @@ -111,7 +109,6 @@ public class KcNoticeController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { kcNoticeService.removeById(id); @@ -126,7 +123,6 @@ public class KcNoticeController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.kcNoticeService.removeByIds(Arrays.asList(ids.split(","))); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcNotice/entity/KcNotice.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcNotice/entity/KcNotice.java index 5f3d332f..f184e73d 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcNotice/entity/KcNotice.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcNotice/entity/KcNotice.java @@ -44,12 +44,12 @@ public class KcNotice implements Serializable { @Excel(name = "类型 0：外部链接 1：富文本 ", width = 15, dicCode = "ntype") @Dict(dicCode = "ntype") @ApiModelProperty(value = "类型 0：外部链接 1：富文本 ") - private java.lang.Integer ntype; + private java.lang.String ntype; /**状态 0：不可用 1：可用*/ @Excel(name = "状态 0：不可用 1：可用", width = 15, dicCode = "nstatus") @Dict(dicCode = "nstatus") @ApiModelProperty(value = "状态 0：不可用 1：可用") - private java.lang.Integer nstatus; + private java.lang.String nstatus; /**内容*/ @Excel(name = "内容", width = 15) private transient java.lang.String ncontentString; @@ -84,14 +84,14 @@ public class KcNotice implements Serializable { @ApiModelProperty(value = "链接") private java.lang.String nlink; /**发布日期*/ - @Excel(name = "发布日期", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Excel(name = "发布日期", width = 20, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "发布日期") private java.util.Date ndate; /**是否置顶0：否 1：置顶*/ @Excel(name = "是否置顶0：否 1：置顶", width = 15, dicCode = "ontop") @Dict(dicCode = "ontop") @ApiModelProperty(value = "是否置顶0：否 1：置顶") - private java.lang.Integer ontop; + private java.lang.String ontop; }