平衡项目数据最终值=实绩值

src/main/java/com/steerinfo/ems/trmbalancevalue/service/impl/TRmBalanceValueServiceImpl.java

@@ -175,8 +175,8 @@ public class TRmBalanceValueServiceImpl extends BaseServiceImpl<TRmBalanceValue,
 				// 数据是否已存在
 				TRmBalanceValue tv = tRmBalanceValueMapper.selectByPrimaryKey(id);
 				if(tv!=null){
-					//修改的值在重新生成之后是不进行重置的
 					tv.setActualvalue(new BigDecimal(actualvalue));
+					//修改的值在重新生成之后是不进行重置的()
 					//tv.setApportvalue(BigDecimalUtil.add(tv.getCorrectvalue()!=null?tv.getCorrectvalue().doubleValue():0d, actualvalue).setScale(digits, BigDecimal.ROUND_HALF_UP));
 					// 折标值
 					tv.setStdvalue(BigDecimalUtil.mul(zbxs, actualvalue).setScale(digits, BigDecimal.ROUND_HALF_UP));
@@ -194,9 +194,17 @@ public class TRmBalanceValueServiceImpl extends BaseServiceImpl<TRmBalanceValue,
 					tv.setActualvalue(new BigDecimal(actualvalue));
 					//修正值
 					tv.setCorrectvalue(new BigDecimal(0));
-					//最终值 tv.setApportvalue(new BigDecimal(actualvalue));
-					//默认最终值是null.让计控去写
-					tv.setApportvalue(null);
+
+					//最终值 = 等于实绩值
+					HashMap<String,Object> parmas = new HashMap<>();
+					parmas.put("itemid", "'"+itemid+"'");
+					parmas.put("clock",clock);
+					parmas.put("clocke",clock);
+					parmas.put("timegranid", timegranid);
+					List<Map<String, Object>> result = tRmActItemService.getBalanceDataForPage(parmas,1,10).getList();
+					tv.setApportvalue(result!=null && result.size()>0  && result.get(0)!=null ? new BigDecimal(String.valueOf(result.get(0).get("RAV"))):null);
+//					tv.setApportvalue(null);
+
 					//折标值
 					tv.setStdvalue(BigDecimalUtil.mul(zbxs, actualvalue).setScale(digits, BigDecimal.ROUND_HALF_UP));
 					//单耗值