上报页面展示调整

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageController.java

@@ -1746,14 +1746,22 @@ public class RuralCostProjectMessageController extends BaseController {
             reported = ruralProjectMessageService.disposeData(records);
 
             //合同价送审价审定价处理
-            Double heTongJia = Double.valueOf(reported.getHeTongJia())/10000;
-            reported.setHeTongJia(String.format("%.2f", heTongJia));
-            Double songShenJia = Double.valueOf(reported.getSongShenJia())/10000;
-            reported.setSongShenJia(String.format("%.2f", songShenJia));
-            Double shenDingJia = Double.valueOf(reported.getShenDingJia())/10000;
-            reported.setShenDingJia(String.format("%.2f", shenDingJia));
-            Double jingHeJianE = Double.valueOf(reported.getJingHeJianE())/10000;
-            reported.setJingHeJianE(String.format("%.2f", jingHeJianE));
+            if(StringUtils.isNotBlank(reported.getHeTongJia())){
+                Double heTongJia = Double.valueOf(reported.getHeTongJia())/10000;
+                reported.setHeTongJia(String.format("%.2f", heTongJia));
+            }
+            if(StringUtils.isNotBlank(reported.getSongShenJia())){
+                Double songShenJia = Double.valueOf(reported.getSongShenJia())/10000;
+                reported.setSongShenJia(String.format("%.2f", songShenJia));
+            }
+            if(StringUtils.isNotBlank(reported.getShenDingJia())){
+                Double shenDingJia = Double.valueOf(reported.getShenDingJia())/10000;
+                reported.setShenDingJia(String.format("%.2f", shenDingJia));
+            }
+            if(StringUtils.isNotBlank(reported.getJingHeJianE())){
+                Double jingHeJianE = Double.valueOf(reported.getJingHeJianE())/10000;
+                reported.setJingHeJianE(String.format("%.2f", jingHeJianE));
+            }
 
             ruralProjectMessageService.disposeProjectRecords(records,reported);
         }

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageController.java

@@ -1744,14 +1744,22 @@ public class RuralProjectMessageController extends BaseController {
             reported = ruralProjectMessageService.disposeData(records);
 
             //合同价送审价审定价处理
-            Double heTongJia = Double.valueOf(reported.getHeTongJia())/10000;
-            reported.setHeTongJia(String.format("%.2f", heTongJia));
-            Double songShenJia = Double.valueOf(reported.getSongShenJia())/10000;
-            reported.setSongShenJia(String.format("%.2f", songShenJia));
-            Double shenDingJia = Double.valueOf(reported.getShenDingJia())/10000;
-            reported.setShenDingJia(String.format("%.2f", shenDingJia));
-            Double jingHeJianE = Double.valueOf(reported.getJingHeJianE())/10000;
-            reported.setJingHeJianE(String.format("%.2f", jingHeJianE));
+            if(StringUtils.isNotBlank(reported.getHeTongJia())){
+                Double heTongJia = Double.valueOf(reported.getHeTongJia())/10000;
+                reported.setHeTongJia(String.format("%.2f", heTongJia));
+            }
+            if(StringUtils.isNotBlank(reported.getSongShenJia())){
+                Double songShenJia = Double.valueOf(reported.getSongShenJia())/10000;
+                reported.setSongShenJia(String.format("%.2f", songShenJia));
+            }
+            if(StringUtils.isNotBlank(reported.getShenDingJia())){
+                Double shenDingJia = Double.valueOf(reported.getShenDingJia())/10000;
+                reported.setShenDingJia(String.format("%.2f", shenDingJia));
+            }
+            if(StringUtils.isNotBlank(reported.getJingHeJianE())){
+                Double jingHeJianE = Double.valueOf(reported.getJingHeJianE())/10000;
+                reported.setJingHeJianE(String.format("%.2f", jingHeJianE));
+            }
 
             ruralProjectMessageService.disposeProjectRecords(records,reported);
         }