add 未符合项跟踪流程 查询未符合项

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-不涉及)")

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;
 }

laws-modules/src/main/java/com/jero/modules/projectLibrary/service/ILawsEvaluationNotMetService.java

@@ -75,4 +75,6 @@ public interface ILawsEvaluationNotMetService extends IService<LawsEvaluationNot
     LawsEvaluationNotMet queryById(String id);
 
     void batchClose(List<String> ids);
+
+    IPage<LawsEvaluationNotMet> pageForProcess(LawsEvaluationNotMet lawsEvaluationNotMet, Integer pageNo, Integer pageSize, HttpServletRequest req);
 }

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<LawsEvaluationN
         return page(page, queryWrapper);
     }
 
+	@Override
+	public IPage<LawsEvaluationNotMet> pageForProcess(LawsEvaluationNotMet lawsEvaluationNotMet, Integer pageNo, Integer pageSize, HttpServletRequest req) {
+
+		Map<String, String[]> parameterMap = req.getParameterMap();
+		parameterMap.remove("standardNumber");
+		parameterMap.remove("standardName");
+		QueryWrapper<LawsEvaluationNotMet> 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<LawsEvaluationNotMet> page = new Page<>(pageNo, pageSize);
+		return page(page, queryWrapper);
+	}
+
     /**
      * 列表查询
      *