优化

ims-service/ims-eval/src/main/java/com/ims/eval/entity/EvaluateRule.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;
 
@@ -33,14 +34,28 @@ public class EvaluateRule extends Model {
     /**
      * 业务版块
      */
+
     private String binSection;
 
+	/**
+	 * 业务版块name
+	 */
+	@TableField(exist = false)
+	private String binSectionName;
+
     /**
      * 业务阶段
      */
     private String binStage;
 
-    /**
+	/**
+	 * 业务阶段name
+	 */
+	@TableField(exist = false)
+	private String binStageName;
+
+
+	/**
      * 描述
      */
     private String des;

ims-service/ims-eval/src/main/java/com/ims/eval/entity/Indicator.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;
@@ -60,11 +61,24 @@ public class Indicator extends Model {
      */
     private String binSection;
 
+	/**
+	 * 业务版块name
+	 */
+	@TableField(exist = false)
+	private String binSectionName;
+
     /**
      * 业务阶段
      */
     private String binStage;
 
+
+	/**
+	 * 业务阶段name
+	 */
+	@TableField(exist = false)
+	private String binStageName;
+
     /**
      * 部门
      */

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

@@ -1,8 +1,8 @@
 package com.ims.eval.entity;
 
-import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 import lombok.Data;
@@ -47,11 +47,23 @@ public class OrganizationEvaluationRule extends Model {
      */
     private String binSection;
 
+	/**
+	 * 业务版块name
+	 */
+	@TableField(exist = false)
+	private String binSectionName;
+
     /**
      * 业务阶段
      */
     private String binStage;
 
+	/**
+	 * 业务阶段name
+	 */
+	@TableField(exist = false)
+	private String binStageName;
+
     /**
      * 考评周期
      */

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

@@ -4,10 +4,10 @@ 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.cache.CacheContext;
 import com.ims.eval.dao.result.CustomException;
 import com.ims.eval.entity.EvaluateRule;
 import com.ims.eval.dao.EvaluateRuleMapper;
-import com.ims.eval.entity.Indicator;
 import com.ims.eval.service.IEvaluateRuleService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
@@ -33,10 +33,10 @@ public class EvaluateRuleServiceImpl extends ServiceImpl<EvaluateRuleMapper, Eva
 		if (null == pageNum || null == pageSize) {
 			throw new RuntimeException("分页参数为空");
 		}
+
 		//构造分页构造器
 		Page<EvaluateRule> page = new Page<>(pageNum, pageSize);
 
-
 		if (StringUtils.isNotEmpty(id)) {
 			qw.lambda().eq(EvaluateRule::getId, id);
 		}
@@ -53,10 +53,13 @@ public class EvaluateRuleServiceImpl extends ServiceImpl<EvaluateRuleMapper, Eva
 			qw.lambda().eq(EvaluateRule::getBinStage, binStage);
 		}
 
-		qw.lambda().orderByAsc(EvaluateRule::getId);
+		qw.lambda().orderByDesc(EvaluateRule::getCreateTime);
 
 		IPage<EvaluateRule> list = baseMapper.selectPage(page, qw);
-
+		list.getRecords().stream().forEach(l->{
+			l.setBinSectionName(null == CacheContext.ddNameMap.get(l.getBinSection()) ? "" :CacheContext.ddNameMap.get(l.getBinSection()));
+			l.setBinStageName(null == CacheContext.ddNameMap.get(l.getBinStage()) ? "" : CacheContext.ddNameMap.get(l.getBinStage()));
+		});
 		return list;
 	}
 
@@ -80,10 +83,15 @@ public class EvaluateRuleServiceImpl extends ServiceImpl<EvaluateRuleMapper, Eva
 			qw.lambda().eq(EvaluateRule::getBinStage, binStage);
 		}
 
-		qw.lambda().orderByAsc(EvaluateRule::getId);
+		qw.lambda().orderByDesc(EvaluateRule::getCreateTime);
 
 		List<EvaluateRule> list = baseMapper.selectList(qw);
 
+		list.stream().forEach(l->{
+			l.setBinSectionName(null == CacheContext.ddNameMap.get(l.getBinSection()) ? "" :CacheContext.ddNameMap.get(l.getBinSection()));
+			l.setBinStageName(null == CacheContext.ddNameMap.get(l.getBinStage()) ? "" : CacheContext.ddNameMap.get(l.getBinStage()));
+		});
+
 		return list;
 	}
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ims.common.utils.StringUtils;
+import com.ims.eval.cache.CacheContext;
 import com.ims.eval.dao.IndicatorDictionaryMapper;
 import com.ims.eval.dao.IndicatorMapper;
 import com.ims.eval.dao.result.CustomException;
@@ -74,6 +75,11 @@ public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator
 
 		IPage<Indicator> list = baseMapper.selectPage(page, qw);
 
+		list.getRecords().stream().forEach(l->{
+			l.setBinSectionName(null == CacheContext.ddNameMap.get(l.getBinSection()) ? "" :CacheContext.ddNameMap.get(l.getBinSection()));
+			l.setBinStageName(null == CacheContext.ddNameMap.get(l.getBinStage()) ? "" : CacheContext.ddNameMap.get(l.getBinStage()));
+		});
+
 		return list;
 	}
 
@@ -81,6 +87,7 @@ public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator
 	public List<Indicator> listAll(String id, String indicatorName, String indicatorCede, String binSection, String binStage, String dept, String company) {
 		QueryWrapper<Indicator> qw = new QueryWrapper<>();
 
+
 		if (StringUtils.isNotEmpty(id)) {
 			qw.lambda().eq(Indicator::getId, id);
 		}
@@ -111,6 +118,10 @@ public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator
 		qw.lambda().orderByAsc(Indicator::getOrderNum);
 
 		List<Indicator> list = baseMapper.selectList(qw);
+		list.stream().forEach(l->{
+			l.setBinSectionName(null == CacheContext.ddNameMap.get(l.getBinSection()) ? "" :CacheContext.ddNameMap.get(l.getBinSection()));
+			l.setBinStageName(null == CacheContext.ddNameMap.get(l.getBinStage()) ? "" : CacheContext.ddNameMap.get(l.getBinStage()));
+		});
 
 		return list;
 	}

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

@@ -4,8 +4,8 @@ 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.cache.CacheContext;
 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;
 import com.ims.eval.service.IOrganizationEvaluationRuleService;
@@ -71,6 +71,12 @@ public class OrganizationEvaluationRuleServiceImpl extends ServiceImpl<Organizat
 
 		IPage<OrganizationEvaluationRule> list = baseMapper.selectPage(page, qw);
 
+		list.getRecords().stream().forEach(l->{
+			l.setBinSectionName(null == CacheContext.ddNameMap.get(l.getBinSection()) ? "" :CacheContext.ddNameMap.get(l.getBinSection()));
+			l.setBinStageName(null == CacheContext.ddNameMap.get(l.getBinStage()) ? "" : CacheContext.ddNameMap.get(l.getBinStage()));
+		});
+
+
 		return list;
 	}
 
@@ -116,6 +122,11 @@ public class OrganizationEvaluationRuleServiceImpl extends ServiceImpl<Organizat
 
 		List<OrganizationEvaluationRule> list = baseMapper.selectList(qw);
 
+		list.stream().forEach(l->{
+			l.setBinSectionName(null == CacheContext.ddNameMap.get(l.getBinSection()) ? "" :CacheContext.ddNameMap.get(l.getBinSection()));
+			l.setBinStageName(null == CacheContext.ddNameMap.get(l.getBinStage()) ? "" : CacheContext.ddNameMap.get(l.getBinStage()));
+		});
+
 		return list;
 	}