From 40123b23758bc4f0b431e7b449d195abafb93642 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Tue, 27 Jun 2023 20:57:27 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B46=E6=9C=8827=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SynchronizationService/SyncTJwXsxkb.java     | 11 ++++++++---
 .../modules/kc/grab/imports/entity/Xxhbldxx.java |  6 ++++++
 .../grab/imports/mapper/xml/XxhbldxxMapper.xml   | 16 ++++++++++++++++
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwXsxkb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwXsxkb.java
index 43240ab0..768a0cc4 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwXsxkb.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwXsxkb.java
@@ -1,6 +1,7 @@
 package org.jeecg.modules.kc.grab.SynchronizationService;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -55,7 +56,6 @@ public class SyncTJwXsxkb extends BaseSync {
 
         boolean isAll = false;
         boolean isScope = false;
-        boolean isToday = false;
         if(param != null){
             if(param.containsKey("isAll")){
                 String isAllStr = (String)param.get("isAll");
@@ -96,7 +96,7 @@ public class SyncTJwXsxkb extends BaseSync {
 //                dqw.apply("TIMESTAMPS < str_to_date('"+endDate+"','yyyy-MM-dd')");
             }else{
                 //按天
-                String nowStr = DateTime.now().toDateStr();
+                String nowStr = now.toDateStr();
 //                eqw.between("timestamps","to_date('"+nowStr+" 00:00:00', 'yyyy-MM-dd HH24:MI:SS')","to_date('"+nowStr+" 00:00:00', 'yyyy-MM-dd HH24:MI:SS')");
 //                dqw.between("timestamps","str_to_date('"+nowStr+"', '%Y-%m-%d')","str_to_date('"+nowStr+"', '%Y-%m-%d')");
                 eqw.apply("timestamps between to_date('"+nowStr+" 00:00:00', 'yyyy-MM-dd HH24:MI:SS') and to_date('"+nowStr+" 23:59:59', 'yyyy-MM-dd HH24:MI:SS')");
@@ -136,7 +136,12 @@ public class SyncTJwXsxkb extends BaseSync {
         List<Xxhbxsxkb> outDataList = Lists.newArrayList();
 
         //清洗数据
-        inDataList.forEach(x -> outDataList.add(BeanUtil.toBean(x, Xxhbxsxkb.class)));
+        inDataList.forEach(x -> {
+            Xxhbxsxkb outData = BeanUtil.toBean(x, Xxhbxsxkb.class);
+            outData.setTimestamps(DateUtil.format(x.getTimestamps(), DatePattern.NORM_DATETIME_PATTERN));
+            outDataList.add(outData);
+
+        });
 
         //保存到胃
         int syncnum=0;
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbldxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbldxx.java
index bf72a17a..32add99d 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbldxx.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbldxx.java
@@ -65,4 +65,10 @@ public class Xxhbldxx implements Serializable {
 
     @TableField(exist = false)
     private Integer mysqlnum;
+
+    /**
+     * 听课要求（次数）
+     */
+    @TableField(exist = false)
+    private String tkyq;
 }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbldxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbldxxMapper.xml
index 6f770061..58b5f3b8 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbldxxMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbldxxMapper.xml
@@ -5,4 +5,20 @@
     <select id="getSumnum" resultType="org.jeecg.modules.kc.grab.imports.entity.Xxhbldxx">
         select count(*) as mysqlnum from xxhbldxx
     </select>
+
+    <select id="selectList" resultType="org.jeecg.modules.kc.grab.imports.entity.Xxhbldxx">
+        select
+        xxhbldxx.*, b.tkyq
+        from xxhbldxx
+        left join kc_tksfyq b on b.zwmc = xxhbldxx.zwmc
+        ${ew.customSqlSegment}
+    </select>
+
+    <select id="selectPage" resultType="org.jeecg.modules.kc.grab.imports.entity.Xxhbldxx">
+        select
+        xxhbldxx.*, b.tkyq
+        from xxhbldxx
+        left join kc_tksfyq b on b.zwmc = xxhbldxx.zwmc
+        ${ew.customSqlSegment}
+    </select>
 </mapper>
\ No newline at end of file