上传数据条件调整

src/main/java/com/uas/eis/task/PnsDataSyncTask.java

@@ -95,8 +95,8 @@ public class PnsDataSyncTask {
         try {
             List<PNSSendData> sendSales = baseDao
                     .getJdbcTemplate()
-                    .query(" SELECT SUBSTR(YEAR_MONTH,1,4)||'-'||SUBSTR(YEAR_MONTH,5,2) ymonth,MODEL_NO_CUST,MODEL_NO_ISP,FINAL_BUYER_CUST,FINAL_BUYER_NAME,CONFIRM_DATE,DATA_TYPE,DIVISION_NO,ROUND(SUM(QUANTITY),0) QUANTITY,CUST_ID,CUST_NAME FROM PNS_SENDDATADETAIL LEFT JOIN  PNS_SENDDATAMAIN ON PNS_SENDDATADETAIL.MM_ID=PNS_SENDDATAMAIN.MAIN_ID " +
-                            "WHERE BILLSTATUS='已审核' AND UPLOAD=0 GROUP BY YEAR_MONTH,MODEL_NO_CUST,MODEL_NO_ISP,FINAL_BUYER_CUST,FINAL_BUYER_NAME,CONFIRM_DATE,DATA_TYPE,DIVISION_NO,CUST_ID,CUST_NAME ORDER BY DATA_TYPE DESC,MODEL_NO_ISP ASC,CONFIRM_DATE ASC ", new BeanPropertyRowMapper<PNSSendData>(PNSSendData.class));
+                    .query(" SELECT SUBSTR(YEAR_MONTH,1,4)||'-'||SUBSTR(YEAR_MONTH,5,2) ymonth,MODEL_NO_CUST,MODEL_NO_ISP,(CASE WHEN FINAL_BUYER_ISP IS NOT NULL THEN FINAL_BUYER_ISP ELSE FINAL_BUYER_CUST END ) FINAL_BUYER_CUST,FINAL_BUYER_ISP,FINAL_BUYER_NAME,CONFIRM_DATE,DATA_TYPE,DIVISION_NO,ROUND(SUM(QUANTITY),0) QUANTITY,CUST_ID,CUST_NAME FROM PNS_SENDDATADETAIL LEFT JOIN  PNS_SENDDATAMAIN ON PNS_SENDDATADETAIL.MM_ID=PNS_SENDDATAMAIN.MAIN_ID " +
+                            " WHERE SENDSTATUS_='待发送' AND NVL(CONFIRM_STATUS,'已确认')='已确认' GROUP BY YEAR_MONTH,MODEL_NO_CUST,MODEL_NO_ISP,FINAL_BUYER_CUST,FINAL_BUYER_ISP,FINAL_BUYER_NAME,CONFIRM_DATE,DATA_TYPE,DIVISION_NO,CUST_ID,CUST_NAME ORDER BY DATA_TYPE DESC,CONFIRM_DATE ASC,MODEL_NO_ISP ASC", new BeanPropertyRowMapper<PNSSendData>(PNSSendData.class));
             int num = 0;
             for(PNSSendData sendSale : sendSales) {
                 num ++;