目标考评修改

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

@@ -126,7 +126,7 @@ public class EvaluationRevisionController {
 	@PostMapping(value = "/save")
 	public R addAll(@RequestBody List<ResponsibilityIndicatorInfo> responsibilityIndicatorInfoList) {
 		try {
-			boolean b = responsibilityIndicatorInfoService.saveOrUpdateBatch(responsibilityIndicatorInfoList);
+			boolean b = responsibilityIndicatorInfoService.saveOrUpdateBatch2(responsibilityIndicatorInfoList);
 			if (b) {
 				return R.ok().data(b);
 			} else {

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

@@ -65,19 +65,7 @@ public class ResponsibilityIndicatorInfoController {
 	}
 
 
-	/**
-	 *
-	 * @param deptResponsibilityIds 目标责任书id
-	 * @return
-	 */
-	//@ImsPreAuth("eval:responsibilityIndicatorInfo:view")
-	@GetMapping(value = "finishValueList")
-	public R finishValueList(
-		@RequestParam(value = "deptResponsibilityIds", required = false) List<String> deptResponsibilityIds,
-		@RequestParam(value = "dept", required = false) String dept) {
-		Map list = responsibilityIndicatorInfoService.finishValueList(deptResponsibilityIds, dept);
-		return R.ok().data(list);
-	}
+
 
 
 	/**
@@ -192,4 +180,44 @@ public class ResponsibilityIndicatorInfoController {
 		}
 		return R.customError("上传文件为空！");
 	}
+
+
+
+	/**
+	 * 获取当前指标需要考评的指标
+	 * @param responsibilityId
+	 * @param binSection
+	 * @param binStage
+	 * @return
+	 */
+	@GetMapping(value = "getResponsibilityIndicatorList")
+	public R getResponsibilityIndicatorList(
+		@RequestParam(value = "responsibilityId", required = false) String responsibilityId,
+		@RequestParam(value = "binSection", required = false) String binSection,
+		@RequestParam(value = "binStage", required = false) String binStage) {
+		List<Map> list = responsibilityIndicatorInfoService.getResponsibilityIndicatorList(responsibilityId,  binSection,  binStage, request);
+		return R.ok().data(list);
+	}
+
+
+
+	/**
+	 * 获取考核指标的详情
+	 * @param responsibilityId
+	 * @param indicatorId
+	 * @return
+	 */
+	@GetMapping(value = "getResponsibilityInfoList")
+	public R getEvaluationInfoList(
+		@RequestParam(value = "responsibilityId", required = false) String responsibilityId,
+		@RequestParam(value = "indicatorId", required = false) String indicatorId,
+		@RequestParam(value = "organizationShortName", required = false) String organizationShortName,
+		@RequestParam(value = "binSection", required = false) String binSection,
+		@RequestParam(value = "binStage", required = false) String binStage) {
+		Map list = responsibilityIndicatorInfoService.getResponsibilityInfoList(responsibilityId, indicatorId, organizationShortName,binSection,binStage, request);
+		return R.ok().data(list);
+	}
+
+
+
 }

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

@@ -1,5 +1,6 @@
 package com.ims.eval.dao;
 
+import com.ims.eval.config.permission.DataPermission;
 import com.ims.eval.entity.DeptResponsibility;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ims.eval.entity.dto.response.DeptResponsibilityResDTO;
@@ -13,8 +14,10 @@ import org.apache.ibatis.annotations.Param;
  * @author wang
  * @since 2023-02-27
  */
+@DataPermission
 public interface DeptResponsibilityMapper extends BaseMapper<DeptResponsibility> {
 
+	@DataPermission(isPermission = false)
 	DeptResponsibilityResDTO selectById(@Param("id")String id);
 
 }

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

@@ -51,5 +51,6 @@ public interface IndicatorMapper extends BaseMapper<Indicator> {
 	IndicatorDTO selectById(@Param("id") String id);
 
 
+	List<IndicatorResDTO> selectGroupChildCode(@Param("ids") List<String> ids);
 
 }

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

@@ -7,6 +7,7 @@ import com.ims.eval.entity.dto.response.ResponsibilityIndicatorInfoResDTO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -28,4 +29,9 @@ public interface ResponsibilityIndicatorInfoMapper extends BaseMapper<Responsibi
 
 	@DataPermission(isPermission = false)
 	List<ResponsibilityIndicatorInfoResDTO> selectResponsibilityIndicatorInfoList(@Param("deptResponsibilityId") String deptResponsibilityId, @Param("isQuantified") String isQuantified, @Param("dataState") String dataState);
+
+
+	List<Map> selectResponsibilityIndicatorList(@Param("responsibilityId") String organizationEvaluationId,
+												@Param("binSection") String binSection,
+												@Param("binStage") String binStage);
 }

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

@@ -55,7 +55,7 @@ public class ResponsibilityIndicatorInfo extends Model {
 	/**
 	 * 能否量化
 	 */
-	private String isQuantified;
+	private Boolean isQuantified;
 
 	/**
 	 * 量化值
@@ -106,4 +106,22 @@ public class ResponsibilityIndicatorInfo extends Model {
 	 * 部门id
 	 */
 	private String deptId;
+
+
+	/**
+	 * 子指标code
+	 */
+	private String  childCode;
+
+
+	/**
+	 * 考评规则明细id
+	 */
+	private String evaluateRuleInfoId;
+
+
+	/**
+	 * 组织id
+	 */
+	private String organizationId;
 }

ims-service/ims-eval/src/main/java/com/ims/eval/entity/dto/request/ResponsibilityIndicatorInfoUpdateDTO.java

@@ -39,7 +39,7 @@ public class ResponsibilityIndicatorInfoUpdateDTO {
 	/**
 	 * 能否量化
 	 */
-	private String isQuantified;
+	private Boolean isQuantified;
 
 	/**
 	 * 量化值

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

@@ -27,7 +27,7 @@ public interface IIndicatorService extends IService<Indicator> {
 
 	Indicator selectByCode(String indicatorCode);
 
-	List<Indicator> selectByIds(List<String> ids);
+	List<IndicatorResDTO> getGroupChildCodeByIds(List<String> ids);
 
 	List<IndicatorResDTO> listByIds(List<String> indicatorIds);
 

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

@@ -24,7 +24,7 @@ public interface IResponsibilityIndicatorInfoService extends IService<Responsibi
 
 	Map<String  ,List<ResponsibilityIndicatorInfoResDTO>> planValueList(List<String> deptResponsibilityIds, String dept, HttpServletRequest request);
 
-	Map<String  ,List<ResponsibilityIndicatorInfoResDTO>> finishValueList(List<String> deptResponsibilityIds, String dept);
+
 
 	Map<String  ,List<ResponsibilityIndicatorInfoResDTO>> selectResponsibilityIndicatorInfoList(String deptResponsibilityId, String isQuantified, String dataState);
 
@@ -34,7 +34,16 @@ public interface IResponsibilityIndicatorInfoService extends IService<Responsibi
 
 	Map<String ,Object> getResponsibilityIdMap(String deptResponsibilityId);
 
-	boolean saveOrUpdateBatch(List<ResponsibilityIndicatorInfo> responsibilityIndicatorInfoList);
+	boolean saveOrUpdateBatch2(List<ResponsibilityIndicatorInfo> responsibilityIndicatorInfoList);
 
 	List<ResponsibilityIndicatorInfoResDTO> selectPopUpData(String deptResponsibilityId, String isQuantified, String dataState);
+
+
+	List<Map> getResponsibilityIndicatorList(String responsibilityId, String binSection, String binStage, HttpServletRequest request);
+
+
+	Map  getResponsibilityInfoList(String responsibilityId, String indicatorId,String organizationShortName,String binSection,String binStage, HttpServletRequest request);
+
+
+
 }

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

@@ -5,11 +5,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ims.common.utils.DateUtils;
 import com.ims.common.utils.StringUtils;
+import com.ims.eval.cache.CacheContext;
 import com.ims.eval.config.CustomException;
 import com.ims.eval.dao.ResponsibilityIndicatorInfoMapper;
 import com.ims.eval.entity.*;
 import com.ims.eval.dao.DeptResponsibilityMapper;
 import com.ims.eval.entity.dto.response.DeptResponsibilityResDTO;
+import com.ims.eval.entity.dto.response.IndicatorResDTO;
 import com.ims.eval.entity.dto.response.ResponsibilityIndicatorInfoResDTO;
 import com.ims.eval.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -78,7 +80,7 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 	private IUserService userService;
 
 	@Override
-	public IPage<DeptResponsibility> list(Integer pageNum, Integer pageSize, String id, String responsibilityCode,String cycleUnit,  List<String> checkCycle, String beginDate, String endDate, String stage, String createBy, String year, String month,String des) {
+	public IPage<DeptResponsibility> list(Integer pageNum, Integer pageSize, String id, String responsibilityCode, String cycleUnit, List<String> checkCycle, String beginDate, String endDate, String stage, String createBy, String year, String month, String des) {
 
 		QueryWrapper<DeptResponsibility> qw = new QueryWrapper<>();
 		if (null == pageNum || null == pageSize) {
@@ -153,70 +155,99 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 		if (infcount > 0) {
 			throw new CustomException("编号" + oriResponsibility.getResponsibilityCode() + "的责任书已启动;不允许重复操作");
 		}
-
 		oriResponsibility.setStage("流程启动");
 		baseMapper.updateById(oriResponsibility);
 
-		List<String> evaluationRuleIds = Arrays.asList(oriResponsibility.getOrganizationEvaluationRuleId().split(","));
-
-		for (String ruleId : evaluationRuleIds) {
-			//获取指定部门的规则
-			OrganizationEvaluationRule evaluationRule = organizationEvaluationRuleService.getById(ruleId);
-			if (null == evaluationRule) {
-				throw new CustomException("不存在此单位权重配置");
+		String organizationType = oriResponsibility.getOrganizationType();//考评类型 DWKP
+		String checkCycle = oriResponsibility.getCheckCycle();//考评周期-月度、季度
+		String year = oriResponsibility.getYear();//年份
+
+		//查询当前周期下对应的考评权重（需要考评的单位）
+		List<OrganizationEvaluationRule> evaluationRules = organizationEvaluationRuleService.getOrganizationEvaluationRuleByYearAndCycle(organizationType, checkCycle, year, "");
+
+		//遍历考核的单位
+		for (OrganizationEvaluationRule evaluationRule : evaluationRules) {
+			//规则集合
+			List<EvaluateRule> evaluateRuleList = new ArrayList<>();
+			//根据权重获取对应的考评规则
+			//生产经营
+			double scjyWeight = evaluationRule.getScjyWeight();
+			if (scjyWeight > 0) {
+				List<EvaluateRule> scjyevaluateRuleList = evaluateRuleService.getEvaluateRuleByYear(evaluationRule.getBinSection(), CacheContext.bseCodeObject.get("SCJY").getId(), "JDKP", evaluationRule.getYear());
+				if (null != scjyevaluateRuleList && scjyevaluateRuleList.size() > 0) {
+					evaluateRuleList.addAll(scjyevaluateRuleList);
+				}
 			}
-
-			//获取对应的考评规（至少存在一条）
-			List<String> evaluateRuleIds = Arrays.asList(evaluationRule.getEvaluateRuleId().split(","));
-			List<EvaluateRule> evaluateRuleList = evaluateRuleService.listAll(evaluateRuleIds);
-			if (null == evaluateRuleList || evaluateRuleList.size() <= 0) {
-				//throw new CustomException("未获取到配置的规则");
-				continue;
+			//前期
+			double qqWeight = evaluationRule.getQqWeight();
+			if (qqWeight > 0) {
+				List<EvaluateRule> qqevaluateRuleList = evaluateRuleService.getEvaluateRuleByYear(CacheContext.bsnCodeObject.get("QQ").getId(), CacheContext.bseCodeObject.get("QQXM").getId(), "JDKP", evaluationRule.getYear());
+				if (null != qqevaluateRuleList && qqevaluateRuleList.size() > 0) {
+					evaluateRuleList.addAll(qqevaluateRuleList);
+				}
+			}
+			//基建
+			double jjWeight = evaluationRule.getJjWeight();
+			if (jjWeight > 0) {
+				List<EvaluateRule> jjevaluateRuleList = evaluateRuleService.getEvaluateRuleByYear(CacheContext.bsnCodeObject.get("JJ").getId(), CacheContext.bseCodeObject.get("JJXM").getId(), "JDKP", evaluationRule.getYear());
+				if (null != jjevaluateRuleList && jjevaluateRuleList.size() > 0) {
+					evaluateRuleList.addAll(jjevaluateRuleList);
+				}
 			}
 			//获取考评规则的id
 			List<String> ruleIds = evaluateRuleList.stream().map(EvaluateRule::getId).collect(Collectors.toList());
 			//通过规则id获取对应的规则明细
+			if (ruleIds.size() <= 0) {
+				continue;
+			}
 			List<EvaluateRuleInfo> ruleInfos = evaluateRuleInfoService.list(ruleIds);
 			if (null == ruleInfos || ruleInfos.size() <= 0) {
-//				throw new CustomException("规则明细配置为空");
 				continue;
 			}
 
-
 			//获取考评规则中的指标id
 			List<String> indicatorIds = ruleInfos.stream().map(EvaluateRuleInfo::getIndicatorId).collect(Collectors.toList());
 
 			//获取指标对象
-			List<Indicator>  indicators = iIndicatorService.selectByIds(indicatorIds);
-
-			/***   目标目标责任书默认生成目标值 ZRMB     ***/
-			indicators.stream().forEach(i -> {
+			List<IndicatorResDTO> indicators = iIndicatorService.getGroupChildCodeByIds(indicatorIds);
+			if (null == indicators || indicators.size() <= 0) {
+				continue;
+			}
+			List<ResponsibilityIndicatorInfo> infoList = new ArrayList<>();
+			for (IndicatorResDTO dto : indicators) {
 				ResponsibilityIndicatorInfo info = new ResponsibilityIndicatorInfo();
 				info.setDeptResponsibilityId(oriResponsibility.getId());
-				info.setOrganizationEvaluationRuleId(ruleId);
-				info.setIndicatorId(i.getId());
-				info.setIndicatorDictionaryId(null);
-				info.setOptionCode("ZRMB");
-				info.setIsQuantified(i.getIsQuantified());
-				info.setState("-1");
+				info.setOrganizationEvaluationRuleId(evaluationRule.getId());
+				info.setIndicatorId(dto.getIndicatorId());
+				info.setChildCode(dto.getChildCode());
+				info.setDeptId(dto.getDeptId());
+				info.setIndicatorDictionaryId(dto.getId());
+				info.setOptionCode(dto.getOptionCode());
+				info.setIsQuantified(dto.getIsQuantified());
 				info.setCreateTime(new Date());
-				info.setDeptId(i.getDeptId());
-				boolean b2 = responsibilityIndicatorInfoService.saveOrUpdate(info);
-				if (!b2) {
-					throw new CustomException("初始化目标责任书明细失败");
-				}
-			});
-		}
+				info.setState("0");
+				info.setOrganizationId(evaluationRule.getOrganizationId());
+				infoList.add(info);
 
+			}
+			boolean b2 = responsibilityIndicatorInfoService.saveOrUpdateBatch(infoList);
+			if (!b2) {
+				throw new CustomException("初始化明细失败");
+			}
+
+		}
+		oriResponsibility.setStage("流程启动");
+		baseMapper.updateById(oriResponsibility);
 		return true;
 	}
 
+
 	@Override
-	public DeptResponsibilityResDTO getByidAndInfo(String id, String dept,HttpServletRequest request) {
+	public DeptResponsibilityResDTO getByidAndInfo(String id, String dept, HttpServletRequest request) {
 		DeptResponsibilityResDTO resDTO = baseMapper.selectById(id);
 
-		Map<String, List<ResponsibilityIndicatorInfoResDTO>> map = responsibilityIndicatorInfoService.planValueList(Arrays.asList(id), dept,request);
-		if(null != resDTO){
+		Map<String, List<ResponsibilityIndicatorInfoResDTO>> map = responsibilityIndicatorInfoService.planValueList(Arrays.asList(id), dept, request);
+		if (null != resDTO) {
 			resDTO.setMap(map);
 		}
 
@@ -233,10 +264,10 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 	}
 
 	@Override
-	public boolean editState(String id, String state,String instId) {
+	public boolean editState(String id, String state, String instId) {
 		DeptResponsibility responsibility = baseMapper.selectById(id);
 		if (StringUtils.isNotEmpty(state)) {
-			if("任务书签订".equals(state)){
+			if ("任务书签订".equals(state)) {
 				state = "流程结束";
 			}
 			responsibility.setStage(state);
@@ -270,7 +301,7 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 		if ("NDKP".equals(entity.getCheckCycle())) {
 			oriList = list("", entity.getCheckCycle(), entity.getYear(), "");
 			responsibilityCode.append(entity.getYear()).append("_");
-			responsibilityCode.append(StringUtils.addZeroForStr(String.valueOf(oriList.size()+1), 4, "l"));
+			responsibilityCode.append(StringUtils.addZeroForStr(String.valueOf(oriList.size() + 1), 4, "l"));
 		}
 		if ("JDKP".equals(entity.getCheckCycle())) {
 			Date newDate = DateUtils.toDate(entity.getYear() + "-" + entity.getMonth() + "-01");
@@ -279,13 +310,13 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 			oriList = list("", entity.getCheckCycle(), entity.getYear(), month);
 			List<DeptResponsibility> count = list("", entity.getCheckCycle(), entity.getYear(), "");
 			responsibilityCode.append(entity.getYear()).append("_").append(month).append("_");
-			responsibilityCode.append(StringUtils.addZeroForStr(String.valueOf(count.size()+1), 4, "l"));
+			responsibilityCode.append(StringUtils.addZeroForStr(String.valueOf(count.size() + 1), 4, "l"));
 		}
 		if ("YDKP".equals(entity.getCheckCycle())) {
 			oriList = list("", entity.getCheckCycle(), entity.getYear(), entity.getMonth());
 			responsibilityCode.append(entity.getYear()).append("_").append(entity.getMonth()).append("_");
 			List<DeptResponsibility> count = list("", entity.getCheckCycle(), entity.getYear(), "");
-			responsibilityCode.append(StringUtils.addZeroForStr(String.valueOf(count.size()+1), 4, "l"));
+			responsibilityCode.append(StringUtils.addZeroForStr(String.valueOf(count.size() + 1), 4, "l"));
 		}
 
 
@@ -361,7 +392,7 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 
 	@Override
 	public DeptResponsibility getDeptResponsibility(String id) {
-		if(StringUtils.isEmpty(id)){
+		if (StringUtils.isEmpty(id)) {
 			return null;
 		}
 		DeptResponsibility res = this.getById(id);

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

@@ -120,10 +120,8 @@ public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator
 	}
 
 	@Override
-	public List<Indicator> selectByIds(List<String> ids) {
-		QueryWrapper<Indicator> qw = new QueryWrapper<>();
-		qw.lambda().in(Indicator::getId, ids);
-		List<Indicator> list = baseMapper.selectList(qw);
+	public List<IndicatorResDTO> getGroupChildCodeByIds(List<String> ids) {
+		List<IndicatorResDTO> list = baseMapper.selectGroupChildCode(ids);
 		return list;
 	}
 

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

@@ -443,9 +443,6 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 					titleArray.add(titlemap);
 
 				}
-
-
-
 				title.put(childCodeEntry.getKey().split(",")[1], titleArray);
 
 			}

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

@@ -408,7 +408,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 				}
 				boolean b2 = organizationEvaluationInfoService.saveBatch(organizationEvaluationInfos);
 				if (!b2) {
-					throw new CustomException("初始化目标责任书明细失败");
+					throw new CustomException("初始化明细失败");
 				}
 			}
 			organizationEvaluation.setStage("流程启动");

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

@@ -56,12 +56,6 @@ public class ResponsibilityIndicatorInfoServiceImpl extends ServiceImpl<Responsi
 
 	}
 
-	@Override
-	public Map<String, List<ResponsibilityIndicatorInfoResDTO>> finishValueList(List<String> deptResponsibilityIds, String dept) {
-
-
-		return null;
-	}
 
 	@Override
 	public Map<String, List<ResponsibilityIndicatorInfoResDTO>> selectResponsibilityIndicatorInfoList(String deptResponsibilityId, String isQuantified, String dataState) {
@@ -143,7 +137,7 @@ public class ResponsibilityIndicatorInfoServiceImpl extends ServiceImpl<Responsi
 	}
 
 	@Override
-	public boolean saveOrUpdateBatch(List<ResponsibilityIndicatorInfo> responsibilityIndicatorInfoList) {
+	public boolean saveOrUpdateBatch2(List<ResponsibilityIndicatorInfo> responsibilityIndicatorInfoList) {
 		boolean b = false;
 		for (ResponsibilityIndicatorInfo obj : responsibilityIndicatorInfoList) {
 			ResponsibilityIndicatorInfo responsibilityIndicatorInfo = super.getById(obj.getId());
@@ -178,4 +172,20 @@ public class ResponsibilityIndicatorInfoServiceImpl extends ServiceImpl<Responsi
 		List<ResponsibilityIndicatorInfoResDTO> list = baseMapper.selectResponsibilityIndicatorInfoList(deptResponsibilityId, isQuantified, dataState);
 		return list;
 	}
+
+
+	@Override
+	public List<Map> getResponsibilityIndicatorList(String responsibilityId, String binSection, String binStage, HttpServletRequest request) {
+		List<Map> list = baseMapper.selectResponsibilityIndicatorList(responsibilityId, binSection, binStage);
+		return list;
+	}
+
+	@Override
+	public Map getResponsibilityInfoList(String responsibilityId, String indicatorId, String organizationShortName, String binSection, String binStage, HttpServletRequest request) {
+		//获取数据
+		//
+
+		return null;
+	}
+
 }

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

@@ -51,4 +51,5 @@
 
     </select>
 
+
 </mapper>

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

@@ -171,4 +171,27 @@
 
     </select>
 
+
+    <select id="selectGroupChildCode" resultType="com.ims.eval.entity.dto.response.IndicatorResDTO">
+        SELECT
+        d.id,
+        d.indicator_id,
+        d.option_code,
+        d.option_name,
+        d.is_quantified,
+        d.child_code,
+        d.child_name,
+        i.dept_id
+        FROM INDICATOR i
+        LEFT JOIN indicator_dictionary d ON i.ID = d.indicator_id
+        <where>
+
+            <if test="ids !=null">
+                AND i.id in
+                <foreach item="item" collection="ids" separator="," open="(" close=")" index="">'${item}'</foreach>
+            </if>
+            and d.option_code in ('JHZ','WCZ','MBZ')
+        </where>
+    </select>
+
 </mapper>

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

@@ -128,4 +128,30 @@
         </where>
     </select>
 
+    <select id="selectResponsibilityIndicatorList" resultType="java.util.Map">
+
+        select distinct
+        i.id,
+        i.indicator_name
+        from
+        responsibility_indicator_info ri
+        inner join "indicator" i on i.id = ri.indicator_id
+
+        <where>
+
+            <if test="responsibilityId !=null and responsibilityId !=''">
+                and  ri.responsibilityId = #{responsibilityId}
+            </if>
+
+            <if test="binSection !=null and binSection !=''">
+                and  i.bin_section = #{binSection}
+            </if>
+
+            <if test="binStage !=null and binStage !=''">
+                and i.bin_stage = #{binStage}
+            </if>
+        </where>
+
+    </select>
+
 </mapper>