1.重寫分攤邏輯保證分攤金額和無差額

2.修改導出成果文件代碼，修正變電站類型因無第七層節點而導致導出錯誤
3.修改查找子節點方法的報錯內容

src/main/java/com/jeeplus/modules/sg/overheadline/service/OverheadLineService.java

@@ -758,13 +758,15 @@ public class OverheadLineService {
         double wsbfee = 0.00;
         if(wsbFees != null && wsbFees.size()>0){
             for(JkxlAdjustFee jkxlAdjustFee : wsbFees){
-                jkxlAdjustFee.setId(id);
-                feeAdjustService.save(jkxlAdjustFee);
+                //                取未识别费用合计,这里要处理一种情况，就是有些金额是应该减掉的，但是在结算书里是正数
                 double fee = jkxlAdjustFee.getFee();
-                if(jkxlAdjustFee.getType().contains("减") || jkxlAdjustFee.getType().contains("扣") || jkxlAdjustFee.getType().contains("下浮")){
+                if(fee>0&&(jkxlAdjustFee.getType().contains("减") || jkxlAdjustFee.getType().contains("扣") || jkxlAdjustFee.getType().contains("下浮"))){
                     fee = fee* -1;
                 }
                 wsbfee = DoubleUtil.add(wsbfee,fee);
+                jkxlAdjustFee.setId(id);
+                jkxlAdjustFee.setFee(Math.abs(fee));
+                feeAdjustService.save(jkxlAdjustFee);
             }
         }
         //计算差额

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

@@ -234,13 +234,15 @@ public class SubstationService {
         double wsbfee = 0.00;
         if(wsbFees != null && wsbFees.size()>0){
             for(JkxlAdjustFee jkxlAdjustFee : wsbFees){
-                jkxlAdjustFee.setId(id);
-                feeAdjustService.save(jkxlAdjustFee);
+                //                取未识别费用合计,这里要处理一种情况，就是有些金额是应该减掉的，但是在结算书里是正数
                 double fee = jkxlAdjustFee.getFee();
-                if(jkxlAdjustFee.getType().contains("减") || jkxlAdjustFee.getType().contains("扣") || jkxlAdjustFee.getType().contains("下浮")){
+                if(fee>0&&(jkxlAdjustFee.getType().contains("减") || jkxlAdjustFee.getType().contains("扣") || jkxlAdjustFee.getType().contains("下浮"))){
                     fee = fee* -1;
                 }
                 wsbfee = DoubleUtil.add(wsbfee,fee);
+                jkxlAdjustFee.setId(id);
+                jkxlAdjustFee.setFee(Math.abs(fee));
+                feeAdjustService.save(jkxlAdjustFee);
             }
         }
         double gxFee = Math.abs(DoubleUtil.add(gcjsFee,-tz,-qtFees[0],-qtFees[1],-wsbfee));