Browse Source

问题修复

‘xugp 1 year ago
parent
commit
b1fbc17294

+ 5 - 0
ims-service/ims-eval/src/main/java/com/ims/eval/entity/DeptResponsibility.java

@@ -111,6 +111,11 @@ public class DeptResponsibility extends Model {
      */
     private String updateBy;
 
+	/**
+	 * 创建者名称
+	 */
+	private String createName;
+
     /**
      * 复审人
      */

+ 5 - 0
ims-service/ims-eval/src/main/java/com/ims/eval/entity/EvaluateRule.java

@@ -70,6 +70,11 @@ public class EvaluateRule extends Model {
      */
     private String createBy;
 
+	/**
+	 * 创建者名称
+	 */
+	private String createName;
+
     /**
      * 更新时间
      */

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

@@ -64,6 +64,11 @@ public class EvaluateRuleInfo extends Model {
      */
     private String createBy;
 
+	/**
+	 * 创建者名称
+	 */
+	private String createName;
+
     /**
      * 更新时间
      */

+ 5 - 0
ims-service/ims-eval/src/main/java/com/ims/eval/entity/OrganizationEvaluation.java

@@ -97,6 +97,11 @@ public class OrganizationEvaluation extends Model {
      */
     private String createBy;
 
+	/**
+	 * 创建者名称
+	 */
+	private String createName;
+
     /**
      * 更新时间
      */

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

@@ -85,11 +85,16 @@ public class OrganizationEvaluationRule extends Model {
 	private Date createTime;
 
 	/**
-	 * 创建者
+	 * 创建者id
 	 */
 	private String createBy;
 
 	/**
+	 * 创建者名称
+	 */
+	private String createName;
+
+	/**
 	 * 更新时间
 	 */
 	private Date updateTime;

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

@@ -97,6 +97,10 @@ public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator
 	public IPage<Indicator> list2(Integer pageNum, Integer pageSize, String id, String indicatorName, String indicatorCode, String binSection, String binStage, String dept, String company) {
 		Page<Indicator> page = new Page<>(pageNum, pageSize);
 		IPage<Indicator> list = baseMapper.seleclistPage(page, id, indicatorName, indicatorCode, binSection, binStage, dept, company);
+		List<Indicator> records = list.getRecords();
+		records.stream().forEach(r ->{
+			r.setDeptName(CacheContext.ddNameMap.get(r.getDept()));
+		});
 		return list;
 	}