1111

src/main/java/com/jeeplus/modules/sg/entity/JkxlData.java

@@ -24,6 +24,9 @@ public class JkxlData {
     private Double fees;
     private Double tex;
     private Double totalFee;
+    private Double originalRate;
+    private Double bzFee;
+    private Double jkFee;
 
     private String wbsId;
     private String projectId;
@@ -145,6 +148,14 @@ public class JkxlData {
         this.originalTotalCost = originalTotalCost;
     }
 
+    public Double getOriginalRate() {
+        return originalRate;
+    }
+
+    public void setOriginalRate(Double originalRate) {
+        this.originalRate = originalRate;
+    }
+
     public Double getOriginalRgCost() {
         return originalRgCost;
     }
@@ -272,4 +283,20 @@ public class JkxlData {
     public void setTex(Double tex) {
         this.tex = tex;
     }
+
+    public Double getBzFee() {
+        return bzFee;
+    }
+
+    public void setBzFee(Double bzFee) {
+        this.bzFee = bzFee;
+    }
+
+    public Double getJkFee() {
+        return jkFee;
+    }
+
+    public void setJkFee(Double jkFee) {
+        this.jkFee = jkFee;
+    }
 }

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

@@ -29,7 +29,10 @@
          b.other_cost as otherCost,
          b.tex as tex,
          b.fees as fees,
-         b.total_fee as totalFee
+         b.total_fee as totalFee,
+         b.original_rate as originalRate,
+         b.bz_fee as bzFee,
+         b.jk_fee as jkFee
          FROM sg_wbs_elements_data a LEFT JOIN sg_wbs_fee b on a.short_id = b.wbs_code
          and b.id = #{id}
 	</select>
@@ -56,6 +59,7 @@
 		(id,
 		 wbs_code,
 		 original_total_cost,
+		 original_rate,
 		 original_rg_cost,
 		 original_cbr_cost,
 		 original_fbr_cost,
@@ -69,11 +73,14 @@
 		 other_cost,
 		 fees,
 		 tex,
-		 total_fee
+		 total_fee,
+		 bz_fee,
+		 jk_fee
 		) values (
 		 #{id},
 		 #{wbsCode},
 		 #{originalTotalCost},
+		 #{originalRate},
 		 #{originalRgCost},
 		 #{originalCbrCost},
 		 #{originalFbrCost},
@@ -87,7 +94,9 @@
 		 #{otherCost},
 		 #{fees},
 		 #{tex},
-		 #{totalFee}
+		 #{totalFee},
+		 #{bzFee},
+		 #{jkFee}
 		)
 	</insert>
 

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

@@ -19,6 +19,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -140,6 +141,9 @@ public class JkxlController extends BaseController {
       JkxlData jkxlData = new JkxlData();
       double originalTotalCost = importExcel.getDouble(row[i],12); //原合计
       double otherRate = originalTotalCost/totalFee;   //其他费用分摊比例
+      double orRate = new BigDecimal(otherRate).setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue(); //四舍五入
+      double btc = wsbFees[0]*orRate;       //补调差额
+      double jcl = wsbFees[1]*orRate;        //减材料费
       double otherFee = qtFees[2]*otherRate;  //其他费用
       double originalRgCost = importExcel.getDouble(row[i],13); //原人工费
       double rgCost = originalRgCost/(1+rate[0]);  //后人工费
@@ -155,6 +159,7 @@ public class JkxlController extends BaseController {
       double tax = (originalTotalCost+measuresFee1+measuresFee2+fees+otherFee)*0.09; //税金
       double totalfee = originalTotalCost+measuresFee1+measuresFee2+fees+otherFee+tax-originalFbrCost; //合计
       jkxlData.setOriginalTotalCost(originalTotalCost);
+      jkxlData.setOriginalRate(orRate);
       jkxlData.setOriginalRgCost(originalRgCost);
       jkxlData.setRgCost(rgCost);
       jkxlData.setOriginalCbrCost(originalCbrCost);
@@ -169,6 +174,8 @@ public class JkxlController extends BaseController {
       jkxlData.setOtherCost(otherFee);
       jkxlData.setTex(tax);
       jkxlData.setTotalFee(totalfee);
+      jkxlData.setBzFee(btc);
+      jkxlData.setJkFee(jcl);
       jkxlData.setWbsCode(BashInfo.ids[i]);
       jkxlData.setId(id);
       list.add(jkxlData);
@@ -293,8 +300,8 @@ public class JkxlController extends BaseController {
       }
     }
     double[] wsb = new double[2];
-    bzFree = wsb[0];
-    kcFree = wsb[1];
+    wsb[0] = bzFree;
+    wsb[1] = kcFree;
     return  wsb;
 
   }