From 19e3494229bad3eff9049837e943a0901b800092 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 9 May 2022 10:49:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=8F=8D=E9=A6=88=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...jectTaskInventoryFeedbackEOController.java | 7 +++--- .../ProjectTaskInventoryFeedbackEO.java | 5 ++++ ...ProjectTaskInventoryFeedbackEOService.java | 3 ++- ...ectTaskInventoryFeedbackEOServiceImpl.java | 23 +++++++++++++++++-- 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryFeedbackEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryFeedbackEOController.java index fbe41f083..ed15333fd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryFeedbackEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryFeedbackEOController.java @@ -2,6 +2,7 @@ package com.jero.modules.project.controller; import java.util.Arrays; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; @@ -35,7 +36,7 @@ import com.jero.common.aspect.annotation.AutoLog; public class ProjectTaskInventoryFeedbackEOController extends JeroController { @Autowired private IProjectTaskInventoryFeedbackEOService projectTaskInventoryFeedbackEOService; - + /** * 分页列表查询 * @@ -66,8 +67,8 @@ public class ProjectTaskInventoryFeedbackEOController extends JeroController> queryList() { - List list = projectTaskInventoryFeedbackEOService.queryList(); + public Result> queryList(@RequestParam Map params) { + List list = projectTaskInventoryFeedbackEOService.queryList(params); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java index 3ae958c8f..96f7bfa64 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java @@ -6,6 +6,7 @@ import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -93,4 +94,8 @@ public class ProjectTaskInventoryFeedbackEO implements Serializable { @ApiModelProperty(value = "法规清单id") private String projectTaskInventoryId; + /**是否是该条数据的创建人**/ + @TableField(exist = false) + private boolean isCreateUser = false; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryFeedbackEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryFeedbackEOService.java index 46a74f585..7d9d551e4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryFeedbackEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryFeedbackEOService.java @@ -3,6 +3,7 @@ package com.jero.modules.project.service; import com.jero.modules.project.entity.ProjectTaskInventoryFeedbackEO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; +import java.util.Map; /** * @Description: 项目库-任务清单-意见反馈表 @@ -57,5 +58,5 @@ public interface IProjectTaskInventoryFeedbackEOService extends IService queryList(); + List queryList(Map params); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java index 5a6a9db17..2a1648a50 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java @@ -1,11 +1,18 @@ package com.jero.modules.project.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.system.vo.LoginUser; import com.jero.modules.project.entity.ProjectTaskInventoryFeedbackEO; import com.jero.modules.project.mapper.ProjectTaskInventoryFeedbackEOMapper; import com.jero.modules.project.service.IProjectTaskInventoryFeedbackEOService; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Service; import java.util.List; import java.util.Date; +import java.util.Map; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** @@ -83,7 +90,19 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl queryList() { - return list(); + public List queryList(Map params) { + String actiProcInstId = (String) params.get("actiProcInstId"); // 流程实例id + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(ProjectTaskInventoryFeedbackEO::getActiProcInstId,actiProcInstId); + List projectTaskInventoryFeedbackEOS = this.baseMapper.selectList(queryWrapper); + if(CollectionUtils.isNotEmpty(projectTaskInventoryFeedbackEOS)){ + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + for (ProjectTaskInventoryFeedbackEO projectTaskInventoryFeedbackEO : projectTaskInventoryFeedbackEOS) { + if (StringUtils.equals(currentUser.getUsername(),projectTaskInventoryFeedbackEO.getCreateBy())) { + projectTaskInventoryFeedbackEO.setCreateUser(true); + } + } + } + return projectTaskInventoryFeedbackEOS; } }