From a0e9d40121372735372833a2f18b6a1d9ff0d9b5 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Mon, 18 Dec 2023 09:48:06 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92):=2079355?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessEsInspectPlanOpinionController.java     | 13 +++++++++++++
 .../IProcessEsInspectPlanOpinionService.java       |  7 +++++++
 .../ProcessEsInspectPlanOpinionServiceImpl.java    | 14 ++++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanOpinionController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanOpinionController.java
index bd422cdd..36807a53 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanOpinionController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanOpinionController.java
@@ -102,6 +102,19 @@ public class ProcessEsInspectPlanOpinionController extends JeroController<Proces
 		 return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
 	 }
 
+	 /**
+	  *  企标稽查计划业务_意见表-获取最新的填写意见
+	  *
+	  * @param inspectPlanId
+	  * @return
+	  */
+	 @AutoLog(value = "企标稽查计划业务表-获取当前登陆人最新的填写意见")
+	 @ApiOperation(value="企标稽查计划业务表-获取当前登陆人最新的填写意见", notes="企标稽查计划业务表-获取当前登陆人最新的填写意见")
+	 @GetMapping(value = "/queryLastOpinionByInspectPlanId")
+	 public Result<ProcessEsInspectPlanOpinion> queryLastOpinion(String inspectPlanId) {
+		 return Result.OK(processEsInspectPlanOpinionService.queryLastOpinion(inspectPlanId));
+	 }
+
 	/**
 	 *  编辑
 	 *
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/IProcessEsInspectPlanOpinionService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/IProcessEsInspectPlanOpinionService.java
index 4f668d15..5ce76446 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/IProcessEsInspectPlanOpinionService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/IProcessEsInspectPlanOpinionService.java
@@ -72,4 +72,11 @@ public interface IProcessEsInspectPlanOpinionService extends IService<ProcessEsI
 	 * @return
 	 */
     ProcessEsInspectPlanOpinion queryById(String id);
+
+	/**
+	 * 企标稽查计划业务表-获取当前登陆人最新的填写意见
+	 * @param inspectPlanId
+	 * @return
+	 */
+	ProcessEsInspectPlanOpinion queryLastOpinion(String inspectPlanId);
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanOpinionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanOpinionServiceImpl.java
index 1c4f37ae..b0f9b623 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanOpinionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanOpinionServiceImpl.java
@@ -1,14 +1,17 @@
 package com.jero.modules.activiti.process.esinspectplan.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.common.exception.JeroBootException;
+import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlanOpinion;
 import com.jero.modules.activiti.process.esinspectplan.mapper.ProcessEsInspectPlanOpinionMapper;
 import com.jero.modules.activiti.process.esinspectplan.service.IProcessEsInspectPlanOpinionService;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -122,4 +125,15 @@ public class ProcessEsInspectPlanOpinionServiceImpl extends ServiceImpl<ProcessE
     public ProcessEsInspectPlanOpinion queryById(String id) {
         return getById(id);
     }
+
+	@Override
+	public ProcessEsInspectPlanOpinion queryLastOpinion(String inspectPlanId) {
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		LambdaQueryWrapper<ProcessEsInspectPlanOpinion> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(ProcessEsInspectPlanOpinion::getInspectPlanId, inspectPlanId);
+		queryWrapper.eq(ProcessEsInspectPlanOpinion::getCreateBy, sysUser.getUsername());
+		queryWrapper.orderByDesc(ProcessEsInspectPlanOpinion::getCreateTime);
+		queryWrapper.last("limit 1");
+		return getOne(queryWrapper,false);
+	}
 }