1111

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

@@ -68,26 +68,16 @@ public class OverheadLineService {
            double fbrFee = jkxlDetailFee.getFbrCost()!=null? jkxlDetailFee.getFbrCost():0.00;
            double jxFee = jkxlDetailFee.getJxCost()!=null? jkxlDetailFee.getJxCost():0.00;
            double azFee = rgFee + cbrFee + jxFee;
-
            if(jkxlDetailFee.getWbsCode().substring(0,2).equals("21") || jkxlDetailFee.getWbsCode().substring(0,3).equals("491")){
                jkxlDetailFee.setJzFee(azFee);
                jkxlDetailFee.setSbgzFee(qtFee);
-           } else {
+           } else if(jkxlDetailFee.getWbsCode().substring(0,2).equals("23") || jkxlDetailFee.getWbsCode().substring(0,3).equals("493")){
                jkxlDetailFee.setQtFee(qtFee);
                jkxlDetailFee.setAzFee(azFee);
            }
        }
+       //变电站导出
        if(type.equals("3")) {
-//           List<JkxlDetailFee> jzlist = new ArrayList<>();
-//           List<JkxlDetailFee> azlist = new ArrayList<>();
-//           for(JkxlDetailFee jkxlDetailFee : list){
-//               if(jkxlDetailFee.getWbsCode().substring(0,2).equals("21")){
-//                  jzlist.add(jkxlDetailFee);
-//               }
-//               if(jkxlDetailFee.getWbsCode().substring(0,2).equals("23")){
-//                   azlist.add(jkxlDetailFee);
-//               }
-//           }
            double jz1 = 0.00;
            double az1 = 0.00;
            double jz2 = 0.00;
@@ -95,24 +85,41 @@ public class OverheadLineService {
            double jz3 = 0.00;
            double az3 = 0.00;
            for (JkxlDetailFee jkxlDetailFee : list) {
-//               if (jkxlDetailFee.getWbsCode().equals("21000000")) {
-//                   jz1 = jkxlDetailFee.getTotalFee();
-//                   jz2 = jkxlDetailFee.getAzFee();
-//                   jz3 = jkxlDetailFee.getQtFee();
-//               }
-//               if (jkxlDetailFee.getWbsCode().equals("23000000")) {
-//                   az1 = jkxlDetailFee.getTotalFee();
-//                   az2 = jkxlDetailFee.getAzFee();
-//                   az3 = jkxlDetailFee.getQtFee();
-//               }
-//               if (jkxlDetailFee.getOriginalTotalCost() == null && jkxlDetailFee.getTotalFee() != null) {
-//                   qtTotal += jkxlDetailFee.getTotalFee();
-//               }
+               if (jkxlDetailFee.getWbsCode().equals("21000000")) {
+                   jz1 = jkxlDetailFee.getTotalFee();
+                   jz2 = jkxlDetailFee.getJzFee();
+                   jz3 = jkxlDetailFee.getSbgzFee();
+               }
+               if (jkxlDetailFee.getWbsCode().equals("23000000")) {
+                   az1 = jkxlDetailFee.getTotalFee();
+                   az2 = jkxlDetailFee.getAzFee();
+                   az3 = jkxlDetailFee.getQtFee();
+               }
+               if (jkxlDetailFee.getOriginalTotalCost() == null && jkxlDetailFee.getTotalFee() != null) {
+                   qtTotal += jkxlDetailFee.getTotalFee();
+               }
            }
-           btTotal = jz1 + az1;
-           azTotal = jz2 + az2;
-           otherTotal = jz3 + az3;
-       } else {
+           for (JkxlDetailFee jkxlDetailFee : list) {
+               if(jkxlDetailFee.getWbsCode().equals("20000000")){
+                   jkxlDetailFee.setJzFee(jz2);
+                   jkxlDetailFee.setAzFee(az2);
+                   jkxlDetailFee.setSbgzFee(jz3);
+                   jkxlDetailFee.setQtFee(az3);
+                   jkxlDetailFee.setTotalFee(jz1+az1);
+                   jkxlDetailFee.setcFee(cFee);
+                   jkxlDetailFee.setJsFee(jz1+az1+cFee);
+               }
+               if(jkxlDetailFee.getWbsCode().equals("24000000")){
+                   jkxlDetailFee.setTotalFee(qtTotal);
+               }
+           }
+       }
+       if(type.equals("2")){
+           for (JkxlDetailFee jkxlDetailFee : list) {
+
+           }
+       }
+       else {
            for (JkxlDetailFee jkxlDetailFee : list) {
                //本体费用求和
                if (jkxlDetailFee.getOriginalTotalCost() != null) {
@@ -127,24 +134,24 @@ public class OverheadLineService {
                }
            }
        }
-       for(JkxlDetailFee jkxlDetailFee : list){
-           if(jkxlDetailFee.getWbsCode().equals("30000000") || jkxlDetailFee.getWbsCode().equals("40000000") ||jkxlDetailFee.getWbsCode().equals("20000000")){
-               jkxlDetailFee.setTotalFee(btTotal+qtTotal);
-               jkxlDetailFee.setAzFee(azTotal);
-               jkxlDetailFee.setQtFee(otherTotal);
-               jkxlDetailFee.setcFee(cFee);
-               jkxlDetailFee.setJsFee(btTotal+qtTotal+cFee);
-           }
-           if(jkxlDetailFee.getWbsCode().equals("39000000") || jkxlDetailFee.getWbsCode().equals("49000000")){
-               jkxlDetailFee.setTotalFee(btTotal);
-               jkxlDetailFee.setAzFee(azTotal);
-               jkxlDetailFee.setQtFee(otherTotal);
-           }
-           if(jkxlDetailFee.getWbsCode().equals("44000000") ||jkxlDetailFee.getWbsCode().equals("34000000")){
-               jkxlDetailFee.setTotalFee(qtTotal);
-
-           }
-       }
+//       for(JkxlDetailFee jkxlDetailFee : list){
+//           if(jkxlDetailFee.getWbsCode().equals("30000000") || jkxlDetailFee.getWbsCode().equals("40000000") ||jkxlDetailFee.getWbsCode().equals("20000000")){
+//               jkxlDetailFee.setTotalFee(btTotal+qtTotal);
+//               jkxlDetailFee.setAzFee(azTotal);
+//               jkxlDetailFee.setQtFee(otherTotal);
+//               jkxlDetailFee.setcFee(cFee);
+//               jkxlDetailFee.setJsFee(btTotal+qtTotal+cFee);
+//           }
+//           if(jkxlDetailFee.getWbsCode().equals("39000000") || jkxlDetailFee.getWbsCode().equals("49000000")){
+//               jkxlDetailFee.setTotalFee(btTotal);
+//               jkxlDetailFee.setAzFee(azTotal);
+//               jkxlDetailFee.setQtFee(otherTotal);
+//           }
+//           if(jkxlDetailFee.getWbsCode().equals("44000000") ||jkxlDetailFee.getWbsCode().equals("34000000")){
+//               jkxlDetailFee.setTotalFee(qtTotal);
+//
+//           }
+//       }
        for (int i=0;i<list.size();i++){
            list.get(i).setIndex(i+1);
        }