1111

src/main/java/com/jeeplus/modules/sg/mapper/xml/JkxlMapper.xml

@@ -73,8 +73,7 @@
       b.rg_fee_ft      as rgFtFee,
        b.cbr_fee_ft    as cbrFtFee,
        b.fbr_fee_ft    as fbrFtFee,
-       b.jx_fee_ft   as jxFtFee,
-       b,gx_fee as gxFee
+       b.jx_fee_ft   as jxFtFee
          FROM sg_wbs_elements_data a LEFT JOIN sg_wbs_fee b on a.short_id = b.wbs_code
          <where>
          b.id = #{id}  and a.short_id = #{wbsCode}

src/main/java/com/jeeplus/modules/sg/web/JkxlController.java

@@ -527,17 +527,31 @@ public class JkxlController extends BaseController {
     for(JkxlData jkxlData : list){
       tz += jkxlData.getTotalFee();
     }
-//    double gxFee = wsbFees[2]-tz-qtFees[0]-qtFees[1]-wsbFees[0]-wsbFees[1];
-    double gxFee = wsbFees[2]-tz;
-    double rate1 = 0.00;
-    double gxFee1 = 0.00;
-    double totalF = 0.00;
-    for(JkxlData jkxlData: list){
-       rate1 = jkxlData.getTotalFee()/tz;
-       gxFee1 = gxFee*rate1;
-       totalF = gxFee1 + jkxlData.getTotalFee();
-       jkxlData.setGxFee(gxFee1);
-       jkxlData.setTotalFee(totalF);
+    if(wsbFees[2]>tz){
+      double gxFee = wsbFees[2]-tz-qtFees[0]-qtFees[1]-wsbFees[0]-wsbFees[1];
+      double rate1 = 0.00;
+      double gxFee1 = 0.00;
+      double totalF = 0.00;
+      for(JkxlData jkxlData: list){
+        rate1 = jkxlData.getTotalFee()/tz;
+        gxFee1 = gxFee*rate1;
+        totalF = gxFee1 + jkxlData.getTotalFee();
+        jkxlData.setGxFee(gxFee1);
+        jkxlData.setTotalFee(totalF);
+      }
+    }else {
+      double gxFee = tz+qtFees[0]+qtFees[1]+wsbFees[0]+wsbFees[1]-wsbFees[2];
+      double rate1 = 0.00;
+      double gxFee1 = 0.00;
+      double totalF = 0.00;
+      for(JkxlData jkxlData: list){
+        rate1 = jkxlData.getTotalFee()/tz;
+        gxFee1 = gxFee*rate1;
+        totalF = gxFee1 + jkxlData.getTotalFee();
+        jkxlData.setGxFee(gxFee1);
+        jkxlData.setTotalFee(totalF);
+      }
+
     }
     JkxlData jkxlData1 = new JkxlData();
     JkxlData jkxlData2 = new JkxlData();