From 29e40b3b3b9217afebdd58745d2121d3035a5871 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 31 Jan 2024 11:20:35 +0800 Subject: [PATCH] =?UTF-8?q?fix=2079986=20=E9=A1=B9=E7=9B=AE=E5=90=88?= =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B-=E6=A0=87?= =?UTF-8?q?=E5=87=86=E9=80=89=E6=8B=A9=E5=BC=B9=E7=AA=97=EF=BC=8C=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessProjectAssessController.java | 26 ++++++++++++++++++- .../controller/LawsAssessController.java | 2 +- .../service/impl/LawsAssessServiceImpl.java | 10 ++++++- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessController.java index e4053011..92aa9e48 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessController.java @@ -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> 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 pageList = lawsAssessService.queryPage(lawsAssess, pageNo, pageSize, req); + lawsAssessService.assignment(pageList.getRecords()); + return Result.OK(pageList); + } + /** * 项目合规评估流程-查询条款列表 * @return diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java index 9cb7094b..e53167cf 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java @@ -71,7 +71,7 @@ public class LawsAssessController extends JeroController pageList = lawsAssessService.queryPage(lawsAssess, pageNo, pageSize, req); diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java index d8cf2369..c45573af 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java @@ -64,7 +64,15 @@ public class LawsAssessServiceImpl extends ServiceImpl queryPage(LawsAssess lawsAssess, Integer pageNo, Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsAssess, req.getParameterMap()); - Page 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 page = new Page<>(pageNo, pageSize); return page(page, queryWrapper); }