意见反馈。

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<ProjectTaskInventoryFeedbackEO, IProjectTaskInventoryFeedbackEOService> {
 	@Autowired
 	private IProjectTaskInventoryFeedbackEOService projectTaskInventoryFeedbackEOService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -66,8 +67,8 @@ public class ProjectTaskInventoryFeedbackEOController extends JeroController<Pro
 	@AutoLog(value = "项目库-任务清单-意见反馈表-列表查询")
     @ApiOperation(value="项目库-任务清单-意见反馈表-列表查询", notes="项目库-任务清单-意见反馈表-列表查询")
 	@GetMapping(value = "/list")
-	public Result<List<ProjectTaskInventoryFeedbackEO>> queryList() {
-        List<ProjectTaskInventoryFeedbackEO> list = projectTaskInventoryFeedbackEOService.queryList();
+	public Result<List<ProjectTaskInventoryFeedbackEO>> queryList(@RequestParam Map<String,Object> params) {
+        List<ProjectTaskInventoryFeedbackEO> list = projectTaskInventoryFeedbackEOService.queryList(params);
         return Result.OK(list);
 	}
 

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;
+
 }

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<Project
 	 *
 	 * @return
 	 */
-    List<ProjectTaskInventoryFeedbackEO> queryList();
+    List<ProjectTaskInventoryFeedbackEO> queryList(Map<String,Object> params);
 }

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<Proje
 	 * @return
 	 */
 	@Override
-    public List<ProjectTaskInventoryFeedbackEO> queryList() {
-        return list();
+    public List<ProjectTaskInventoryFeedbackEO> queryList(Map<String,Object> params) {
+		String actiProcInstId = (String) params.get("actiProcInstId"); // 流程实例id
+		QueryWrapper<ProjectTaskInventoryFeedbackEO> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().eq(ProjectTaskInventoryFeedbackEO::getActiProcInstId,actiProcInstId);
+		List<ProjectTaskInventoryFeedbackEO> 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;
     }
 }