From bd30ab964dace61dec9cdf310fdeee2b56d25353 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Sat, 12 Oct 2024 16:39:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 EsRevisionAdviceService 接口中添加 adviceList 方法，用于获取征求意见列表 - 实现 EsRevisionAdviceServiceImpl 中的 adviceList 方法，实现列表查询逻辑 - 在 LawsEnterpriseController 中添加 adviceList 接口，提供前端访问 - 该功能允许按标准 ID、批次号、创建用户 ID 和处理意见进行查询，并支持分页 --- .../service/EsRevisionAdviceService.java | 2 ++ .../impl/EsRevisionAdviceServiceImpl.java | 22 +++++++++++++++++++ .../controller/LawsEnterpriseController.java | 19 +++++++++++++--- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/EsRevisionAdviceService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/EsRevisionAdviceService.java index 638f3659..35617d82 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/EsRevisionAdviceService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/EsRevisionAdviceService.java @@ -1,5 +1,6 @@ package com.jero.modules.activiti.process.esRevisionAdvice.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.activiti.process.esRevisionAdvice.entity.EsRevisionAdvice; @@ -10,4 +11,5 @@ import com.jero.modules.activiti.process.esRevisionAdvice.entity.EsRevisionAdvic */ public interface EsRevisionAdviceService extends IService { + IPage adviceList(EsRevisionAdvice advice, Integer pageNo, Integer pageSize); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionAdviceServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionAdviceServiceImpl.java index 0ea65e90..dcfdf481 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionAdviceServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionAdviceServiceImpl.java @@ -1,6 +1,11 @@ package com.jero.modules.activiti.process.esRevisionAdvice.service.impl; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.modules.activiti.process.esRevisionAdvice.entity.EsRevisionAdvice; import com.jero.modules.activiti.process.esRevisionAdvice.mapper.EsRevisionAdviceMapper; import com.jero.modules.activiti.process.esRevisionAdvice.service.EsRevisionAdviceService; @@ -15,6 +20,23 @@ import org.springframework.stereotype.Service; public class EsRevisionAdviceServiceImpl extends ServiceImpl implements EsRevisionAdviceService{ + @Override + public IPage adviceList(EsRevisionAdvice advice, Integer pageNo, Integer pageSize) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + String standardId = advice.getStandardId(); + if (StrUtil.isBlank(standardId)) { + log.error("standardId为空"); + throw new JeroBootException("standardId为空"); + } + Page page = new Page<>(pageNo, pageSize); + queryWrapper.eq(EsRevisionAdvice::getStandardId, advice.getStandardId()); + queryWrapper.eq(null != advice.getBatchNum() , EsRevisionAdvice::getBatchNum, advice.getBatchNum()); + queryWrapper.eq(StrUtil.isNotBlank(advice.getCreateUserId()), EsRevisionAdvice::getCreateUserId, advice.getCreateUserId()); + queryWrapper.eq(StrUtil.isNotBlank(advice.getHandleAdvice()), EsRevisionAdvice::getHandleAdvice, advice.getHandleAdvice()); + queryWrapper.like(StrUtil.isNotBlank(advice.getTermNum()), EsRevisionAdvice::getTermNum, advice.getTermNum()); + queryWrapper.orderByAsc(EsRevisionAdvice::getBatchNum); + return page(page, queryWrapper); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java index 9e5bf8e7..e0ed909d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java @@ -8,6 +8,8 @@ import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.exception.JeroBootException; import com.jero.common.util.MessageUtils; +import com.jero.modules.activiti.process.esRevisionAdvice.entity.EsRevisionAdvice; +import com.jero.modules.activiti.process.esRevisionAdvice.service.EsRevisionAdviceService; import com.jero.modules.compare.service.ISarFileCompareInfoService; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.service.ILawsCommonService; @@ -48,15 +50,14 @@ public class LawsEnterpriseController { private ILawsNodeRelationService lawsNodeRelationService; @Autowired private ILawsStandardCollectionService lawsStandardCollectionService; - @Resource private ISarFileSplitInfoService splitInfoService; - @Resource private ISarFileCompareInfoService compareInfoService; - @Resource private ILawsReplacedStandardService replacedStandardService; + @Resource + private EsRevisionAdviceService esRevisionAdviceService; private static final String MODULE_VALUE = TableNameEnum.ENTERPRISE_STANDARDS.getValue(); @@ -247,4 +248,16 @@ public class LawsEnterpriseController { } return Result.OK(); } + + @AutoLog(value = "企业法规标准-查看征求意见") + @ApiOperation(value="企业法规标准-查看征求意见", notes="企业法规标准-查看征求意见") + @GetMapping("/adviceList") + @ApiOperationSupport(order = 19) + @RequiresPermissions("enterpriseStandard:adviceList") + public Result> adviceList(EsRevisionAdvice advice, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + IPage page = esRevisionAdviceService.adviceList(advice, pageNo, pageSize); + return Result.OK(page); + } }