diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanController.java index 0f326462..2a6ff414 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanController.java @@ -182,7 +182,7 @@ public class ProcessEsInspectPlanController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) throws Exception { return processEsInspectPlanService.importExcel(request, response); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/mapper/ProcessEsInspectPlanOpinionMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/mapper/ProcessEsInspectPlanOpinionMapper.java index e8979f20..cd5c906c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/mapper/ProcessEsInspectPlanOpinionMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/mapper/ProcessEsInspectPlanOpinionMapper.java @@ -2,6 +2,9 @@ package com.jero.modules.activiti.process.esinspectplan.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlanOpinion; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @Description: 企标稽查计划业务_意见表 @@ -11,4 +14,10 @@ import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPl */ public interface ProcessEsInspectPlanOpinionMapper extends BaseMapper { + /** + * 标准化组-根据账号分组查最新 + * @param id + * @return + */ + List findLastByGroup(@Param("inspectPlanId") String inspectPlanId); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/mapper/xml/ProcessEsInspectPlanOpinionMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/mapper/xml/ProcessEsInspectPlanOpinionMapper.xml index 35181b8e..e357c654 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/mapper/xml/ProcessEsInspectPlanOpinionMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/mapper/xml/ProcessEsInspectPlanOpinionMapper.xml @@ -2,4 +2,14 @@ + \ No newline at end of file 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 5ce76446..ccc1c467 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 @@ -79,4 +79,11 @@ public interface IProcessEsInspectPlanOpinionService extends IService findLastByGroup(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 b0f9b623..dcb06305 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 @@ -30,8 +30,13 @@ import java.util.List; @Transactional(rollbackFor = JeroBootException.class) public class ProcessEsInspectPlanOpinionServiceImpl extends ServiceImpl implements IProcessEsInspectPlanOpinionService { + private final ProcessEsInspectPlanOpinionMapper processEsInspectPlanOpinionMapper; - /** + public ProcessEsInspectPlanOpinionServiceImpl(ProcessEsInspectPlanOpinionMapper processEsInspectPlanOpinionMapper) { + this.processEsInspectPlanOpinionMapper = processEsInspectPlanOpinionMapper; + } + + /** * 分页查询 * * @param processEsInspectPlanOpinion @@ -136,4 +141,9 @@ public class ProcessEsInspectPlanOpinionServiceImpl extends ServiceImpl findLastByGroup(String inspectPlanId) { + return processEsInspectPlanOpinionMapper.findLastByGroup(inspectPlanId); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java index 1b41c405..57fb72e9 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java @@ -108,10 +108,8 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl list) { for (ProcessEsInspectPlan processEsInspectPlan : list) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(ProcessEsInspectPlanOpinion::getInspectPlanId, processEsInspectPlan.getId()); - queryWrapper.orderByDesc(ProcessEsInspectPlanOpinion::getCreateTime); - List opinionList = iProcessEsInspectPlanOpinionService.list(queryWrapper); + // 意见 + List opinionList = iProcessEsInspectPlanOpinionService.findLastByGroup( processEsInspectPlan.getId()); for (ProcessEsInspectPlanOpinion processEsInspectPlanOpinion : opinionList) { // 用户翻译 processEsInspectPlanOpinion.setCreateByDictText(sysUserService.dictByIdsOrUserNames("", processEsInspectPlanOpinion.getCreateBy()));