设置小数

src/main/java/com/steerinfo/ems/trmworkprocproductvalue/mapper/TRmWorkprocProductValueMapper.xml

@@ -809,7 +809,7 @@ FROM
     SELECT * FROM (SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,ZH_RCL1 AS ACTUALVALUE,ZH_RCL1 AS APPORTVALUE,'AT3011CP010R' AS ITEMID FROM EMS_SCQK_JC WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND ZH_RCL1 IS NOT NULL UNION ALL
     SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,ZH_RCL2 AS ACTUALVALUE,ZH_RCL2 AS APPORTVALUE,'AT3012CP010R' AS ITEMID FROM EMS_SCQK_JC WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND ZH_RCL2 IS NOT NULL UNION ALL
     SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,KZF_RCL AS ACTUALVALUE,KZF_RCL AS APPORTVALUE,'AT2014CP048R' AS ITEMID FROM EMS_SCQK_JC WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND KZF_RCL IS NOT NULL UNION ALL
-    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,RCL AS ACTUALVALUE,(100-W)/100*RCL AS APPORTVALUE,'AT2017CP040R' AS ITEMID FROM EMS_SCQK_JJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND RCL IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,RCL AS ACTUALVALUE,(100-4)/100*RCL AS APPORTVALUE,'AT2017CP040R' AS ITEMID FROM EMS_SCQK_JJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND RCL IS NOT NULL UNION ALL
     SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,JY_CL AS ACTUALVALUE,JY_CL AS APPORTVALUE,'AT2011CP032R' AS ITEMID FROM EMS_SCQK_JJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND JY_CL IS NOT NULL UNION ALL
     SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,CB_CL AS ACTUALVALUE,CB_CL AS APPORTVALUE,'AT2011CP026R' AS ITEMID FROM EMS_SCQK_JJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND CB_CL IS NOT NULL UNION ALL
     SELECT TO_CHAR( DATES, 'yyyy-MM-dd' ) AS CLOCK,JMCL AS ACTUALVALUE,JMCL AS APPORTVALUE,'AT2012CP031R' AS ITEMID FROM EMS_SCQK_JJ WHERE

src/main/java/com/steerinfo/ems/trmworkprocproductvalue/service/impl/TRmWorkprocProductValueServiceImpl.java

@@ -1184,11 +1184,14 @@ public class TRmWorkprocProductValueServiceImpl extends BaseServiceImpl<TRmWorkp
 	@Override
 	public void getReportProductValue(HashMap<String, Object> params) {
 		List<TRmWorkprocProductValue> trmlist= tRmWorkprocProductValueMapper.getProductValue(params);
+		TRmWorkprocProduct tRmWorkprocProduct = new TRmWorkprocProduct();
 		for(TRmWorkprocProductValue tRmWorkprocProductValue: trmlist)
 		{
+			tRmWorkprocProduct = tRmWorkprocProductService.getById(tRmWorkprocProductValue.getItemid());
 			tRmWorkprocProductValue.setTimegranid("DAY");
 			tRmWorkprocProductValue.setItemtype("R");
-			tRmWorkprocProductValue.setCorrectvalue(tRmWorkprocProductValue.getApportvalue().subtract(tRmWorkprocProductValue.getActualvalue()));
+			tRmWorkprocProductValue.setApportvalue(tRmWorkprocProductValue.getApportvalue().setScale(tRmWorkprocProduct.getDigits(),BigDecimal.ROUND_DOWN));
+			tRmWorkprocProductValue.setCorrectvalue(tRmWorkprocProductValue.getApportvalue().subtract(tRmWorkprocProductValue.getActualvalue()).setScale(tRmWorkprocProduct.getDigits(),BigDecimal.ROUND_DOWN));
 			tRmWorkprocProductValue.setBz("计算值是湿基；最终值是干基");
 			tRmWorkprocProductValue.setUserid("系统");
 			tRmWorkprocProductValue.setUpdatetime(DateUtils.dateStr(new Date(),"yyyy-MM-dd HH:mm:ss"));