fix(企标稽查计划): 79355

This commit is contained in:
yjz
2023-12-18 09:48:06 +08:00
parent 6a0f7f4c64
commit a0e9d40121
3 changed files with 34 additions and 0 deletions
@@ -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));
}
/**
* 编辑
*
@@ -72,4 +72,11 @@ public interface IProcessEsInspectPlanOpinionService extends IService<ProcessEsI
* @return
*/
ProcessEsInspectPlanOpinion queryById(String id);
/**
* 企标稽查计划业务表-获取当前登陆人最新的填写意见
* @param inspectPlanId
* @return
*/
ProcessEsInspectPlanOpinion queryLastOpinion(String inspectPlanId);
}
@@ -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);
}
}