20131112

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/service/ErpCreditService.java

@@ -288,6 +288,14 @@ public class ErpCreditService extends CrudService<ErpCreditMapper,ErpCredit> {
                     erpJudges.add(erpJudge);
                 }
             }
+        }else {
+            for (ErpCredit erpCredit1:erpCredits){
+                erpJudge = new ErpJudge();
+                erpJudge.setItemId(erpCredit1.getItemId());
+                erpJudge.setMainFlag("无");
+                erpJudge.setInfoFlag("是");
+                erpJudges.add(erpJudge);
+            }
         }
         return erpJudges;
     }

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/util/ExportUtilCalculate.java

@@ -94,7 +94,7 @@ public class ExportUtilCalculate {
                 actualOtherFeeAll+=Double.parseDouble(s.getActualOtherFee());
                 scheduletotal.setActualOtherFee(decimalFormat.format(actualOtherFeeAll));
             }
-            if (null!=s.getActualTotalFee()){
+            if (null!=s.getActualTotalFee()&&!"∞".equals(s.getActualTotalFee())){
                 actualTotalFeeAll+=Double.parseDouble(s.getActualTotalFee());
                 scheduletotal.setActualTotalFee(decimalFormat.format(actualTotalFeeAll));
             }
@@ -102,7 +102,7 @@ public class ExportUtilCalculate {
                 addSubtractionLinesAll+=Double.parseDouble(s.getAddSubtractionLines());
                 scheduletotal.setAddSubtractionLines(decimalFormat.format(addSubtractionLinesAll));
             }
-            if (null!=s.getAddSubtractionRate()){
+            if (null!=s.getAddSubtractionRate()&&!"∞".equals(s.getActualTotalFee())){
                 addSubtractionRateAll+=Double.parseDouble(s.getAddSubtractionRate());
                 scheduletotal.setAddSubtractionRate(decimalFormat.format(addSubtractionRateAll));
             }