From b2782c95425ea4c13f9d2da275b643b291d13b88 Mon Sep 17 00:00:00 2001
From: king <hfjinsong@163.com>
Date: Tue, 21 Apr 2026 13:02:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1-=E6=95=88?=
 =?UTF-8?q?=E6=9C=9F=E5=89=A9=E4=BD=99=E6=97=B6=E9=97=B4=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E8=A1=A8=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../framework/config/job/GenerateCustomerJob.java    | 10 +++++-----
 .../core/framework/config/job/GenerateOrderJob.java  | 10 +++++-----
 .../framework/entity/GrBiPubInvaliddaystype.java     |  4 ++--
 .../framework/GrBiPubInvaliddaystypeMapper.xml       | 12 ++++++------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateCustomerJob.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateCustomerJob.java
index ef33848..df35cd5 100644
--- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateCustomerJob.java
+++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateCustomerJob.java
@@ -11,8 +11,8 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 
 /**
- * 供应商表
- * oracle gr_bi_pub_supply -> mysql gr_bi_pub_supply
+ * 客户销售情况表
+ * oracle gr_bi_sa_customer -> mysql gr_bi_sa_customer
  */
 @Slf4j
 @Component("generateCustomerJob")
@@ -24,9 +24,9 @@ public class GenerateCustomerJob implements JobHandler {
     @Override
     @TenantIgnore
     public String execute(String param) throws Exception {
-        log.info("*********** 开始生成供应商表 ************");
+        log.info("*********** 开始生成客户销售情况表 ************");
         iGrBiSaCustomerService.generateCustomer(lideeYunJiBaseConstant.DS_ERP_BI_DATA);
-        log.info("*********** 生成供应商表完成 ************");
-        return "*********** 生成供应商表完成 ************";
+        log.info("*********** 生成客户销售情况表完成 ************");
+        return "*********** 生成客户销售情况表完成 ************";
     }
 }
diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateOrderJob.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateOrderJob.java
index 1a7a75d..2d2749d 100644
--- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateOrderJob.java
+++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateOrderJob.java
@@ -11,8 +11,8 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 
 /**
- * 供应商表
- * oracle gr_bi_pub_supply -> mysql gr_bi_pub_supply
+ * 销售订单明细表
+ * oracle gr_bi_sa_order -> mysql gr_bi_sa_order
  */
 @Slf4j
 @Component("generateOrderJob")
@@ -24,9 +24,9 @@ public class GenerateOrderJob implements JobHandler {
     @Override
     @TenantIgnore
     public String execute(String param) throws Exception {
-        log.info("*********** 开始生成供应商表 ************");
+        log.info("*********** 开始生成销售订单明细表 ************");
         iGrBiSaOrderService.generateOrder(lideeYunJiBaseConstant.DS_ERP_BI_DATA);
-        log.info("*********** 生成供应商表完成 ************");
-        return "*********** 生成供应商表完成 ************";
+        log.info("*********** 生成销售订单明细表完成 ************");
+        return "*********** 生成销售订单明细表完成 ************";
     }
 }
diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiPubInvaliddaystype.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiPubInvaliddaystype.java
index 1bf1a36..230ecb1 100644
--- a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiPubInvaliddaystype.java
+++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiPubInvaliddaystype.java
@@ -21,8 +21,8 @@ public class GrBiPubInvaliddaystype implements Serializable
     private Long invaliddaystypeid;
 
 
-    @TableField(value = "INVALIDDAYSTYPENAME")
-    private String invaliddaystypename;
+    @TableField(value = "INVALIDDAYSTYPE")
+    private String invaliddaystype;
 
 
 
diff --git a/lidee-core/src/main/resources/mapper/framework/GrBiPubInvaliddaystypeMapper.xml b/lidee-core/src/main/resources/mapper/framework/GrBiPubInvaliddaystypeMapper.xml
index 40c6f0f..897604f 100644
--- a/lidee-core/src/main/resources/mapper/framework/GrBiPubInvaliddaystypeMapper.xml
+++ b/lidee-core/src/main/resources/mapper/framework/GrBiPubInvaliddaystypeMapper.xml
@@ -6,17 +6,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="com.lideeyunji.core.framework.entity.GrBiPubInvaliddaystype" id="GrBiPubInvaliddaystypeResult">
         <result property="invaliddaystypeid"    column="INVALIDDAYSTYPEID"    />
-        <result property="invaliddaystypename"    column="INVALIDDAYSTYPENAME"    />
+        <result property="invaliddaystype"    column="INVALIDDAYSTYPE"    />
     </resultMap>
 
     <sql id="selectGrBiPubInvaliddaystypeVo">
-        select INVALIDDAYSTYPEID, INVALIDDAYSTYPENAME from gr_bi_pub_invaliddaystype
+        select INVALIDDAYSTYPEID, INVALIDDAYSTYPE from gr_bi_pub_invaliddaystype
     </sql>
 
     <select id="selectGrBiPubInvaliddaystypeList" parameterType="com.lideeyunji.core.framework.entity.GrBiPubInvaliddaystype" resultMap="GrBiPubInvaliddaystypeResult">
         <include refid="selectGrBiPubInvaliddaystypeVo"/>
         <where>  
-            <if test="invaliddaystypename != null  and invaliddaystypename != ''"> and INVALIDDAYSTYPENAME like concat('%', #{invaliddaystypename}, '%')</if>
+            <if test="invaliddaystype != null  and invaliddaystype != ''"> and INVALIDDAYSTYPE like concat('%', #{invaliddaystype}, '%')</if>
         </where>
     </select>
     
@@ -32,18 +32,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into gr_bi_pub_invaliddaystype
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="invaliddaystypeid != null">INVALIDDAYSTYPEID,</if>
-            <if test="invaliddaystypename != null and invaliddaystypename != ''">INVALIDDAYSTYPENAME,</if>
+            <if test="invaliddaystype != null and invaliddaystype != ''">INVALIDDAYSTYPE,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="invaliddaystypeid != null">#{invaliddaystypeid},</if>
-            <if test="invaliddaystypename != null and invaliddaystypename != ''">#{invaliddaystypename},</if>
+            <if test="invaliddaystype != null and invaliddaystype != ''">#{invaliddaystype},</if>
          </trim>
     </insert>
 
     <update id="updateGrBiPubInvaliddaystype" parameterType="com.lideeyunji.core.framework.entity.GrBiPubInvaliddaystype">
         update gr_bi_pub_invaliddaystype
         <trim prefix="SET" suffixOverrides=",">
-            <if test="invaliddaystypename != null and invaliddaystypename != ''">INVALIDDAYSTYPENAME = #{invaliddaystypename},</if>
+            <if test="invaliddaystype != null and invaliddaystype != ''">INVALIDDAYSTYPE = #{invaliddaystype},</if>
         </trim>
         where INVALIDDAYSTYPEID = #{invaliddaystypeid}
     </update>