Merge remote-tracking branch 'origin/master'

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

@@ -1807,9 +1807,11 @@ public class RuralCostProjectMessageController extends BaseController {
                 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;
+            if(StringUtils.isNotBlank(reported.getSongShenJia()) && StringUtils.isNotBlank(reported.getShenDingJia())){
+                Double jingHeJianE = Double.valueOf(reported.getShenDingJia())-Double.valueOf(reported.getSongShenJia());
                 reported.setJingHeJianE(String.format("%.2f", jingHeJianE));
+                Double jingHeJianLv = jingHeJianE/Double.valueOf(reported.getSongShenJia()) * 100;
+                reported.setJingHeJianLv(String.format("%.2f", jingHeJianLv));
             }
 
             ruralProjectMessageService.disposeProjectRecords(records,reported);

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

@@ -1529,9 +1529,11 @@ public class RuralCostProjectMessageNewController extends BaseController {
                 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;
+            if(StringUtils.isNotBlank(reported.getSongShenJia()) && StringUtils.isNotBlank(reported.getShenDingJia())){
+                Double jingHeJianE = Double.valueOf(reported.getShenDingJia())-Double.valueOf(reported.getSongShenJia());
                 reported.setJingHeJianE(String.format("%.2f", jingHeJianE));
+                Double jingHeJianLv = jingHeJianE/Double.valueOf(reported.getSongShenJia()) * 100;
+                reported.setJingHeJianLv(String.format("%.2f", jingHeJianLv));
             }
 
             ruralProjectMessageS.disposeProjectRecords(records,reported);

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

@@ -1792,9 +1792,11 @@ public class RuralProjectMessageController extends BaseController {
                 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;
+            if(StringUtils.isNotBlank(reported.getSongShenJia()) && StringUtils.isNotBlank(reported.getShenDingJia())){
+                Double jingHeJianE = Double.valueOf(reported.getShenDingJia())-Double.valueOf(reported.getSongShenJia());
                 reported.setJingHeJianE(String.format("%.2f", jingHeJianE));
+                Double jingHeJianLv = jingHeJianE/Double.valueOf(reported.getSongShenJia()) * 100;
+                reported.setJingHeJianLv(String.format("%.2f", jingHeJianLv));
             }
 
             ruralProjectMessageService.disposeProjectRecords(records,reported);

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

@@ -1348,9 +1348,11 @@ public class RuralProjectMessageNewController extends BaseController {
                 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;
+            if(StringUtils.isNotBlank(reported.getSongShenJia()) && StringUtils.isNotBlank(reported.getShenDingJia())){
+                Double jingHeJianE = Double.valueOf(reported.getShenDingJia())-Double.valueOf(reported.getSongShenJia());
                 reported.setJingHeJianE(String.format("%.2f", jingHeJianE));
+                Double jingHeJianLv = jingHeJianE/Double.valueOf(reported.getSongShenJia()) * 100;
+                reported.setJingHeJianLv(String.format("%.2f", jingHeJianLv));
             }
             if(StringUtils.isNotBlank(projectReportData.getZiXunShouRu())){
                 Double ziXunShouRu = Double.valueOf(projectReportData.getZiXunShouRu());