QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 新增企业标准征求意见列表功能

Browse Source 
- 在 EsRevisionAdviceService 接口中添加 adviceList 方法，用于获取征求意见列表
- 实现 EsRevisionAdviceServiceImpl 中的 adviceList 方法，实现列表查询逻辑
- 在 LawsEnterpriseController 中添加 adviceList 接口，提供前端访问
- 该功能允许按标准 ID、批次号、创建用户 ID 和处理意见进行查询，并支持分页
This commit is contained in:
mzaxd
2024-10-12 16:39:59 +08:00
parent 111db69735
commit bd30ab964d
3 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/EsRevisionAdviceService.java
+2
View File
@@ -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<EsRevisionAdvice> {
IPage<EsRevisionAdvice> adviceList(EsRevisionAdvice advice, Integer pageNo, Integer pageSize);
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionAdviceServiceImpl.java
+22
View File
@@ -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<EsRevisionAdviceMapper, EsRevisionAdvice>
implements EsRevisionAdviceService{
@Override
public IPage<EsRevisionAdvice> adviceList(EsRevisionAdvice advice, Integer pageNo, Integer pageSize) {
LambdaQueryWrapper<EsRevisionAdvice> queryWrapper = new LambdaQueryWrapper<>();
String standardId = advice.getStandardId();
if (StrUtil.isBlank(standardId)) {
log.error("standardId为空");
throw new JeroBootException("standardId为空");
}
Page<EsRevisionAdvice> 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);
}
}
laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java
+16 -3
View File
@@ -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<IPage<EsRevisionAdvice>> adviceList(EsRevisionAdvice advice,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
IPage<EsRevisionAdvice> page = esRevisionAdviceService.adviceList(advice, pageNo, pageSize);
return Result.OK(page);
}
}