From c98510bc4936fc369f4ffa91d2a608c7cb563edc Mon Sep 17 00:00:00 2001
From: wgf <121463602@qq.com>
Date: Tue, 16 May 2023 02:01:05 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=96=B0=E5=A2=9E=E9=BB=98=E8=AE=A4=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java   | 2 ++
 .../jlw/entity/TeacherOpenCourseMergeResourcesInfo.java       | 2 ++
 .../jlw/service/TeacherOpenCourseMergeCourseInfoService.java  | 1 -
 .../service/TeacherOpenCourseMergeResourcesInfoService.java   | 1 -
 .../jlw/web/query/TeacherOpenCourseMergeCourseInfoQuery.java  | 4 +++-
 .../web/query/TeacherOpenCourseMergeResourcesInfoQuery.java   | 4 +++-
 6 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java
index 1a91dfd8..d118eca0 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java
@@ -5,6 +5,7 @@ import com.ibeetl.admin.core.entity.BaseEntity;
 import com.ibeetl.admin.core.util.ValidateConfig;
 import lombok.EqualsAndHashCode;
 import org.beetl.sql.annotation.entity.AutoID;
+import org.beetl.sql.annotation.entity.InsertIgnore;
 import org.beetl.sql.fetch.annotation.Fetch;
 
 import javax.validation.constraints.NotNull;
@@ -116,6 +117,7 @@ public class TeacherOpenCourseMergeCourseInfo extends BaseEntity implements Comp
     private Long userId ;
 
     //新增时间
+    @InsertIgnore
     private Date addTime;
 	
     public TeacherOpenCourseMergeCourseInfo(){
diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java
index d5913469..3fce1d8e 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java
@@ -6,6 +6,7 @@ import com.ibeetl.admin.core.entity.BaseEntity;
 import com.ibeetl.admin.core.util.ValidateConfig;
 import com.ibeetl.jlw.enums.GlobalUpStatusEnum;
 import org.beetl.sql.annotation.entity.AssignID;
+import org.beetl.sql.annotation.entity.InsertIgnore;
 
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
@@ -70,6 +71,7 @@ public class TeacherOpenCourseMergeResourcesInfo extends BaseEntity{
     /**
      * 新增时间
      */
+    @InsertIgnore
     private Date addTime;
 	
     public TeacherOpenCourseMergeResourcesInfo(){
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
index ebdcffcf..f84a2c67 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
@@ -239,7 +239,6 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
         String msg = "";
         TeacherOpenCourseMergeCourseInfo teacherOpenCourseMergeCourseInfo = query.pojo();
         teacherOpenCourseMergeCourseInfo.setCourseInfoStatus(1);
-        teacherOpenCourseMergeCourseInfo.setAddTime(new Date());
         // 获取新的排序值
         TeacherOpenCourseMergeCourseInfo paras = new TeacherOpenCourseMergeCourseInfo();
         paras.setCourseInfoType(teacherOpenCourseMergeCourseInfo.getCourseInfoType());
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesInfoService.java
index cf766f91..dfc8d433 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesInfoService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesInfoService.java
@@ -134,7 +134,6 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
     }
 
     public JsonResult add(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery) {
-        teacherOpenCourseMergeResourcesInfoQuery.setAddTime(new Date());
         String msg = "";
         TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoQuery.pojo();
 
diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeCourseInfoQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeCourseInfoQuery.java
index 27c5f796..dfee89b8 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeCourseInfoQuery.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeCourseInfoQuery.java
@@ -4,6 +4,7 @@ import cn.jlw.validate.ValidateConfig;
 import com.ibeetl.admin.core.annotation.Query;
 import com.ibeetl.admin.core.web.query.PageParam;
 import com.ibeetl.jlw.entity.TeacherOpenCourseMergeCourseInfo;
+import org.beetl.sql.annotation.entity.InsertIgnore;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
@@ -77,6 +78,7 @@ public class TeacherOpenCourseMergeCourseInfoQuery extends PageParam {
     private Boolean innerJoin;
 
     //新增时间
+    @InsertIgnore
     private Date addTime;
 
     /**
@@ -218,7 +220,7 @@ public class TeacherOpenCourseMergeCourseInfoQuery extends PageParam {
         pojo.setResourcesTrainingIds(this.getResourcesTrainingIds());
         pojo.setOrgId(this.getOrgId());
         pojo.setUserId(this.getUserId());
-        pojo.setAddTime(this.getAddTime());
+//        pojo.setAddTime(this.getAddTime());
         return pojo;
     }
 
diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeResourcesInfoQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeResourcesInfoQuery.java
index 40443011..6927cfc3 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeResourcesInfoQuery.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeResourcesInfoQuery.java
@@ -6,6 +6,7 @@ import com.ibeetl.admin.core.annotation.Query;
 import com.ibeetl.admin.core.web.query.PageParam;
 import com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesInfo;
 import com.ibeetl.jlw.enums.GlobalUpStatusEnum;
+import org.beetl.sql.annotation.entity.InsertIgnore;
 
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
@@ -44,6 +45,7 @@ public class TeacherOpenCourseMergeResourcesInfoQuery extends PageParam implemen
     /**
      * 新增时间
      */
+    @InsertIgnore
     private Date addTime;
 
     private String teacherOpenCourseMergeResourcesInfoIdPlural;
@@ -122,7 +124,7 @@ public class TeacherOpenCourseMergeResourcesInfoQuery extends PageParam implemen
         pojo.setResourcesInfoStatus(defaultIfNull(this.getResourcesInfoStatus(), GlobalUpStatusEnum.UP));
         pojo.setOrgId(this.getOrgId());
         pojo.setUserId(this.getUserId());
-        pojo.setAddTime(this.addTime);
+//        pojo.setAddTime(this.addTime);
         return pojo;
     }