Merge remote-tracking branch 'origin/master'

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

@@ -71,20 +71,48 @@ public class OverheadLineService {
            jkxlDetailFee.setQtFee(qtFee);
            jkxlDetailFee.setAzFee(azFee);
        }
-       for(JkxlDetailFee jkxlDetailFee : list){
-           //本体费用求和
-           if(jkxlDetailFee.getOriginalTotalCost() != null){
-               btTotal += jkxlDetailFee.getTotalFee();
-               azTotal += jkxlDetailFee.getAzFee();
-               otherTotal += jkxlDetailFee.getQtFee();
+       if(type.equals("3")) {
+           double jz1 = 0.00;
+           double az1 = 0.00;
+           double jz2 = 0.00;
+           double az2 = 0.00;
+           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.getOriginalTotalCost() == null && jkxlDetailFee.getTotalFee() != null){
-               qtTotal += jkxlDetailFee.getTotalFee();
+           btTotal = jz1 + az1;
+           azTotal = jz2 + az2;
+           otherTotal = jz3 + az3;
+       } else {
+           for (JkxlDetailFee jkxlDetailFee : list) {
+               //本体费用求和
+               if (jkxlDetailFee.getOriginalTotalCost() != null) {
+                   btTotal += jkxlDetailFee.getTotalFee();
+                   azTotal += jkxlDetailFee.getAzFee();
+                   otherTotal += jkxlDetailFee.getQtFee();
+
+               }
+               //其他费用求和
+               if (jkxlDetailFee.getOriginalTotalCost() == null && jkxlDetailFee.getTotalFee() != null) {
+                   qtTotal += jkxlDetailFee.getTotalFee();
+               }
            }
        }
        for(JkxlDetailFee jkxlDetailFee : list){
-           if(jkxlDetailFee.getWbsCode().equals("30000000") || jkxlDetailFee.getWbsCode().equals("40000000")){
+           if(jkxlDetailFee.getWbsCode().equals("30000000") || jkxlDetailFee.getWbsCode().equals("40000000") ||jkxlDetailFee.getWbsCode().equals("20000000")){
                jkxlDetailFee.setTotalFee(btTotal+qtTotal);
                jkxlDetailFee.setAzFee(azTotal);
                jkxlDetailFee.setQtFee(otherTotal);

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

@@ -46,70 +46,70 @@ public class SubstationService {
    }
 
 
-   public List<JkxlDetailFee> findList(String id,String type){
-       List<JkxlDetailFee> list = overheadLineMapper.findList(id,type);
-       JkxlAdjustFee jkxlAdjustFee = new JkxlAdjustFee();
-       jkxlAdjustFee.setId(id);
-       jkxlAdjustFee.setType(SubstationInfo.CE);
-       List<JkxlAdjustFee> jkxlAdjustFees = feeAdjustService.getTzFee(jkxlAdjustFee);
-       JkxlAdjustFee jkxlAdjustFee1 = jkxlAdjustFees.get(0);
-       double cFee = jkxlAdjustFee1.getFee();
-       double btTotal = 0.00;
-       double qtTotal = 0.00;
-       double azTotal = 0.00;
-       double otherTotal = 0.00;
-       for(JkxlDetailFee jkxlDetailFee : list){
-           double measuresFee1 = jkxlDetailFee.getMeasuresFee1()!=null? jkxlDetailFee.getMeasuresFee1():0.00;
-           double measuresFee2 = jkxlDetailFee.getMeasuresFee2()!=null? jkxlDetailFee.getMeasuresFee2():0.00;
-           double measuresFee3 = jkxlDetailFee.getMeasuresFee3()!=null? jkxlDetailFee.getMeasuresFee3():0.00;
-           double Tex = jkxlDetailFee.getTex()!=null? jkxlDetailFee.getTex():0.00;
-           double otherCost = jkxlDetailFee.getOtherCost()!=null? jkxlDetailFee.getOtherCost():0.00;
-           double Fees = jkxlDetailFee.getFees()!=null? jkxlDetailFee.getFees():0.00;
-           double qtFee = measuresFee1 + measuresFee2 + measuresFee3 + otherCost + Fees + Tex;
-           double rgFee = jkxlDetailFee.getRgCost()!=null? jkxlDetailFee.getRgCost():0.00;
-           double cbrFee = jkxlDetailFee.getCbrCost()!=null? jkxlDetailFee.getCbrCost():0.00;
-           double fbrFee = jkxlDetailFee.getFbrCost()!=null? jkxlDetailFee.getFbrCost():0.00;
-           double jxFee = jkxlDetailFee.getJxCost()!=null? jkxlDetailFee.getJxCost():0.00;
-           double azFee = rgFee + cbrFee + jxFee;
-           jkxlDetailFee.setQtFee(qtFee);
-           jkxlDetailFee.setAzFee(azFee);
-       }
-       for(JkxlDetailFee jkxlDetailFee : list){
-           //本体费用求和
-           if(jkxlDetailFee.getOriginalTotalCost() != null){
-               btTotal += jkxlDetailFee.getTotalFee();
-               azTotal += jkxlDetailFee.getAzFee();
-               otherTotal += jkxlDetailFee.getQtFee();
-           }
-           //其他费用求和
-           if(jkxlDetailFee.getOriginalTotalCost() == null && jkxlDetailFee.getTotalFee() != null){
-               qtTotal += jkxlDetailFee.getTotalFee();
-           }
-       }
-       for(JkxlDetailFee jkxlDetailFee : list){
-           if(jkxlDetailFee.getWbsCode().equals("30000000") || jkxlDetailFee.getWbsCode().equals("40000000")){
-               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);
-       }
-       return list;
-
-   }
+//   public List<JkxlDetailFee> findList(String id,String type){
+//       List<JkxlDetailFee> list = overheadLineMapper.findList(id,type);
+//       JkxlAdjustFee jkxlAdjustFee = new JkxlAdjustFee();
+//       jkxlAdjustFee.setId(id);
+//       jkxlAdjustFee.setType(SubstationInfo.CE);
+//       List<JkxlAdjustFee> jkxlAdjustFees = feeAdjustService.getTzFee(jkxlAdjustFee);
+//       JkxlAdjustFee jkxlAdjustFee1 = jkxlAdjustFees.get(0);
+//       double cFee = jkxlAdjustFee1.getFee();
+//       double btTotal = 0.00;
+//       double qtTotal = 0.00;
+//       double azTotal = 0.00;
+//       double otherTotal = 0.00;
+//       for(JkxlDetailFee jkxlDetailFee : list){
+//           double measuresFee1 = jkxlDetailFee.getMeasuresFee1()!=null? jkxlDetailFee.getMeasuresFee1():0.00;
+//           double measuresFee2 = jkxlDetailFee.getMeasuresFee2()!=null? jkxlDetailFee.getMeasuresFee2():0.00;
+//           double measuresFee3 = jkxlDetailFee.getMeasuresFee3()!=null? jkxlDetailFee.getMeasuresFee3():0.00;
+//           double Tex = jkxlDetailFee.getTex()!=null? jkxlDetailFee.getTex():0.00;
+//           double otherCost = jkxlDetailFee.getOtherCost()!=null? jkxlDetailFee.getOtherCost():0.00;
+//           double Fees = jkxlDetailFee.getFees()!=null? jkxlDetailFee.getFees():0.00;
+//           double qtFee = measuresFee1 + measuresFee2 + measuresFee3 + otherCost + Fees + Tex;
+//           double rgFee = jkxlDetailFee.getRgCost()!=null? jkxlDetailFee.getRgCost():0.00;
+//           double cbrFee = jkxlDetailFee.getCbrCost()!=null? jkxlDetailFee.getCbrCost():0.00;
+//           double fbrFee = jkxlDetailFee.getFbrCost()!=null? jkxlDetailFee.getFbrCost():0.00;
+//           double jxFee = jkxlDetailFee.getJxCost()!=null? jkxlDetailFee.getJxCost():0.00;
+//           double azFee = rgFee + cbrFee + jxFee;
+//           jkxlDetailFee.setQtFee(qtFee);
+//           jkxlDetailFee.setAzFee(azFee);
+//       }
+//       for(JkxlDetailFee jkxlDetailFee : list){
+//           //本体费用求和
+//           if(jkxlDetailFee.getOriginalTotalCost() != null){
+//               btTotal += jkxlDetailFee.getTotalFee();
+//               azTotal += jkxlDetailFee.getAzFee();
+//               otherTotal += jkxlDetailFee.getQtFee();
+//           }
+//           //其他费用求和
+//           if(jkxlDetailFee.getOriginalTotalCost() == null && jkxlDetailFee.getTotalFee() != null){
+//               qtTotal += jkxlDetailFee.getTotalFee();
+//           }
+//       }
+//       for(JkxlDetailFee jkxlDetailFee : list){
+//           if(jkxlDetailFee.getWbsCode().equals("30000000") || jkxlDetailFee.getWbsCode().equals("40000000")){
+//               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);
+//       }
+//       return list;
+//
+//   }
 
    public JkxlDetailFee getDate(String id, String wbsCode){
        return overheadLineMapper.getData(id,wbsCode);