Explorar o código

fix 平衡项目中最终值由人工进行填写

zhangy %!s(int64=2) %!d(string=hai) anos
pai
achega
61319aeba2

+ 6 - 4
src/main/java/com/steerinfo/ems/trmbalancevalue/service/impl/TRmBalanceValueServiceImpl.java

@@ -175,7 +175,8 @@ public class TRmBalanceValueServiceImpl extends BaseServiceImpl<TRmBalanceValue,
 				// 数据是否已存在
 				TRmBalanceValue tv = tRmBalanceValueMapper.selectByPrimaryKey(id);
 				if(tv!=null){
-					tv.setActualvalue(new BigDecimal(actualvalue));
+					//修改的值在重新生成之后是不进行重置的
+					//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));
@@ -193,8 +194,9 @@ public class TRmBalanceValueServiceImpl extends BaseServiceImpl<TRmBalanceValue,
 					tv.setActualvalue(new BigDecimal(actualvalue));
 					//修正值
 					tv.setCorrectvalue(new BigDecimal(0));
-					//最终值
-					tv.setApportvalue(new BigDecimal(actualvalue));
+					//最终值 tv.setApportvalue(new BigDecimal(actualvalue));
+					//默认最终值是null.让计控去写
+					tv.setApportvalue(null);
 					//折标值
 					tv.setStdvalue(BigDecimalUtil.mul(zbxs, actualvalue).setScale(digits, BigDecimal.ROUND_HALF_UP));
 					//单耗值
@@ -218,4 +220,4 @@ public class TRmBalanceValueServiceImpl extends BaseServiceImpl<TRmBalanceValue,
 	public int getCount(Map<String, Object> params) {
 		return tRmBalanceValueMapper.getCount(params);
 	}
-}
+}