代码优化

ims-service/ims-eval/src/main/java/com/ims/eval/controller/EvaluateRuleController.java

@@ -55,6 +55,26 @@ public class EvaluateRuleController {
 
 
 	/**
+	 * 查询 listAll
+	 *
+	 * @param id         主键
+	 * @param des        描述
+	 * @param binSection 业务版块
+	 * @param binStage   业务阶段
+	 * @return
+	 */
+	//@ImsPreAuth("eval:dataDictionary:view")
+	@GetMapping(value = "listAll")
+	public R listAll(@RequestParam(value = "id", required = false) String id,
+				  @RequestParam(value = "des", required = false) String des,
+				  @RequestParam(value = "binSection", required = false) String binSection,
+				  @RequestParam(value = "binStage", required = false) String binStage) {
+		List<EvaluateRule> list = evaluateRuleService.listAll(id, des, binSection, binStage);
+		return R.ok().data(list);
+	}
+
+
+	/**
 	 * 添加
 	 *
 	 * @param evaluateRule

ims-service/ims-eval/src/main/java/com/ims/eval/entity/EvaluateRuleInfo.java

@@ -1,5 +1,6 @@
 package com.ims.eval.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.util.Date;
 
@@ -30,6 +31,12 @@ public class EvaluateRuleInfo extends Model {
      */
     private String indicatorId;
 
+	/**
+	 * 指标name
+	 */
+	@TableField(exist = false)
+	private String indicatorName;
+
 
 	/**
 	 * 考评规则ID

ims-service/ims-eval/src/main/java/com/ims/eval/entity/IndicatorDictionary.java

@@ -1,5 +1,6 @@
 package com.ims.eval.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -30,6 +31,12 @@ public class IndicatorDictionary extends Model {
      */
     private String indicatorId;
 
+	/**
+	 * 指标name
+	 */
+	@TableField(exist = false)
+	private String indicatorName;
+
     /**
      * 选项编码
      */

ims-service/ims-eval/src/main/java/com/ims/eval/service/IEvaluateRuleService.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.eval.entity.EvaluateRule;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 考评规则表 服务类
@@ -16,4 +18,7 @@ public interface IEvaluateRuleService extends IService<EvaluateRule> {
 
 	IPage<EvaluateRule> list(Integer pageNum, Integer pageSize, String id, String des, String binSection, String binStage);
 
+
+	List<EvaluateRule> listAll( String id, String des, String binSection, String binStage);
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/EvaluateRuleServiceImpl.java

@@ -61,6 +61,33 @@ public class EvaluateRuleServiceImpl extends ServiceImpl<EvaluateRuleMapper, Eva
 	}
 
 	@Override
+	public List<EvaluateRule> listAll(String id, String des, String binSection, String binStage) {
+		QueryWrapper<EvaluateRule> qw = new QueryWrapper<>();
+
+		if (StringUtils.isNotEmpty(id)) {
+			qw.lambda().eq(EvaluateRule::getId, id);
+		}
+
+		if (StringUtils.isNotEmpty(des)) {
+			qw.lambda().like(EvaluateRule::getDes, des);
+		}
+
+		if (StringUtils.isNotEmpty(binSection)) {
+			qw.lambda().like(EvaluateRule::getBinSection, binSection);
+		}
+
+		if (StringUtils.isNotEmpty(binStage)) {
+			qw.lambda().eq(EvaluateRule::getBinStage, binStage);
+		}
+
+		qw.lambda().orderByAsc(EvaluateRule::getId);
+
+		List<EvaluateRule> list = baseMapper.selectList(qw);
+
+		return list;
+	}
+
+	@Override
 	public boolean saveOrUpdate(EvaluateRule entity) {
 
 		if (null != entity && (null == entity.getId() || "".equals(entity.getId().trim()))) {

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/IndicatorServiceImpl.java

@@ -37,6 +37,9 @@ public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator
 	public IPage<Indicator> list(Integer pageNum, Integer pageSize, String id, String indicatorName, String indicatorCede, String binSection, String binStage, String dept, String company) {
 
 		QueryWrapper<Indicator> qw = new QueryWrapper<>();
+		if (null == pageNum || null == pageSize) {
+			throw new CustomException("分页参数为空");
+		}
 		//构造分页构造器
 		Page<Indicator> page = new Page<>(pageNum, pageSize);
 		if (StringUtils.isNotEmpty(id)) {

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/OrganizationEvaluationRuleServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ims.common.utils.StringUtils;
+import com.ims.eval.dao.result.CustomException;
 import com.ims.eval.entity.Indicator;
 import com.ims.eval.entity.OrganizationEvaluationRule;
 import com.ims.eval.dao.OrganizationEvaluationRuleMapper;
@@ -29,6 +30,9 @@ public class OrganizationEvaluationRuleServiceImpl extends ServiceImpl<Organizat
 		QueryWrapper<OrganizationEvaluationRule> qw = new QueryWrapper<>();
 		//构造分页构造器
 		Page<OrganizationEvaluationRule> page = new Page<>(pageNum, pageSize);
+		if (null == pageNum || null == pageSize) {
+			throw new CustomException("分页参数为空");
+		}
 		if (StringUtils.isNotEmpty(id)) {
 			qw.lambda().eq(OrganizationEvaluationRule::getId, id);
 		}

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/PersonnelEvaluationRuleServiceImpl.java

@@ -30,8 +30,13 @@ public class PersonnelEvaluationRuleServiceImpl extends ServiceImpl<PersonnelEva
 	@Override
 	public IPage<PersonnelEvaluationRule> list(Integer pageNum, Integer pageSize, String id, String personnelId, String personnelName, String companyId, String companyName, String deptId, String position, String evaluationCycle, String year, String month) {
 		QueryWrapper<PersonnelEvaluationRule> qw = new QueryWrapper<>();
+
+		if (null == pageNum || null == pageSize) {
+			throw new CustomException("分页参数为空");
+		}
 		//构造分页构造器
 		Page<PersonnelEvaluationRule> page = new Page<>(pageNum, pageSize);
+
 		if (StringUtils.isNotEmpty(id)) {
 			qw.lambda().eq(PersonnelEvaluationRule::getId, id);
 		}