更新考评详情 删除修改

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

@@ -60,8 +60,8 @@ public class OrganizationEvaluationCommonInfoController {
 	@ApiOperation(value = "删除", notes = "删除")
 	public R deleteAll(@PathVariable("ids") String ids) {
 		String[] strings = ids.split(",");
-		boolean b = organizationEvaluationCommonInfoService.removeByIds(Arrays.asList(strings));
-//		boolean b = organizationEvaluationCommonInfoService.removeCommonInfos(organizationEvaluationId,indicatorId,organizationId,deptIds);
+
+		boolean b = organizationEvaluationCommonInfoService.removeCommonInfos(strings);
 		if (b) {
 			return R.ok().data(b);
 		} else {

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

@@ -22,10 +22,10 @@ public interface IOrganizationEvaluationCommonInfoService extends IService<Organ
 
 	Map getListAll(String organizationEvaluationId, String indicatorId, String organizationId, String deptId);
 
-//	boolean removeCommonInfos(String 批量删除, String indicatorId, String organizationId,String deptId);
+	boolean removeCommonInfos(String[] ids);
 
 
 	List<OrganizationEvaluationCommonInfo> getEvaluationCommonInfo(String organizationEvaluationId, String organizationId, String indicatorId,String indicatorDictionaryId);
 
-
+	boolean hbCommonInfo(String organizationEvaluationId,String organizationId, String indicatorId);
 }

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

@@ -288,6 +288,44 @@ public class OrganizationEvaluationCommonInfoServiceImpl extends ServiceImpl<Org
 		return list;
 	}
 
+	@Override
+	public boolean hbCommonInfo(String organizationEvaluationId, String organizationId, String indicatorId) {
+		//获取明细
+		List<OrganizationEvaluationInfo> evaluationInfoList = organizationEvaluationInfoService.getConvergeCommonInfo(organizationEvaluationId,organizationId,indicatorId);
+		List<OrganizationEvaluationCommonInfo> evaluationCommonInfos = getEvaluationCommonInfo(organizationEvaluationId,organizationId,indicatorId,"");
+
+		//按照指标项id分组
+		Map<String, List<OrganizationEvaluationCommonInfo>> groupOptionData = evaluationCommonInfos.stream()
+			.collect(Collectors.groupingBy(OrganizationEvaluationCommonInfo::getIndicatorDictionaryId));
+
+		for (OrganizationEvaluationInfo oei : evaluationInfoList){
+			List<OrganizationEvaluationCommonInfo> oeci = null != groupOptionData.get(oei.getIndicatorDictionaryId()) ? groupOptionData.get(oei.getIndicatorDictionaryId()) :null;
+			if(null !=oeci ){
+				if(oei.getIsQuantified()){
+					double ageSum = oeci.stream().mapToDouble(OrganizationEvaluationCommonInfo::getQuantifiedValue).sum();
+					oei.setQuantifiedValue(DoubleUtils.getRoundingNum(ageSum,2));
+					oei.setNonQuantifiedValue(DoubleUtils.getRoundingNum(ageSum,2)+"");
+				}else {
+					oei.setNonQuantifiedValue("见详情");
+				}
+			}
+		}
+		boolean b = organizationEvaluationInfoService.saveOrUpdateBatch(evaluationInfoList);
+		return b;
+	}
+
+	@Transactional
+	@Override
+	public boolean removeCommonInfos(String[] ids) {
+		OrganizationEvaluationCommonInfo info = this.getById(ids[0]);
+		boolean b = this.removeByIds(Arrays.asList(ids));
+		if(!b){
+			return b;
+		}
+		b = hbCommonInfo(info.getOrganizationEvaluationId(),info.getOrganizationId(),info.getIndicatorId());
+		return b;
+	}
+
 
 	//	@Override
 //	public boolean removeCommonInfos(String organizationEvaluationId, String indicatorId, String organizationId, String deptId) {

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

@@ -1334,8 +1334,11 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 	}
 
 
-
-	private List<String> getOptionCode(String formula){
+	private List<String> getOptionCode(String formula) {
+		List<String> setOptionCode =  new ArrayList<>();
+		if (StringUtils.isEmpty(formula)) {
+			return setOptionCode;
+		}
 		List<String> optionCode = new ArrayList<>();
 		String pattern = "\\[(.*?)\\]";
 		Pattern regex = Pattern.compile(pattern);
@@ -1345,7 +1348,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 			optionCode.add(match);
 		}
 		Set<String> uniqueOptionCode = new HashSet<>(optionCode);
-		List<String> setOptionCode = new ArrayList<>(uniqueOptionCode);
+		 setOptionCode = new ArrayList<>(uniqueOptionCode);
 		return setOptionCode;
 	}