From 6488d0694bf90696b416aeaffd9933e30960f069 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 18 Apr 2022 14:37:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E3=80=81=E4=BB=BB=E5=8A=A1=E7=A1=AE=E8=AE=A4=E6=88=AA=E6=AD=A2?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOController.java | 4 ++-- .../project/entity/ProjectLawsInventoryEO.java | 14 ++++++++++++++ .../service/IProjectLawsInventoryEOService.java | 4 +++- .../impl/ProjectLawsInventoryEOServiceImpl.java | 13 +++++++++++-- 4 files changed, 30 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java index c34e6d958..8c2747ffd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java @@ -67,8 +67,8 @@ public class ProjectLawsInventoryEOController extends JeroController> queryList(ProjectLawsInventoryEO projectLawsInventoryEO) { - List list = projectLawsInventoryEOService.queryList(projectLawsInventoryEO); + public Result> queryList(ProjectLawsInventoryEO projectLawsInventoryEO,HttpServletRequest req) { + List list = projectLawsInventoryEOService.queryList(projectLawsInventoryEO,req); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java index 43b4bbad0..c1443ce63 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java @@ -285,4 +285,18 @@ public class ProjectLawsInventoryEO implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "文档库id") private String ids;//文档库id 多个之间用英文逗号拼接 + + /**清单确认-截止时间*/ + @Excel(name = "清单确认-截止时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "清单确认-截止时间") + private Date inventoryAffirmDueDate; + + /**任务确认-截止时间*/ + @Excel(name = "任务确认-截止时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "任务确认-截止时间") + private Date taskAffirmDueDate; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java index 907171695..9df208721 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java @@ -3,6 +3,8 @@ package com.jero.modules.project.service; import com.jero.common.api.vo.Result; import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.baomidou.mybatisplus.extension.service.IService; + +import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Map; @@ -59,7 +61,7 @@ public interface IProjectLawsInventoryEOService extends IService queryList(ProjectLawsInventoryEO projectLawsInventoryEO); + List queryList(ProjectLawsInventoryEO projectLawsInventoryEO, HttpServletRequest req); /** * 批量更新状态 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 1c7a80d8b..355ce74e3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; +import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.service.IBussDocumentLibraryEOService; @@ -27,6 +28,8 @@ import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import javax.servlet.http.HttpServletRequest; + /** * @Description: 项目库-法规清单表 * @Author: jero-boot @@ -135,7 +138,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryList(ProjectLawsInventoryEO projectLawsInventoryEO) { + public List queryList(ProjectLawsInventoryEO projectLawsInventoryEO, HttpServletRequest req) { + QueryWrapper projectLawsInventoryEOQueryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO,req.getParameterMap()); String projectLibraryId = projectLawsInventoryEO.getProjectLibraryId(); if(StringUtils.isEmpty(projectLibraryId)){ @@ -144,7 +148,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLawsInventoryEOQueryWrapper = new QueryWrapper<>(); projectLawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); //验证当前用户在该项目中是什么角色 @@ -340,6 +343,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); if(StringUtils.isNotEmpty(ids)){ queryWrapper.lambda().in(ProjectLawsInventoryEO::getId, Arrays.asList(ids.split(","))); @@ -359,7 +365,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl