添加专项指标新增功能 修改

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

@@ -61,10 +61,13 @@ public interface OrganizationEvaluationInfoMapper extends BaseMapper<Organizatio
 	List<OrganizationEvaluationInfoResDTO> selectEvaluationInfoList(@Param("organizationEvaluationId") String organizationEvaluationId,
 											@Param("indicatorId") String indicatorId,
 											@Param("binSection") String binSection,
-											@Param("binStage") String binStage);
+											@Param("binStage") String binStage,
+											@Param("organizationId") String organizationId);
 
 
 
 //	void updateEvaluationInfo(@Param("evaluationInfos")  List<OrganizationEvaluationInfo> evaluationInfos);
 
+
+
 }

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

@@ -379,7 +379,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 
 		Map data = new HashMap();
 		boolean titlemark = true;//标记生成标题
-		List<OrganizationEvaluationInfoResDTO> infoResDTOList = baseMapper.selectEvaluationInfoList(organizationEvaluationId, indicatorId,binSection,binStage);
+		List<OrganizationEvaluationInfoResDTO> infoResDTOList = baseMapper.selectEvaluationInfoList(organizationEvaluationId, indicatorId,binSection,binStage,"");
 		List<IndicatorDictionary> dictionaryList = indicatorDictionaryService.list("", indicatorId, "", "");
 
 		//根据组织（公司）id分组
@@ -464,7 +464,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 		Map<String ,List<Map<String,String>>> title = new LinkedHashMap();//标题
 		List<Map<String,String>> mapList = new ArrayList<>();//数据list
 		boolean titlemark = true;//标记生成标题
-		List<OrganizationEvaluationInfoResDTO> infoResDTOList = baseMapper.selectEvaluationInfoList(organizationEvaluationId, indicatorId,binSection,binStage);
+		List<OrganizationEvaluationInfoResDTO> infoResDTOList = baseMapper.selectEvaluationInfoList(organizationEvaluationId, indicatorId,binSection,binStage,"");
 		List<IndicatorDictionary> dictionaryList = indicatorDictionaryService.list("", indicatorId, "", "");
 
 		//根据组织（公司）id分组
@@ -632,7 +632,8 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 		sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, colsize));
 		header0Cell0.setCellStyle(cellStyle);
 
-		// 将Workbook写入字节数组输出流
+		// 将Workb
+		// ook写入字节数组输出流
 		ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
 		workbook.write(outputStream);
 
@@ -774,6 +775,12 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 
 		for (AddEvaluationInfoDTO addEvaluationInfoDTO : addEvaluationInfoDTOs) {
 
+			List<OrganizationEvaluationInfoResDTO> infoResDTOList = baseMapper.selectEvaluationInfoList(addEvaluationInfoDTO.getOrganizationEvaluationId(), addEvaluationInfoDTO.getIndicatorId(),addEvaluationInfoDTO.getBinSection(),addEvaluationInfoDTO.getBinStage(),addEvaluationInfoDTO.getOrganizationId());
+
+			if(null != infoResDTOList && infoResDTOList.size()>0){
+				throw new CustomException("该组织已存在当前指标");
+			}
+
 			//1.获取考评id(获取此考评记录)
 			String organizationEvaluationId = addEvaluationInfoDTO.getOrganizationEvaluationId();
 
@@ -818,10 +825,12 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 					info.setOptionCode(d.getOptionCode());
 					info.setIsQuantified(d.getIsQuantified());
 					if (null != optionMap.get(d.getChildCode() + "_" + d.getOptionCode())) {
-						String value = String.valueOf(optionMap.get(d.getOptionCode()));
-						info.setNonQuantifiedValue(value);
-						if (d.getIsQuantified2()) {
-							info.setQuantifiedValue(Double.valueOf(value));
+						Object value = optionMap.get(d.getChildCode() + "_" +d.getOptionCode());
+						if (null != value) {
+							info.setNonQuantifiedValue(String.valueOf(value));
+							if (d.getIsQuantified2()) {
+								info.setQuantifiedValue(Double.valueOf(value.toString()));
+							}
 						}
 					}
 					info.setChildCode(d.getChildCode());

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

@@ -345,6 +345,12 @@
                 and  be.id = #{binStage}
             </if>
 
+            <if test="organizationId !=null and organizationId !=''">
+                and  oer.organization_id = #{organizationId}
+            </if>
+
+
+
             and id.option_code not in ('CZMAX','CZMIN','LRGXKLMAX','LRGXKLMIN','DWQWLRMAX','DWQWLRMIN','WCLDF','LRGXKHMAX','LRGXKHMIN')
         </where>