ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 79986 项目合规评估流程-标准选择弹窗，查询条件失效

Browse Source
This commit is contained in:
lijiarao
2024-01-31 11:20:35 +08:00
parent c6d95d5581
commit 29e40b3b3b
3 changed files with 35 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/projectassess/controller/ProcessProjectAssessController.java
+25 -1
View File
@@ -2,7 +2,9 @@ package com.jero.modules.activiti.process.projectassess.controller;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.jero.common.aspect.annotation.DictPoint;
import com.jero.common.constant.CommonConstant;
import com.jero.common.constant.enums.YesOrNoEnum;
import com.jero.common.exception.JeroBootException;
import com.jero.modules.activiti.process.fb.vo.ProcessFbStandardConsultationVO;
import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssess;
@@ -20,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
import com.jero.modules.activiti.process.projectassess.vo.ProcessProjectAssessVO;
import com.jero.modules.laws.documenttool.service.IDocumentSplitService;
import com.jero.modules.projectLibrary.entity.LawsAssess;
import com.jero.modules.projectLibrary.service.ILawsAssessService;
import com.jero.modules.projectLibrary.vo.DecompositionOrderSourceVO;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -60,7 +63,8 @@ public class ProcessProjectAssessController extends JeroController<ProcessProjec
private ProcessProjectAssessService processProjectAssessService;
@Resource
private IDocumentSplitService documentSplitService;
@Resource
private ILawsAssessService lawsAssessService;
@DictPoint
@GetMapping("/queryProcessInfoVO")
@AutoLog(value = "项目合规评估流程-查询流程信息")
@@ -115,6 +119,26 @@ public class ProcessProjectAssessController extends JeroController<ProcessProjec
return Result.OK();
}
/**
* 分页列表查询
*/
@AutoLog(value = "项目合规评估流程-法规清单-分页列表查询")
@ApiOperation(value="项目合规评估流程-法规清单-分页列表查询")
@GetMapping(value = "/processQueryPage")
public Result<IPage<LawsAssess>> processQueryPage(LawsAssess lawsAssess,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
String projectId = lawsAssess.getProjectId();
if (StringUtils.isBlank(projectId)){
throw new JeroBootException(ResultCommon.PARAMETER_NOT_RECOGNIZED);
}
lawsAssess.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
IPage<LawsAssess> pageList = lawsAssessService.queryPage(lawsAssess, pageNo, pageSize, req);
lawsAssessService.assignment(pageList.getRecords());
return Result.OK(pageList);
}
/**
* 项目合规评估流程-查询条款列表
* @return
laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java
+1 -1
View File
@@ -71,7 +71,7 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
HttpServletRequest req) {
String projectId = lawsAssess.getProjectId();
if (StringUtils.isBlank(projectId)){
throw new JeroBootException("projectId not null");
throw new JeroBootException(ResultCommon.PARAMETER_NOT_RECOGNIZED);
}
lawsAssess.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
IPage<LawsAssess> pageList = lawsAssessService.queryPage(lawsAssess, pageNo, pageSize, req);
laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java
+9 -1
View File
@@ -64,7 +64,15 @@ public class LawsAssessServiceImpl extends ServiceImpl<LawsAssessMapper, LawsAss
public IPage<LawsAssess> queryPage(LawsAssess lawsAssess, Integer pageNo, Integer pageSize,
HttpServletRequest req) {
QueryWrapper<LawsAssess> queryWrapper = QueryGenerator.initQueryWrapper(lawsAssess, req.getParameterMap());
Page<LawsAssess> page = new Page<>(pageNo, pageSize);
String standardNumberOrName = lawsAssess.getStandardNumberOrName();
if (StringUtils.isNotBlank(standardNumberOrName)){
queryWrapper.lambda().and(i->{
i.like(LawsAssess::getStandardName,standardNumberOrName)
.or()
.like(LawsAssess::getStandardNumber,standardNumberOrName);
});
}
Page<LawsAssess> page = new Page<>(pageNo, pageSize);
return page(page, queryWrapper);
}