From f83a31c7420bd3114239f828d992a52a805e462f Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 25 Dec 2023 09:54:49 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E6=B5=81=E7=A8=8B=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ProcessProjectAssessService.java | 1 + .../ProcessProjectNotMetController.java | 26 ++++++++++++++++++- .../projectLibrary/entity/LawsAssess.java | 1 - .../entity/LawsEvaluationNotMet.java | 9 +++++++ .../service/ILawsEvaluationNotMetService.java | 2 ++ .../impl/LawsEvaluationNotMetServiceImpl.java | 23 ++++++++++++++++ 6 files changed, 60 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java index 79b61f60..588531e7 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java @@ -662,6 +662,7 @@ public class ProcessProjectAssessService extends ServiceImpl { /** * 服务对象 */ @Autowired private ProcessProjectNotMetService processProjectNotMetService; + @Autowired + private ILawsEvaluationNotMetService lawsEvaluationNotMetService; + /** + * 分页列表查询 + */ + @AutoLog(value = "未符合项跟踪流程-查询未符合项") + @ApiOperation(value="未符合项跟踪流程-查询未符合项") + @GetMapping(value = "/pageForProcess") + public Result> pageForProcess(LawsEvaluationNotMet lawsEvaluationNotMet, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + IPage pageList = lawsEvaluationNotMetService.pageForProcess(lawsEvaluationNotMet, pageNo, pageSize, req); + return Result.OK(pageList); + } @DictPoint @GetMapping("/queryProcessInfoVO") diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssess.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssess.java index 3e69bff6..128b5ee7 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssess.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssess.java @@ -108,7 +108,6 @@ public class LawsAssess implements Serializable { private String processStatus; /**评估结果(1-符合、2-不符合、3-待验证、4-不涉及)*/ - @TableField(exist = false) @Excel(name = "评估结果", width = 15) @Dict(dicCode = "assess_results") @ApiModelProperty(value = "评估结果(1-符合、2-不符合、3-待验证、4-不涉及)") diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java index e1d7605d..16ff7051 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java @@ -71,6 +71,11 @@ public class LawsEvaluationNotMet implements Serializable { @ApiModelProperty(value = "条款名称") private String termName; + /**评估结果(1-符合、2-不符合、3-待验证、4-不涉及)*/ + @Dict(dicCode = "assess_results") + @ApiModelProperty(value = "评估结果(1-符合、2-不符合、3-待验证、4-不涉及)") + private String assessResults; + /**责任部门ID*/ @Excel(name = "责任部门ID", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") @@ -135,4 +140,8 @@ public class LawsEvaluationNotMet implements Serializable { @TableLogic private Integer delFlag; + + @TableField(exist = false) + @ApiModelProperty(value = "标准编号或名称") + private String standardNumberOrName; } diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/ILawsEvaluationNotMetService.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/ILawsEvaluationNotMetService.java index aeeac718..30b233c5 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/ILawsEvaluationNotMetService.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/ILawsEvaluationNotMetService.java @@ -75,4 +75,6 @@ public interface ILawsEvaluationNotMetService extends IService ids); + + IPage pageForProcess(LawsEvaluationNotMet lawsEvaluationNotMet, Integer pageNo, Integer pageSize, HttpServletRequest req); } diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java index 64389cd6..62354283 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.projectLibrary.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.jero.common.constant.CommonConstant; @@ -14,12 +15,15 @@ import com.jero.modules.projectLibrary.entity.LawsEvaluationNotMet; import com.jero.modules.projectLibrary.mapper.LawsEvaluationNotMetMapper; import com.jero.modules.projectLibrary.service.ILawsEvaluationNotMetService; import io.swagger.annotations.ApiModelProperty; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.jero.common.exception.JeroBootException; import java.util.List; import java.util.Date; +import java.util.Map; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.system.query.QueryGenerator; @@ -64,6 +68,25 @@ public class LawsEvaluationNotMetServiceImpl extends ServiceImpl pageForProcess(LawsEvaluationNotMet lawsEvaluationNotMet, Integer pageNo, Integer pageSize, HttpServletRequest req) { + + Map parameterMap = req.getParameterMap(); + parameterMap.remove("standardNumber"); + parameterMap.remove("standardName"); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsEvaluationNotMet, parameterMap); + String standardNumber = lawsEvaluationNotMet.getStandardNumber(); + if (StringUtils.isNotBlank(standardNumber)){ + queryWrapper.lambda().and( + a-> a.like(LawsEvaluationNotMet::getStandardNumber,standardNumber) + .or() + .like(LawsEvaluationNotMet::getStandardName,standardNumber) + ); + } + Page page = new Page<>(pageNo, pageSize); + return page(page, queryWrapper); + } + /** * 列表查询 *