1、采购修改报错信息

com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSummaryServiceImpl.java

@@ -339,7 +339,7 @@ public class PurchaseDataSummaryServiceImpl implements DataSummaryService {
                     " c.Year AS year, " +
                     " c.Month AS month, " +
                     " c.WLMC AS WLMC, " +
-                    " c.SLGC AS SLGC,, " +
+                    " c.SLGC AS SLGC, " +
                     " c.tstotalAmount AS tstotalAmount, " +
                     " c.totalQuantity AS totalQuantity, " +
                     " tstotalAmount/totalQuantity AS PJDJ " +

com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSyncServiceImpl.java

@@ -908,7 +908,8 @@ public class PurchaseDataSyncServiceImpl implements DataSyncService {
                             double djhyfDou = djhyf1!=null?djhyf1:0.0;
                             if (yfdjhs1!=0.0){
                                 safeHsdjhyf+=yfdjhs1;
-                            }else if (yfdjws1 != 0.0){
+                            }
+                            if (yfdjws1 != 0.0){
                                 djhyfDou+=yfdjws1;
                             }
                             BigDecimal multiply = BigDecimal.valueOf(safeRksl).multiply(BigDecimal.valueOf(safeHsdjhyf));

com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.java

@@ -894,25 +894,23 @@ public class SaleDataSyncServiceImpl implements DataSyncService {
         try {
             do {
                 // 构建查询每月最大日期的SQL
-                String maxDateSubQuery = "SELECT MAX(DATE(" + targetTimeField + ")) as max_date " +
+                String maxDateSubQuery = "SELECT MAX(DATE(" + targetTimeField + ")) as max_date, " +
-                        "FROM " + targetTable +
+                        "DATE_FORMAT(" + targetTimeField + ", '%Y-%m') as month " +
-                        " WHERE DATE_FORMAT(" + targetTimeField + ", '%Y-%m') = " +
+                        "FROM " + targetTable;
-                        "DATE_FORMAT(t." + targetTimeField + ", '%Y-%m')";
+                // 根据是否传入时间范围添加条件
-                if (startDated == null || endDated == null) {
+                if (startDated != null && endDated != null) {
-                    pageSql = "SELECT t.* FROM " + targetTable + " t " +
-                            "WHERE DATE(t." + targetTimeField + ") = (" + maxDateSubQuery + ") " +
-                            "ORDER BY t.ID LIMIT " + PAGE_SIZE + " OFFSET " + (pageNo - 1) * PAGE_SIZE;
-                    pageData = DBSql.getMaps(pageSql);
-                } else {
                     startDate = simpleDateFormat.format(startDated);
                     endDate = simpleDateFormat.format(endDated);
-                    pageSql = "SELECT t.* FROM " + targetTable + " t " +
+                    maxDateSubQuery += " WHERE " + targetTimeField + " BETWEEN '" + startDate + "' AND '" + endDate + "'";
-                            "WHERE t." + targetTimeField + " BETWEEN '" + startDate + "' AND '" + endDate + "' " +
-                            "AND DATE(t." + targetTimeField + ") = (" + maxDateSubQuery + ") " +
-                            "ORDER BY t.ID LIMIT " + PAGE_SIZE + " OFFSET " + (pageNo - 1) * PAGE_SIZE;
-                    LOGGER.info("执行查询的sql：{}", pageSql);
-                    pageData = DBSql.getMaps(pageSql);
                 }
+                maxDateSubQuery += " GROUP BY DATE_FORMAT(" + targetTimeField + ", '%Y-%m')";
+                // 主查询：通过连接查询获取每月最大日期的全部数据
+                pageSql = "SELECT t.* FROM " + targetTable + " t " +
+                        "INNER JOIN (" + maxDateSubQuery + ") tmp " +
+                        "ON DATE(t." + targetTimeField + ") = tmp.max_date " +
+                        "ORDER BY t.ID LIMIT " + PAGE_SIZE + " OFFSET " + (pageNo - 1) * PAGE_SIZE;
+
+                pageData = DBSql.getMaps(pageSql);
 
                 if (pageData.isEmpty()) break;
 
@@ -1005,7 +1003,7 @@ public class SaleDataSyncServiceImpl implements DataSyncService {
             LocalDate now = LocalDate.now();
             int dayOfMonth = now.getDayOfMonth();
 
-            if (dayOfMonth == 1) {
+//            if (dayOfMonth == 1) {
                 try {
                     LOGGER.info("开始执行每月1号的特殊数据处理任务");
 
@@ -1049,7 +1047,7 @@ public class SaleDataSyncServiceImpl implements DataSyncService {
                 } catch (Exception e) {
                     LOGGER.error("每月1号任务执行失败: {}", e.getMessage(), e);
                 }
-            }
+//            }
         }catch (Exception e){
             LOGGER.error("汇总数据失败 [汇总表={}, 第几页={}]: {}",
                     hzb, PAGE_SIZE, e.getMessage(), e);