From 86c80ef5c95365c1f0d05e2041c483538af2f197 Mon Sep 17 00:00:00 2001 From: mzr <1562242162@qq.com> Date: Fri, 1 Nov 2024 18:13:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=BA=93=E5=AD=98=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E6=98=8E=E7=BB=86=E4=BC=98=E5=8C=96sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper_oracle/stock/ClientStockReportMapper.xml | 8 ++++---- .../com/yb/lb/webapp/stock/entity/ClientStockReport.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crm-common/src/main/resources/mapper/mapper_oracle/stock/ClientStockReportMapper.xml b/crm-common/src/main/resources/mapper/mapper_oracle/stock/ClientStockReportMapper.xml index b503e99..84a0772 100644 --- a/crm-common/src/main/resources/mapper/mapper_oracle/stock/ClientStockReportMapper.xml +++ b/crm-common/src/main/resources/mapper/mapper_oracle/stock/ClientStockReportMapper.xml @@ -223,10 +223,10 @@ nvl(t1.count_num, 0) AS "countNum", nvl(t1.prod_date,'') AS "prodDate" FROM ( - SELECT - TO_CHAR(TO_DATE(#{startDate}, 'yyyy-MM-dd') + ROWNUM - 1, 'yyyy-MM-dd') AS bill_date - FROM DUAL - CONNECT BY ROWNUM <= trunc(to_date( #{endDate}, 'yyyy-MM-dd') - to_date(#{startDate}, 'yyyy-MM-dd')) + 1 + SELECT a.bill_date FROM crm_inventory_detail a + WHERE confirm_status = '1' AND a.client_id = #{clientId} AND a.company_id = #{companyId} + + GROUP BY a.bill_date ) t0 LEFT JOIN ( SELECT a.bill_date, wm_concat(a.bill_no) bill_no, sum(a.count_num) count_num, max(a.prod_date) prod_date diff --git a/crm-webapp/src/main/java/com/yb/lb/webapp/stock/entity/ClientStockReport.java b/crm-webapp/src/main/java/com/yb/lb/webapp/stock/entity/ClientStockReport.java index 00612b5..fe0a44b 100644 --- a/crm-webapp/src/main/java/com/yb/lb/webapp/stock/entity/ClientStockReport.java +++ b/crm-webapp/src/main/java/com/yb/lb/webapp/stock/entity/ClientStockReport.java @@ -21,7 +21,7 @@ public class ClientStockReport implements java.io.Serializable { /** 客户编码-u8 */ @ApiModelProperty(value = "客户编码-u8") - @Excel(name = "客户编码", width = 15, orderNum = "2") + @Excel(name = "U8客户编码", width = 15, orderNum = "2") private String uecode; /** 客户名称 */