TradingDataController-调整

src/main/java/com/uas/platform/b2b/openapi/service/impl/TradingDataServiceImpl.java

@@ -61,7 +61,7 @@ public class TradingDataServiceImpl implements TradingDataService {
         ModelMap map = new ModelMap();
         List<CustTrading> datas = getCust(enUU);
         Double sum = getAcceptSum(enUU, null) - getReturnSum(enUU, null);
-        Integer sumNum = getAcceptNum(enUU, null);
+        Integer sumNum = getAcceptNum(enUU, null) - getReturnNum(enUU, null);
         if (CollectionUtils.isNotEmpty(datas)) {
             for (CustTrading custTrading : datas) {
                 Double acceptSum = getAcceptSum(enUU, custTrading.getCustUU());
@@ -161,8 +161,8 @@ public class TradingDataServiceImpl implements TradingDataService {
         ofYear9.setOneYearNum(NumFormat.getIncrease(ofYear9.getTwoYear(), ofYear9.getOneYear()));
         ofYear9.setThisYearNum(NumFormat.getIncrease(ofYear9.getOneYear(), ofYear9.getThisYear()));
         years.add(ofYear9);
-        // 开票金数
-        RecentOfYear ofYear10 = new RecentOfYear("开票金数");
+        // 开票金额
+        RecentOfYear ofYear10 = new RecentOfYear("开票金额");
         ofYear10.setTwoYear(getApBillSumTime(enUU, NumFormat.getTwoYear(), NumFormat.getOneYear()));
         ofYear10.setOneYear(getApBillSumTime(enUU, NumFormat.getOneYear(), NumFormat.getThisYear()));
         ofYear10.setThisYear(getApBillSumTime(enUU, NumFormat.getThisYear(), NumFormat.getNow()));
@@ -428,8 +428,10 @@ public class TradingDataServiceImpl implements TradingDataService {
      * @return 验收笔数
      */
     private Integer getAcceptNum(Long enUU, Long custUU) {
-        StringBuffer sql = new StringBuffer("SELECT COUNT(1) FROM purc$accept WHERE pa_venduu= " + enUU
-                + " AND pa_enuu=" + custUU);
+        StringBuffer sql = new StringBuffer("SELECT COUNT(1) FROM purc$accept WHERE pa_venduu= " + enUU);
+        if (!StringUtils.isEmpty(custUU)) {
+            sql.append(" AND pa_enuu=" + custUU);
+        }
         Integer result = commonDao.queryForObject(sql.toString(), Integer.class);
         return result;
     }
@@ -441,8 +443,10 @@ public class TradingDataServiceImpl implements TradingDataService {
      * @return 验退金额
      */
     private Integer getReturnNum(Long enUU, Long custUU) {
-        StringBuffer sql = new StringBuffer("SELECT COUNT(1) FROM purc$return  WHERE pr_venduu= " + enUU
-                + " and  pr_enuu= " + custUU);
+        StringBuffer sql = new StringBuffer("SELECT COUNT(1) FROM purc$return  WHERE pr_venduu= " + enUU);
+        if (!StringUtils.isEmpty(custUU)) {
+            sql.append(" and pr_enuu= " + custUU);
+        }
         Integer result = commonDao.queryForObject(sql.toString(), Integer.class);
         return result;
     }
@@ -565,7 +569,7 @@ public class TradingDataServiceImpl implements TradingDataService {
         StringBuffer sql = new StringBuffer("SELECT sum(case currency when 'RMB' then a.amount when 'USD' "
                 + "then a.amount * " + ErpRate.USD_RATE + " when 'HKD' then a.amount * " + ErpRate.HKD_RATE + " end) result "
                 + "FROM (SELECT SUM(pab_paymount) amount,pab_currency currency FROM purc$apbill WHERE pad_venduu=" + enUU
-                + " and pab_date >= " + startTime + " and pab_date < " + endTime + " GROUP BY pab_currency) a");
+                + " and pab_date >= '" + startTime + "' and pab_date < '" + endTime + "' GROUP BY pab_currency) a");
         Double result = commonDao.queryForObject(sql.toString(), Double.class);
         return NumFormat.getTwo(result);
     }