ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: 封装统一查询对象

Browse Source
This commit is contained in:
mzaxd
2023-09-08 14:07:45 +08:00
parent c8b7a0df5b
commit 5c4fccdd9c
6 changed files with 111 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardDeclareController.java
+2 -1
View File
@@ -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<Enterpri
@AutoLog(value = "企标宣贯-分页列表查询")
@ApiOperation(value="企标宣贯-分页列表查询", notes="企标宣贯-分页列表查询")
@GetMapping(value = "/page")
public Result<?> queryPageList(EnterpriseStandardDeclare esDeclare,
public Result<?> queryPageList(ESQueryCommonDTO esDeclare,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
IPage<EnterpriseStandardDeclareVo> pageList= esDeclareService.queryPageList(esDeclare, pageNo, pageSize);
laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardDeclare.java
-20
View File
@@ -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;
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESQueryCommonDTO.java
+103
View File
@@ -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;
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardDeclareMapper.java
+2 -1
View File
@@ -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<EnterpriseSt
* @param esDeclare
* @return
*/
IPage<EnterpriseStandardDeclareVo> page(IPage<EnterpriseStandardDeclareVo> page, @Param("param") EnterpriseStandardDeclare esDeclare);
IPage<EnterpriseStandardDeclareVo> page(IPage<EnterpriseStandardDeclareVo> page, @Param("param") ESQueryCommonDTO esDeclare);
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardDeclareService.java
+2 -3
View File
@@ -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<EnterpriseSta
* @param pageSize
* @return
*/
IPage<EnterpriseStandardDeclareVo> queryPageList(EnterpriseStandardDeclare esDeclare, Integer pageNo, Integer pageSize);
IPage<EnterpriseStandardDeclareVo> queryPageList(ESQueryCommonDTO esDeclare, Integer pageNo, Integer pageSize);
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardDeclareServiceImpl.java
+2 -2
View File
@@ -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<Enterprise
private EnterpriseStandardDeclareMapper esDeclareMapper;
@Override
public IPage<EnterpriseStandardDeclareVo> queryPageList(EnterpriseStandardDeclare esDeclare, Integer pageNo, Integer pageSize) {
public IPage<EnterpriseStandardDeclareVo> queryPageList(ESQueryCommonDTO esDeclare, Integer pageNo, Integer pageSize) {
IPage<EnterpriseStandardDeclareVo> page = new Page<>(pageNo, pageSize);
return esDeclareMapper.page(page, esDeclare);
}