目标责任书优化提交

ims-service/ims-eval/src/main/java/com/ims/eval/cache/CacheContext.java

@@ -47,6 +47,7 @@ public class CacheContext implements CommandLineRunner {
 
 	//经营阶段分类
 	public static List<BinStage> bseList = new ArrayList<>();
+	public static Map<String, String> bseIdMap = new HashMap<>();
 
 	//生产经营业务分类
 	public static List<BinSection> bsnList = new ArrayList<>();
@@ -58,6 +59,8 @@ public class CacheContext implements CommandLineRunner {
 	public void run(String... args) throws Exception {
 		initDataDictionary();
 		initIndicatorType();
+		initBinStage();
+		initBinSection();
 
 	}
 
@@ -102,9 +105,13 @@ public class CacheContext implements CommandLineRunner {
 	public void initBinStage(){
 		//清理集合中的数据
 		bseList.clear();
+		bseIdMap.clear();
 
 		bseList = binStageService.list().stream().filter(t->!t.getDelFlag()).collect(Collectors.toList());
 		bseList.sort(Comparator.comparing(BinStage::getOrderNum));
+		bseList.stream().forEach(d -> {
+			bseIdMap.put(d.getId(), d.getStageName());
+		});
 	}
 
 	/**
@@ -112,7 +119,7 @@ public class CacheContext implements CommandLineRunner {
 	 */
 	public void initBinSection(){
 		//清理集合中的数据
-		itList.clear();
+		bsnList.clear();
 
 		bsnList = binSectionService.list().stream().filter(t->!t.getDelFlag()).collect(Collectors.toList());
 		bsnList.sort(Comparator.comparing(BinSection::getOrderNum));

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

@@ -68,7 +68,7 @@ public class BinSectionController {
 		try {
 			boolean b = binSectionService.saveOrUpdate(binSection);
 			if (b) {
-				cache.initIndicatorType();
+				cache.initBinSection();
 				return R.ok().data(b);
 			} else {
 				return R.error().data("保存失败！");
@@ -92,7 +92,7 @@ public class BinSectionController {
 		String[] strings = ids.split(",");
 		boolean b = binSectionService.removeByIds(Arrays.asList(strings));
 		if (b) {
-			cache.initDataDictionary();
+			cache.initBinSection();
 			return R.ok().data(b);
 		} else {
 			return R.error().data("删除失败！");

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

@@ -68,7 +68,7 @@ public class BinStageController {
 		try {
 			boolean b = binStageService.saveOrUpdate(binStage);
 			if (b) {
-				cache.initIndicatorType();
+				cache.initBinStage();
 				return R.ok().data(b);
 			} else {
 				return R.error().data("保存失败！");
@@ -92,7 +92,7 @@ public class BinStageController {
 		String[] strings = ids.split(",");
 		boolean b = binStageService.removeByIds(Arrays.asList(strings));
 		if (b) {
-			cache.initDataDictionary();
+			cache.initBinStage();
 			return R.ok().data(b);
 		} else {
 			return R.error().data("删除失败！");

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

@@ -46,7 +46,7 @@ public class EvaluateRuleController {
 				  @RequestParam(value = "des", required = false) String des,
 				  @RequestParam(value = "binSection", required = false) String binSection,
 				  @RequestParam(value = "binStage", required = false) String binStage) {
-		IPage<EvaluateRule> list = evaluateRuleService.list(pageNum, pageSize, id, des, binSection, binStage);
+		IPage<EvaluateRule> list = evaluateRuleService.listPage(pageNum, pageSize, id, des, binSection, binStage);
 		return R.ok().data(list);
 	}
 

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

@@ -61,7 +61,7 @@ public class IndicatorController {
 				  @RequestParam(value = "binStage", required = false) String binStage,
 				  @RequestParam(value = "dept", required = false) String dept,
 				  @RequestParam(value = "company", required = false) String company) {
-		IPage<Indicator> list = iIndicatorService.list(pageNum, pageSize, id, indicatorName, indicatorCode, binSection, binStage, dept, company);
+		IPage<Indicator> list = iIndicatorService.list2(pageNum, pageSize, id, indicatorName, indicatorCode, binSection, binStage, dept, company);
 		return R.ok().data(list);
 	}
 

ims-service/ims-eval/src/main/java/com/ims/eval/dao/EvaluateRuleInfoMapper.java

@@ -2,6 +2,9 @@ package com.ims.eval.dao;
 
 import com.ims.eval.entity.EvaluateRuleInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface EvaluateRuleInfoMapper extends BaseMapper<EvaluateRuleInfo> {
 
+	List<EvaluateRuleInfo> selectListAll(@Param("id") String id,
+										 @Param("des") String des,
+										 @Param("indicatorId") String indicatorId,
+										 @Param("evaluateRuleId") String evaluateRuleId);
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/dao/EvaluateRuleMapper.java

@@ -1,7 +1,10 @@
 package com.ims.eval.dao;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ims.eval.entity.EvaluateRule;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +16,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface EvaluateRuleMapper extends BaseMapper<EvaluateRule> {
 
+	IPage<EvaluateRule>  selectListPage(Page page, @Param("id") String id,
+										@Param("des") String des,
+										@Param("binSection") String binSection,
+										@Param("binStage") String binStage);
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/dao/OrganizationEvaluationRuleMapper.java

@@ -6,6 +6,8 @@ import com.ims.eval.entity.OrganizationEvaluationRule;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 单位/部门考评配置 Mapper 接口
@@ -24,4 +26,15 @@ public interface OrganizationEvaluationRuleMapper extends BaseMapper<Organizatio
 										   @Param("binStage") String binStage,
 										   @Param("evaluationCycle") String evaluationCycle);
 
+
+	List<OrganizationEvaluationRule> selectListAll(String id,
+												   @Param("organizationName") String organizationName,
+												   @Param("organizationId") String organizationId,
+												   @Param("organizationType") String organizationType,
+												   @Param("binSection") String binSection,
+												   @Param("binStage") String binStage,
+												   @Param("evaluationCycle") String evaluationCycle);
+
+
+
 }

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

@@ -43,6 +43,12 @@ public class EvaluateRuleInfo extends Model {
 	 */
 	private String evaluateRuleId;
 
+	/**
+	 * 考评规则name
+	 */
+	@TableField(exist = false)
+	private String evaluateRuleName;
+
     /**
      * 描述
      */

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

@@ -18,6 +18,7 @@ public interface IEvaluateRuleInfoService extends IService<EvaluateRuleInfo> {
 	List<EvaluateRuleInfo> list(String id, String des, String indicatorId,String evaluateRuleId);
 
 
+
 	List<EvaluateRuleInfo> list(List<String> evaluateRuleIds);
 
 }

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

@@ -18,6 +18,7 @@ public interface IEvaluateRuleService extends IService<EvaluateRule> {
 
 	IPage<EvaluateRule> list(Integer pageNum, Integer pageSize, String id, String des, String binSection, String binStage);
 
+	IPage<EvaluateRule> listPage(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/BinSectionServiceImpl.java

@@ -39,7 +39,7 @@ public class BinSectionServiceImpl extends ServiceImpl<BinSectionMapper, BinSect
 	@Override
 	public boolean saveOrUpdate(BinSection entity) {
 
-		if (null != entity && (null != entity.getId() || !"".equals(entity.getId().trim()))) {
+		if (null != entity && (null != entity.getId() && !"".equals(entity.getId().trim()))) {
 			BinSection type = baseMapper.selectById(entity.getId());
 			type.setDelFlag(true);
 			baseMapper.updateById(type);
@@ -56,6 +56,7 @@ public class BinSectionServiceImpl extends ServiceImpl<BinSectionMapper, BinSect
 		int count = baseMapper.selectCount(null);
 		entity.setId(null);
 		entity.setOrderNum(count);
+		entity.setDelFlag(false);
 		return super.saveOrUpdate(entity);
 	}
 

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

@@ -40,7 +40,7 @@ public class BinStageServiceImpl extends ServiceImpl<BinStageMapper, BinStage> i
 	@Override
 	public boolean saveOrUpdate(BinStage entity) {
 
-		if (null != entity && (null != entity.getId() || !"".equals(entity.getId().trim()))) {
+		if (null != entity && (null != entity.getId() && !"".equals(entity.getId().trim()))) {
 			BinStage stage = baseMapper.selectById(entity.getId());
 			stage.setDelFlag(true);
 			baseMapper.updateById(stage);
@@ -57,6 +57,7 @@ public class BinStageServiceImpl extends ServiceImpl<BinStageMapper, BinStage> i
 		int count = baseMapper.selectCount(null);
 		entity.setId(null);
 		entity.setOrderNum(count);
+		entity.setDelFlag(false);
 		return super.saveOrUpdate(entity);
 	}
 

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

@@ -24,29 +24,9 @@ import java.util.List;
 public class EvaluateRuleInfoServiceImpl extends ServiceImpl<EvaluateRuleInfoMapper, EvaluateRuleInfo> implements IEvaluateRuleInfoService {
 
 	@Override
-	public List<EvaluateRuleInfo> list(String id, String des, String indicatorId,String evaluateRuleId) {
+	public List<EvaluateRuleInfo> list(String id, String des, String indicatorId, String evaluateRuleId) {
 
-		QueryWrapper<EvaluateRuleInfo> qw = new QueryWrapper<>();
-
-
-		if (StringUtils.isNotEmpty(id)) {
-			qw.lambda().eq(EvaluateRuleInfo::getId, id);
-		}
-
-		if (StringUtils.isNotEmpty(des)) {
-			qw.lambda().like(EvaluateRuleInfo::getDes, des);
-		}
-
-		if (StringUtils.isNotEmpty(indicatorId)) {
-			qw.lambda().eq(EvaluateRuleInfo::getIndicatorId, indicatorId);
-		}
-		if (StringUtils.isNotEmpty(evaluateRuleId)) {
-			qw.lambda().eq(EvaluateRuleInfo::getEvaluateRuleId, evaluateRuleId);
-		}
-
-		qw.lambda().orderByAsc(EvaluateRuleInfo::getOrderNum);
-
-		List<EvaluateRuleInfo> list = baseMapper.selectList( qw);
+		List<EvaluateRuleInfo> list =  baseMapper.selectListAll(id, des, indicatorId, evaluateRuleId);
 
 		return list;
 	}
@@ -54,7 +34,7 @@ public class EvaluateRuleInfoServiceImpl extends ServiceImpl<EvaluateRuleInfoMap
 	@Override
 	public List<EvaluateRuleInfo> list(List<String> evaluateRuleIds) {
 		QueryWrapper<EvaluateRuleInfo> qw = new QueryWrapper<>();
-		if (null == evaluateRuleIds || evaluateRuleIds.size()<= 0) {
+		if (null == evaluateRuleIds || evaluateRuleIds.size() <= 0) {
 			throw new CustomException("获取规则明细参数空");
 		}
 		qw.lambda().in(EvaluateRuleInfo::getEvaluateRuleId, evaluateRuleIds);

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

@@ -64,6 +64,17 @@ public class EvaluateRuleServiceImpl extends ServiceImpl<EvaluateRuleMapper, Eva
 	}
 
 	@Override
+	public IPage<EvaluateRule> listPage(Integer pageNum, Integer pageSize, String id, String des, String binSection, String binStage) {
+		if (null == pageNum || null == pageSize) {
+			throw new RuntimeException("分页参数为空");
+		}
+		//构造分页构造器
+		Page<EvaluateRule> page = new Page<>(pageNum, pageSize);
+		IPage<EvaluateRule> list = baseMapper.selectListPage(page, id, des, binSection, binStage);
+		return list;
+	}
+
+	@Override
 	public List<EvaluateRule> listAll(String id, String des, String binSection, String binStage) {
 		QueryWrapper<EvaluateRule> qw = new QueryWrapper<>();
 

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

@@ -88,10 +88,6 @@ 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.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;
 	}
 

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

@@ -41,7 +41,7 @@ public class IndicatorTypeServiceImpl extends ServiceImpl<IndicatorTypeMapper, I
 	@Override
 	public boolean saveOrUpdate(IndicatorType entity) {
 
-		if (null != entity && (null != entity.getId() || !"".equals(entity.getId().trim()))) {
+		if (null != entity && (null != entity.getId() && !"".equals(entity.getId().trim()))) {
 			IndicatorType type = baseMapper.selectById(entity.getId());
 			type.setDelFlag(true);
 			baseMapper.updateById(type);
@@ -58,6 +58,7 @@ public class IndicatorTypeServiceImpl extends ServiceImpl<IndicatorTypeMapper, I
 		int count = baseMapper.selectCount(null);
 		entity.setId(null);
 		entity.setOrderNum(count);
+		entity.setDelFlag(false);
 		return super.saveOrUpdate(entity);
 	}
 }

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

@@ -93,44 +93,30 @@ public class OrganizationEvaluationRuleServiceImpl extends ServiceImpl<Organizat
 
 	@Override
 	public List<OrganizationEvaluationRule> listAll(String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle) {
-		QueryWrapper<OrganizationEvaluationRule> qw = new QueryWrapper<>();
-
-		if (StringUtils.isNotEmpty(id)) {
-			qw.lambda().eq(OrganizationEvaluationRule::getId, id);
-		}
-
-		if (StringUtils.isNotEmpty(organizationName)) {
-			qw.lambda().like(OrganizationEvaluationRule::getOrganizationName, organizationName);
-		}
-
-		if (StringUtils.isNotEmpty(organizationId)) {
-			qw.lambda().like(OrganizationEvaluationRule::getOrganizationId, organizationId);
-		}
 
-		if (StringUtils.isNotEmpty(organizationType)) {
-			qw.lambda().eq(OrganizationEvaluationRule::getOrganizationType, organizationType);
-		}
 
-		if (StringUtils.isNotEmpty(binSection)) {
-			qw.lambda().eq(OrganizationEvaluationRule::getBinSection, binSection);
-		}
+		List<OrganizationEvaluationRule> list = baseMapper.selectListAll(id, organizationName, organizationId, organizationType, binSection, binStage, evaluationCycle);
 
-		if (StringUtils.isNotEmpty(binStage)) {
-			qw.lambda().eq(OrganizationEvaluationRule::getBinStage, binStage);
-		}
+		list().stream().forEach(l->{
+			l.setBinSectionName(null == CacheContext.ddNameMap.get(l.getBinSection()) ? "" :CacheContext.ddNameMap.get(l.getBinSection()));
 
-		if (StringUtils.isNotEmpty(evaluationCycle)) {
-			qw.lambda().eq(OrganizationEvaluationRule::getEvaluationCycle, evaluationCycle);
-		}
+			StringBuilder binStageName =  new StringBuilder();
+			for (String stage : l.getBinStage().split(",")){
+				binStageName.append(null == CacheContext.ddNameMap.get(stage) ? "" :CacheContext.ddNameMap.get(stage)).append(",");
+			}
 
-		qw.lambda().eq(OrganizationEvaluationRule::getDelFlag, false);
+			l.setBinStageName(binStageName.toString().length()>0?binStageName.toString().substring(0,binStageName.toString().length()-1):"");
 
-		qw.lambda().orderByAsc(OrganizationEvaluationRule::getOrderNum);
+			StringBuilder ruleName = new StringBuilder();
+			for (String ruleId :l.getEvaluateRuleId().split(",")){
+				EvaluateRule rulebyid = evaluateRuleService.getById(ruleId);
+				if(null != rulebyid){
+					ruleName.append(rulebyid.getRuleName()).append(",");
+				}
 
-		List<OrganizationEvaluationRule> list = baseMapper.selectList(qw);
+			}
+			l.setEvaluateRuleName(ruleName.toString().length()>0?ruleName.toString().substring(0,ruleName.toString().length()-1):"");
 
-		list.stream().forEach(l->{
-			l.setBinSectionName(null == CacheContext.ddNameMap.get(l.getBinSection()) ? "" :CacheContext.ddNameMap.get(l.getBinSection()));
 		});
 
 		return list;
@@ -141,18 +127,21 @@ public class OrganizationEvaluationRuleServiceImpl extends ServiceImpl<Organizat
 		Page<OrganizationEvaluationRule> page = new Page<>(pageNum, pageSize);
 		IPage<OrganizationEvaluationRule>  list = baseMapper.list(page, id, organizationName, organizationId, organizationType, binSection, binStage, evaluationCycle);
 		list.getRecords().stream().forEach(l->{
-			l.setBinSectionName(null == CacheContext.ddNameMap.get(l.getBinSection()) ? "" :CacheContext.ddNameMap.get(l.getBinSection()));
 
 			StringBuilder binStageName =  new StringBuilder();
 			for (String stage : l.getBinStage().split(",")){
-				binStageName.append(null == CacheContext.ddNameMap.get(stage) ? "" :CacheContext.ddNameMap.get(stage)).append(",");
+				binStageName.append(null == CacheContext.bseIdMap.get(stage) ? "" :CacheContext.bseIdMap.get(stage)).append(",");
 			}
 
 			l.setBinStageName(binStageName.toString().length()>0?binStageName.toString().substring(0,binStageName.toString().length()-1):"");
 
 			StringBuilder ruleName = new StringBuilder();
 			for (String ruleId :l.getEvaluateRuleId().split(",")){
-				ruleName.append(evaluateRuleService.getById(ruleId).getRuleName()).append(",");
+				EvaluateRule rulebyid = evaluateRuleService.getById(ruleId);
+				if(null != rulebyid){
+					ruleName.append(rulebyid.getRuleName()).append(",");
+				}
+
 			}
 			l.setEvaluateRuleName(ruleName.toString().length()>0?ruleName.toString().substring(0,ruleName.toString().length()-1):"");
 
@@ -164,19 +153,32 @@ public class OrganizationEvaluationRuleServiceImpl extends ServiceImpl<Organizat
 	@Transactional
 	@Override
 	public boolean saveOrUpdate(OrganizationEvaluationRule entity) {
-		if (null != entity && (null == entity.getId() || "".equals(entity.getId().trim()))) {
-			QueryWrapper<OrganizationEvaluationRule> qw = new QueryWrapper<>();
-			qw.lambda().eq(OrganizationEvaluationRule::getOrganizationId, entity.getOrganizationId());
-			qw.lambda().eq(OrganizationEvaluationRule::getEvaluationCycle, entity.getEvaluationCycle());
-			List<OrganizationEvaluationRule> list = baseMapper.selectList(qw);
-			if (null != list && list.size() > 0) {
-				throw new CustomException("已存在同期考评配置");
-			}
-			entity.setCreateTime(new Date());
-		} else {
-			entity.setUpdateTime(new Date());
+		//如果是存在主键  则修改
+		if (null != entity && (null != entity.getId() && !"".equals(entity.getId().trim()))) {
+			OrganizationEvaluationRule update = baseMapper.selectById(entity.getId());
+			update.setDelFlag(true);
+			update.setUpdateTime(new Date());
+			baseMapper.updateById(update);
+		}
+
+		//型增时判断当前组织是否存在同期考评配置
+		QueryWrapper<OrganizationEvaluationRule> qw = new QueryWrapper<>();
+		qw.lambda().eq(OrganizationEvaluationRule::getOrganizationId, entity.getOrganizationId());
+		qw.lambda().eq(OrganizationEvaluationRule::getEvaluationCycle, entity.getEvaluationCycle());
+		List<OrganizationEvaluationRule> list = baseMapper.selectList(qw);
+		if (null != list && list.size() > 0) {
+			throw new CustomException("已存在同期考评配置");
 		}
 
+		//判断排序字段是否有值
+		if(null==entity.getOrderNum()){
+			int count = baseMapper.selectCount(null);
+			entity.setOrderNum(count);
+		}
+		//处理id为空
+		entity.setId(null);
+		//默认未删除
+		entity.setDelFlag(false);
 		return super.saveOrUpdate(entity);
 	}
 

ims-service/ims-eval/src/main/resources/mappers/EvaluateRuleInfoMapper.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ims.eval.dao.EvaluateRuleInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.ims.eval.entity.EvaluateRuleInfo">
+        <id column="id" property="id" />
+        <result column="evaluate_rule_id" property="evaluateRuleId" />
+        <result column="indicator_id" property="indicatorId" />
+        <result column="des" property="des" />
+        <result column="create_time" property="createTime" />
+        <result column="create_by" property="createBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="order_num" property="orderNum" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, evaluate_rule_id, indicator_id, des, create_time, create_by, update_time, update_by, order_num
+    </sql>
+
+    <select id="selectListAll" resultType="com.ims.eval.entity.EvaluateRuleInfo">
+
+        SELECT
+        ri.*,
+        r.rule_name evaluateRuleName,
+        i.indicator_name indicatorName
+        FROM
+        evaluate_rule_info ri
+        LEFT JOIN evaluate_rule r ON ri.evaluate_rule_id = r.ID
+        LEFT JOIN indicator i on ri.indicator_id = i.id
+        <where>
+            <if test="id !=null and id !=''">
+                AND ri.id = #{id}
+            </if>
+            <if test="des !=null and des !=''">
+                AND ri.des like   CONCAT('%',#{des},'%')
+            </if>
+
+            <if test="indicatorId !=null and indicatorId !=''">
+                AND ri.indicator_id = #{indicatorId}
+            </if>
+
+            <if test="evaluateRuleId !=null and evaluateRuleId !=''">
+                AND ri.evaluate_rule_id = #{evaluateRuleId}
+            </if>
+        </where>
+
+
+    </select>
+
+</mapper>

ims-service/ims-eval/src/main/resources/mappers/EvaluateRuleMapper.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ims.eval.dao.EvaluateRuleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.ims.eval.entity.EvaluateRule">
+        <id column="id" property="id" />
+        <result column="bin_section" property="binSection" />
+        <result column="bin_stage" property="binStage" />
+        <result column="des" property="des" />
+        <result column="create_time" property="createTime" />
+        <result column="create_by" property="createBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="enable" property="enable" />
+        <result column="rule_name" property="ruleName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, bin_section, bin_stage, des, create_time, create_by, update_time, update_by, enable, rule_name
+    </sql>
+    <select id="selectListPage" resultType="com.ims.eval.entity.EvaluateRule">
+            SELECT
+            r.*,
+            b.stage_name binStageName,
+            bs.section_name binSectionName
+            FROM
+            evaluate_rule r
+            LEFT JOIN bin_stage b  ON r.bin_stage = b.id
+            LEFT JOIN bin_section bs  ON r.bin_section = bs.id
+            <where>
+
+                r.enable = true
+
+                <if test="id !=null and id !=''">
+                    AND r.id = #{id}
+                </if>
+                <if test="des !=null and des !=''">
+                    AND r.des like   CONCAT('%',#{des},'%')
+                </if>
+
+                <if test="binSection !=null and binSection !=''">
+                    AND r.bin_section = #{binSection}
+                </if>
+
+                <if test="binStage !=null and binStage !=''">
+                    AND r.bin_stage = #{binStage}
+                </if>
+
+                order by  r.create_time desc
+            </where>
+
+    </select>
+
+</mapper>

ims-service/ims-eval/src/main/resources/mappers/IndicatorMapper.xml

@@ -44,10 +44,14 @@
     <select id="seleclistPage" resultType="com.ims.eval.entity.Indicator">
 
         SELECT
-        i.*,t.type_name indicatorTypeName
+        i.*,t.type_name indicatorTypeName,
+        b.stage_name binStageName,
+        bs.section_name binSectionName
         FROM
         indicator i
         LEFT JOIN indicator_type t  ON i.indicator_type_id = t.id
+        LEFT JOIN bin_stage b  ON i.bin_stage = b.id
+        LEFT JOIN bin_section bs  ON i.bin_section = bs.id
         <where>
 
 

ims-service/ims-eval/src/main/resources/mappers/OrganizationEvaluationRuleMapper.xml

@@ -28,11 +28,14 @@
 
 
     <select id="list" resultType="com.ims.eval.entity.OrganizationEvaluationRule">
-        SELECT
-            r.*,i.rule_name
-        FROM
+            SELECT
+            r.*,
+            i.rule_name,
+            bs.section_name binSectionName
+            FROM
             organization_evaluation_rule r
             LEFT JOIN evaluate_rule i ON r.evaluate_rule_id = i.ID
+            LEFT JOIN bin_section bs  ON r.bin_section = bs.id
             <where>
 
                 and  r.del_flag = false
@@ -64,10 +67,54 @@
                     AND r.evaluation_cycle = #{evaluationCycle}
                 </if>
 
+                order by order_num asc
+
             </where>
 
 
     </select>
+    <select id="selectListAll" resultType="com.ims.eval.entity.OrganizationEvaluationRule">
+
+        SELECT
+        r.*,i.rule_name
+        FROM
+        organization_evaluation_rule r
+        LEFT JOIN evaluate_rule i ON r.evaluate_rule_id = i.ID
+        <where>
+
+            and  r.del_flag = false
+
+            <if test="id !=null and id !=''">
+                AND r.id = #{id}
+            </if>
+            <if test="organizationName !=null and organizationName !=''">
+                AND r.organization_name like   CONCAT('%',#{organizationName},'%')
+            </if>
+
+            <if test="organizationId !=null and organizationId !=''">
+                AND r.organization_id = #{organizationId}
+            </if>
+
+            <if test="organizationType !=null and organizationType !=''">
+                AND r.organization_type = #{organizationType}
+            </if>
+
+            <if test="binSection !=null and binSection !=''">
+                AND r.bin_section = #{binSection}
+            </if>
+
+            <if test="binStage !=null and binStage !=''">
+                AND r.bin_stage = #{binStage}
+            </if>
+
+            <if test="evaluationCycle !=null and evaluationCycle !=''">
+                AND r.evaluation_cycle = #{evaluationCycle}
+            </if>
+
+            order by order_num asc
+
+        </where>
+    </select>
 
 
 </mapper>