Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/common/utils/sg/ExcelUtil.java

@@ -1,6 +1,10 @@
 package com.jeeplus.common.utils.sg;
 
 import com.jeeplus.common.utils.excel.ImportExcel;
+import com.jeeplus.modules.sg.overheadline.entity.JkxlDetailFee;
+
+import java.text.DecimalFormat;
+import java.util.List;
 
 public class ExcelUtil {
 
@@ -170,4 +174,6 @@ public class ExcelUtil {
         }
         return rate;
     }
+
+
 }

src/main/java/com/jeeplus/modules/sg/overheadline/mapper/xml/OverheadLineMapper.xml

@@ -36,6 +36,7 @@
          <where>
 			 a.state = '1' and project_type = #{type}
 		 </where>
+		 order by a.short_id
 	</select>
 
 	<select id="getData"  resultType="com.jeeplus.modules.sg.overheadline.entity.JkxlDetailFee">

src/main/java/com/jeeplus/modules/sg/overheadline/web/OverheadLineController.java

@@ -26,6 +26,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -552,7 +553,26 @@ public class OverheadLineController extends BaseController {
   }
 
 
-
+  public  List<JkxlDetailFee> formatDouble(List<JkxlDetailFee> list){
+    DecimalFormat decimalFormat = new DecimalFormat("0.00");
+    for(JkxlDetailFee jkxlDetailFee :list){
+      double originalTotal = Double.parseDouble(decimalFormat.format(jkxlDetailFee.getOriginalTotalCost()!=null? jkxlDetailFee.getOriginalTotalCost():0.00));
+//      double originalRg = Double.parseDouble(decimalFormat.format(jkxlDetailFee.getOriginalRgCost()));
+//      double originalFbr = Double.parseDouble(decimalFormat.format(jkxlDetailFee.getOriginalFbrCost()));
+//      double originalCbr = Double.parseDouble(decimalFormat.format(jkxlDetailFee.getOriginalCbrCost()));
+//      double originalJx = Double.parseDouble(decimalFormat.format(jkxlDetailFee.getOriginalJxCost()));
+//      double zjgcFee = Double.parseDouble(decimalFormat.format(jkxlDetailFee.getZjgcFee()));
+//      double totalFee = Double.parseDouble(decimalFormat.format(jkxlDetailFee.getTotalFee()));
+      jkxlDetailFee.setOriginalTotalCost(originalTotal);
+//      jkxlDetailFee.setOriginalRgCost(originalRg);
+//      jkxlDetailFee.setOriginalFbrCost(originalFbr);
+//      jkxlDetailFee.setOriginalCbrCost(originalCbr);
+//      jkxlDetailFee.setOriginalJxCost(originalJx);
+//      jkxlDetailFee.setZjgcFee(zjgcFee);
+//      jkxlDetailFee.setTotalFee(totalFee);
+    }
+    return list;
+  }
 
 
 

src/main/java/com/jeeplus/modules/sg/substation/service/SubstationService.java

@@ -262,7 +262,7 @@ public class SubstationService {
                  jkxlDetailFee.setId(id);
             }
             //安装部分基础数据
-            JkxlDetailFee az = SubstationInfo.getTolalInfo(jzqd,jzhz,"23000000",SubstationInfo.AZMX_BDZAZ);  //建筑合计
+            JkxlDetailFee az = SubstationInfo.getTolalInfo(azqd,azhz,"23000000",SubstationInfo.AZMX_BDZAZ);  //安装合计
             JkxlDetailFee azsc = SubstationInfo.getBashInfo(azqd,azhz,"23100000",SubstationInfo.AZMX_ZYSCGC);  //主要生产工程
             List<JkxlDetailFee> zbyq  = SubstationInfo.getBashInfos(azqd,azhz,SubstationInfo.ZBYQWBS,SubstationInfo.ZBYQSTR); //主变压器系统
             List<JkxlDetailFee> pdzzs  = SubstationInfo.getBashInfos(azqd,azhz,SubstationInfo.PDZZWBS,SubstationInfo.PDZZSTR); //配电装置

src/main/java/com/jeeplus/modules/sg/substation/util/SubstationInfo.java

@@ -709,6 +709,7 @@ public class SubstationInfo {
         total1.addAll(jg66ss);
         total1.addAll(jg35ss);
         total1.addAll(jg10ss);
+        total1.add(total);
      return total1;
 
     }