1111

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

@@ -395,8 +395,9 @@ public class JkxlController extends BaseController {
     List<JkxlData> list1 = new ArrayList<>();
     list1.add(jkxlData);
     List<JkxlData> list = jkxlService.getList(id);
-    JkxlData jkxlData1 = getTotal(list);
-    list.add(jkxlData1);
+//    JkxlData jkxlData1 = getTotal(list);
+//    list.add(jkxlData1);
+    list.addAll(getTotal(list));
     List<TzData> list2 = jkxlService.getTzFee(tzData);
     HashMap map = new HashMap();
     map.put("list1",list1);
@@ -496,8 +497,8 @@ public class JkxlController extends BaseController {
 //      double measuresFee1 = (rgCost+cbrCost+fbrCost+jxCost)*csRate[0]; //措施费1
       double measuresFee2 = rgCost*csRate[1];   //措施费2
       double fees = rgCost*gfRate[1]*1.12+rgCost*gfRate[0];  //规费
-      double tax = (originalTotalCost+measuresFee1+measuresFee2+fees+otherFee)*0.09; //税金
-      double totalfee = originalTotalCost+measuresFee1+measuresFee2+fees+otherFee+tax-fbrCost; //合计
+      double tax = (originalTotalCost+measuresFee1+measuresFee2+fees+otherFee-originalFbrCost)*0.09; //税金
+      double totalfee = originalTotalCost+measuresFee1+measuresFee2+fees+otherFee+tax-originalFbrCost; //合计
       jkxlData.setOriginalTotalCost(originalTotalCost);
       jkxlData.setOriginalRate(orRate);
       jkxlData.setOriginalRgCost(originalRgCost);
@@ -707,13 +708,23 @@ public class JkxlController extends BaseController {
      return newDate+result;
  }
 
-  private JkxlData getTotal(List<JkxlData> list) {
+  private List<JkxlData> getTotal(List<JkxlData> list) {
     List<JkxlData> list1 = new ArrayList<>();
+    List<JkxlData> list2  = new ArrayList<>();
     for(JkxlData jkxlData: list){
       if(jkxlData.getOriginalTotalCost() != null){
         list1.add(jkxlData);
       }
     }
+    for(JkxlData jkxlData: list){
+      if(jkxlData.getOriginalTotalCost() == null && jkxlData.getTotalFee() != null){
+        list2.add(jkxlData);
+      }
+    }
+    double total1 = 0.00;
+    for (JkxlData jkxlData :list2){
+      total1 += jkxlData.getTotalFee();
+    }
     double [] zFee = new double[21];
     for(JkxlData jkxlData:list1){
       zFee[0] += jkxlData.getOriginalTotalCost();
@@ -739,31 +750,39 @@ public class JkxlController extends BaseController {
       zFee[20] += jkxlData.getTotalFee();
     }
     JkxlData jkxlData = new JkxlData();
-    jkxlData.setOriginalTotalCost(zFee[0]);
-    jkxlData.setZjgcFee(zFee[1]);
-    jkxlData.setOriginalRgCost(zFee[2]);
-    jkxlData.setOriginalCbrCost(zFee[3]);
-    jkxlData.setOriginalFbrCost(zFee[4]);
-    jkxlData.setOriginalJxCost(zFee[5]);
-    jkxlData.setRgCost(zFee[6]);
-    jkxlData.setCbrCost(zFee[7]);
-    jkxlData.setFbrCost(zFee[8]);
-    jkxlData.setJxCost(zFee[9]);
-    jkxlData.setRgFtFee(zFee[10]);
-    jkxlData.setCbrFtFee(zFee[11]);
-    jkxlData.setFbrFtFee(zFee[12]);
-    jkxlData.setJxFtFee(zFee[13]);
-    jkxlData.setMeasuresFee1(zFee[14]);
-    jkxlData.setMeasuresFee2(zFee[15]);
-    jkxlData.setMeasuresFee3(zFee[16]);
-    jkxlData.setOtherCost(zFee[17]);
-    jkxlData.setFees(zFee[18]);
-    jkxlData.setTex(zFee[19]);
-    jkxlData.setTotalFee(zFee[20]);
+    JkxlData jkxlData1 = new JkxlData();
+    jkxlData.setOriginalTotalCost(new BigDecimal(zFee[0]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlData.setZjgcFee(new BigDecimal(zFee[1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlData.setOriginalRgCost(new BigDecimal(zFee[2]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlData.setOriginalCbrCost(new BigDecimal(zFee[3]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlData.setOriginalFbrCost(new BigDecimal(zFee[4]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlData.setOriginalJxCost(new BigDecimal(zFee[5]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlData.setRgCost(new BigDecimal(zFee[6]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlData.setCbrCost(new BigDecimal(zFee[7]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlData.setFbrCost(new BigDecimal(zFee[8]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlData.setJxCost(new BigDecimal(zFee[9]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlData.setRgFtFee(new BigDecimal(zFee[10]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlData.setCbrFtFee(new BigDecimal(zFee[11]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlData.setFbrFtFee(new BigDecimal(zFee[12]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlData.setJxFtFee(new BigDecimal(zFee[13]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlData.setMeasuresFee1(new BigDecimal(zFee[14]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlData.setMeasuresFee2(new BigDecimal(zFee[15]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlData.setMeasuresFee3(new BigDecimal(zFee[16]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlData.setOtherCost(new BigDecimal(zFee[17]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlData.setFees(new BigDecimal(zFee[18]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlData.setTex(new BigDecimal(zFee[19]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlData.setTotalFee(new BigDecimal(zFee[20]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
     jkxlData.setWbsCode("合计");
     jkxlData.setParentNode("30000000");
     jkxlData.setState("1");
-     return jkxlData;
+    jkxlData1.setWbsCode("合计");
+    jkxlData1.setParentNode("34000000");
+    jkxlData1.setState("0");
+    jkxlData1.setTotalFee(total1);
+    List<JkxlData> list3 = new ArrayList<>();
+    list3.add(jkxlData);
+    list3.add(jkxlData1);
+     return list3;
 
 
 

src/main/resources/j2cache/j2cache.properties

@@ -88,8 +88,8 @@ redis.cluster_name = j2cache
 redis.namespace = 
 
 ## connection
-redis.hosts = 192.168.2.4:6379
-#redis.hosts = 127.0.0.1:6379
+#redis.hosts = 192.168.2.4:6379
+redis.hosts = 127.0.0.1:6379
 redis.timeout = 2000
 redis.password =
 redis.database = 0

src/main/resources/properties/jeeplus.properties

@@ -14,8 +14,8 @@
 #mysql database setting
 jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
-#jdbc.url=jdbc:mysql://localhost:3306/guowang?useUnicode=true&characterEncoding=utf-8
-jdbc.url=jdbc:mysql://192.168.2.4:3306/guowang?useUnicode=true&characterEncoding=utf-8
+jdbc.url=jdbc:mysql://localhost:3306/guowang?useUnicode=true&characterEncoding=utf-8
+#jdbc.url=jdbc:mysql://192.168.2.4:3306/guowang?useUnicode=true&characterEncoding=utf-8
 jdbc.username=root
 jdbc.password=root
 jdbc.testSql=SELECT 'x'

src/main/webapp/webpage/modules/sg/free/avgpage.jsp

@@ -16,6 +16,7 @@
     <script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
     <style>
         .layui-table-view .layui-table {width:100%}
+        .layui-input-block{margin-left: 20px;}
     </style>
 </head>
 <body>
@@ -27,7 +28,7 @@
 
     </div>
     <div class="layui-form-item">
-        <div class="" style="margin-left: 30px;margin-top: 10px;">
+        <div class="" style="margin-left: 20px;margin-top: 10px;">
             <span id="mylable">项目调整</span>
             <span>:</span>
             <span id="readid2"></span>

src/main/webapp/webpage/modules/sg/free/wbslist.jsp

@@ -25,6 +25,12 @@
         width: 50%;
         margin-left: 10px;
     }
+    .layui-icon-layer{
+        display: none;
+    }
+    .layui-icon-file{
+        display: none;
+    }
 
      .layui-table-view .layui-table {width:100%}
 </style>