From 5c4fccdd9caa1fd3976508a4b56337deaa7dc034 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 8 Sep 2023 13:50:29 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E5=B0=81=E8=A3=85=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EnterpriseStandardDeclareController.java | 3 +- .../entity/EnterpriseStandardDeclare.java | 20 ---- .../entity/dto/ESQueryCommonDTO.java | 103 ++++++++++++++++++ .../EnterpriseStandardDeclareMapper.java | 3 +- .../EnterpriseStandardDeclareService.java | 5 +- .../EnterpriseStandardDeclareServiceImpl.java | 4 +- 6 files changed, 111 insertions(+), 27 deletions(-) create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESQueryCommonDTO.java diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardDeclareController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardDeclareController.java index 04df6eb9..9926f587 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardDeclareController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardDeclareController.java @@ -5,6 +5,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardDeclare; +import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardDeclareVo; import com.jero.modules.laws.enterprise.service.EnterpriseStandardDeclareService; import io.swagger.annotations.Api; @@ -39,7 +40,7 @@ public class EnterpriseStandardDeclareController extends JeroController queryPageList(EnterpriseStandardDeclare esDeclare, + public Result queryPageList(ESQueryCommonDTO esDeclare, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { IPage pageList= esDeclareService.queryPageList(esDeclare, pageNo, pageSize); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardDeclare.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardDeclare.java index ed785f61..6d71eea5 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardDeclare.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardDeclare.java @@ -88,24 +88,4 @@ public class EnterpriseStandardDeclare implements Serializable { @ApiModelProperty(value = "内容") private String declareContent; - @TableField(exist = false) - @ApiModelProperty(value = "企标名称") - private String standardName; - - @TableField(exist = false) - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "宣贯开始日期") - private Date declareStartDate; - - @TableField(exist = false) - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "宣贯结束日期") - private Date declareEndDate; - - @TableField(exist = false) - @ApiModelProperty(value = "宣贯人姓名") - private String declareUserName; - } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESQueryCommonDTO.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESQueryCommonDTO.java new file mode 100644 index 00000000..2c740855 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESQueryCommonDTO.java @@ -0,0 +1,103 @@ +package com.jero.modules.laws.enterprise.entity.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @author: Caihaohan + * @Date: 2023/9/8 12:42 + */ + +@Data +public class ESQueryCommonDTO { + + // 通用 + + @ApiModelProperty(value = "通用-企标编号") + private String standardNo; + + @ApiModelProperty(value = "通用-标准名称") + private String standardName; + + // 宣贯 + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "宣贯-宣贯开始日期") + private Date declareStartDate; + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "宣贯-宣贯结束日期") + private Date declareEndDate; + + @ApiModelProperty(value = "宣贯-宣贯人姓名") + private String declareUserName; + + // 评审会 + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "评审会-评审开始日期") + private Date reviewStartDate; + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "评审会-评审结束日期") + private Date reviewEndDate; + + // 稽查 + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "稽查-稽查开始日期") + private Date inspectStartDate; + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "稽查-稽查结束日期") + private Date inspectEndDate; + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "稽查-创建开始日期") + private Date inspectCreateStartDate; + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "稽查-创建结束日期") + private Date inspectCreateEndDate; + + @ApiModelProperty(value = "稽查-状态") + private String inspectStatus;; + + @ApiModelProperty(value = "稽查-所属部门") + private String inspectDept; + + // 复审计划 + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "复审计划-发布开始日期") + private Date releaseStartDate; + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "复审计划-发布结束日期") + private Date releaseEndDate; + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "复审计划-复审开始日期") + private Date recheckStartDate; + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "复审计划-复审结束日期") + private Date recheckEndDate; + +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardDeclareMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardDeclareMapper.java index 26146e04..348edd1b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardDeclareMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardDeclareMapper.java @@ -3,6 +3,7 @@ package com.jero.modules.laws.enterprise.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardDeclare; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardDeclareVo; import org.apache.ibatis.annotations.Param; @@ -20,7 +21,7 @@ public interface EnterpriseStandardDeclareMapper extends BaseMapper page(IPage page, @Param("param") EnterpriseStandardDeclare esDeclare); + IPage page(IPage page, @Param("param") ESQueryCommonDTO esDeclare); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardDeclareService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardDeclareService.java index 41efb7a0..442ea0e2 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardDeclareService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardDeclareService.java @@ -3,10 +3,9 @@ package com.jero.modules.laws.enterprise.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardDeclare; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardDeclareVo; -import javax.servlet.http.HttpServletRequest; - /** * @author ThinkBook * @description 针对表【laws_enterprise_standard_declare】的数据库操作Service @@ -21,5 +20,5 @@ public interface EnterpriseStandardDeclareService extends IService queryPageList(EnterpriseStandardDeclare esDeclare, Integer pageNo, Integer pageSize); + IPage queryPageList(ESQueryCommonDTO esDeclare, Integer pageNo, Integer pageSize); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardDeclareServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardDeclareServiceImpl.java index 90ef683e..1f5b3546 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardDeclareServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardDeclareServiceImpl.java @@ -4,13 +4,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardDeclare; +import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardDeclareVo; import com.jero.modules.laws.enterprise.service.EnterpriseStandardDeclareService; import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardDeclareMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; /** * @author ThinkBook @@ -25,7 +25,7 @@ public class EnterpriseStandardDeclareServiceImpl extends ServiceImpl queryPageList(EnterpriseStandardDeclare esDeclare, Integer pageNo, Integer pageSize) { + public IPage queryPageList(ESQueryCommonDTO esDeclare, Integer pageNo, Integer pageSize) { IPage page = new Page<>(pageNo, pageSize); return esDeclareMapper.page(page, esDeclare); }