Merge remote-tracking branch 'origin/master'

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

@@ -1710,6 +1710,16 @@ public class RuralCostProjectMessageController extends BaseController {
             ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
             records.setReportData(projectReportData);
             reported = ruralProjectMessageService.disposeData(records);
+
+            //合同价送审价审定价处理
+            Double heTongJia = Double.valueOf(reported.getHeTongJia())/100;
+            reported.setHeTongJia(String.format("%.2f", heTongJia));
+            Double songShenJia = Double.valueOf(reported.getSongShenJia())/100;
+            reported.setSongShenJia(String.format("%.2f", songShenJia));
+            Double shenDingJia = Double.valueOf(reported.getShenDingJia())/100;
+            reported.setShenDingJia(String.format("%.2f", shenDingJia));
+            Double jingHeJianE = Double.valueOf(reported.getJingHeJianE())/100;
+            reported.setJingHeJianE(String.format("%.2f", jingHeJianE));
         }
         //根据上报id查询上报咨询员的信息
         List<RuralReportConsultant> reportedConsultants=ruralProjectMessageService.getReportedConsultantsList(reported.getId());

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

@@ -1710,6 +1710,16 @@ public class RuralProjectMessageController extends BaseController {
             ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
             records.setReportData(projectReportData);
             reported = ruralProjectMessageService.disposeData(records);
+
+            //合同价送审价审定价处理
+            Double heTongJia = Double.valueOf(reported.getHeTongJia())/100;
+            reported.setHeTongJia(String.format("%.2f", heTongJia));
+            Double songShenJia = Double.valueOf(reported.getSongShenJia())/100;
+            reported.setSongShenJia(String.format("%.2f", songShenJia));
+            Double shenDingJia = Double.valueOf(reported.getShenDingJia())/100;
+            reported.setShenDingJia(String.format("%.2f", shenDingJia));
+            Double jingHeJianE = Double.valueOf(reported.getJingHeJianE())/100;
+            reported.setJingHeJianE(String.format("%.2f", jingHeJianE));
         }
         //根据上报id查询上报咨询员的信息
         List<RuralReportConsultant> reportedConsultants=ruralProjectMessageService.getReportedConsultantsList(reported.getId());