2019_09_12 11:31

src/main/java/com/jeeplus/modules/sg/overheadline/util/SettementUtil.java

@@ -132,6 +132,7 @@ public class SettementUtil {
         List<Settlement> settlementList = new ArrayList<Settlement>();
         int lastDataRowNum =  importExcel.getLastDataRowNum();
         String key = "";//获取结算名称
+        Integer count = 0; //计数器
         for (int i = 0; i < lastDataRowNum; i++) {
             settlement=new Settlement();
             key =  importExcel.getValue(i+1,1);
@@ -171,7 +172,19 @@ public class SettementUtil {
                     settlementList.add(getSettlement(settlement,key,importExcel,i));
                     break;
                 case BashInfo.JS_SJ:
-                    settlementList.add(getSettlement(settlement,key,importExcel,i));
+                    count+=1;
+                    if (count>1){
+                        for (Settlement st:settlementList){
+                            if (st.getEntryName().equals(BashInfo.JS_SJ)){
+                                double s = importExcel.getDouble(i+1,2);
+                                double total = st.getMoney()+s;
+                                st.setMoney(total);
+                            }
+                        }
+                    }
+                    if (count==1){
+                        settlementList.add(getSettlement(settlement,key,importExcel,i));
+                    }
                     break;
                 case BashInfo.JS_FBRF:
                     if (flag){