20190805提交1

src/main/java/com/jeeplus/modules/sg/overheadline/entity/Settlement.java

@@ -1,12 +1,12 @@
 package com.jeeplus.modules.sg.overheadline.entity;
 
 public class Settlement {
-    private String id;
-    private String entryName;
-    private Double money;
-    private String remarks;
-    private String status;
-    private String reason;
+    private String id;//ID
+    private String entryName;//项目或费用名称
+    private Double money;//金额
+    private String remarks;//备注
+    private String status;//数据核对 0-核对一致 1-核对不一致
+    private String reason;//数据核对不一致原因
 
     public String getId() {
         return id;

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

@@ -24,8 +24,8 @@ public class SettlementService {
     public void save(MultipartFile file,String id){
         try {
             List<Settlement> settlementList = getSettlement(file,id);
-            for (int i = 0; i < settlementList.size(); i++) {
-                settlementMapper.sava(settlementList.get(i));
+            for (Settlement settlement:settlementList){
+                settlementMapper.sava(settlement);
             }
         }catch (Exception c){
             c.printStackTrace();
@@ -60,7 +60,7 @@ public class SettlementService {
         return getTotality(builtMap,builtTotal,divisiontotal,wordtotal,otherTotal,feescount,id);
     }
     /*
-      获取工程竣工数据
+      获取《工程项目竣工结算汇总表》匹配数据
      */
     public Map<String,Object[]> getCompletionWorks(ImportExcel importExcel){
         Map<String,Object[]> map  = new LinkedHashMap<String, Object[]>();
@@ -157,7 +157,7 @@ public class SettlementService {
         return  map;
     }
     /*
-      结算汇总
+      结算汇总数据比对方法
      */
     public List<Settlement> getTotality(Map<String,Object[]> builtMap,double builtTotal,double[] divisiontotal,double wordtotal,double otherTotal,double feescount,String id){
         List<Settlement> list = new ArrayList<Settlement>();

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

@@ -371,7 +371,7 @@
         var table = layui.table;
         table.render({
             elem: '#settlement'
-
+            ,limit:Number.MAX_VALUE
             ,title: '结算汇总表'
             ,cols: [[
                 {width:50, title: '序号',type:'numbers'}
@@ -390,7 +390,7 @@
             ]]
             ,data:[
                 <c:if test="${not empty map.list3}">
-                <c:forEach items="${map.list3}" var="data" varStatus="index">
+                <c:forEach items="${map.list3}" var="data">
                 {
                     "id":"${data.id}",
                     "setname": "${data.entryName}",