yangdamao 2 vuotta sitten
vanhempi
commit
ee9bac049d
31 muutettua tiedostoa jossa 313 lisäystä ja 190 poistoa
  1. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/Exam.java
  2. 3 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/Question.java
  3. 3 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/QuestionChapter.java
  4. 4 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/QuestionModule.java
  5. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/base/domain/Certificate.java
  6. 3 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/base/domain/CertificateCommon.java
  7. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/base/domain/CertificateTp.java
  8. 3 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/base/domain/ProfileField.java
  9. 3 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/base/domain/ProfileTp.java
  10. 3 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/Course.java
  11. 3 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseBusiness.java
  12. 4 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseChapter.java
  13. 3 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseEducationType.java
  14. 3 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseHandouts.java
  15. 3 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseModule.java
  16. 3 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseProjectType.java
  17. 3 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseSection.java
  18. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseStreaming.java
  19. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseSubject.java
  20. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/Major.java
  21. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/domain/ExamPaper.java
  22. 3 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/Goods.java
  23. 3 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/GoodsSpec.java
  24. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/GoodsSpecAttribute.java
  25. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/GoodsSpecTemplate.java
  26. 233 190
      zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java
  27. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/domain/PayServe.java
  28. 3 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/domain/PaySupply.java
  29. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/domain/PolyvCata.java
  30. 4 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/domain/PolyvVideo.java
  31. 1 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/system/bo/GoodsCopyEnum.java

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/Exam.java

@@ -74,4 +74,6 @@ private static final long serialVersionUID=1L;
     /** 模拟考配置参数 */
     @TableField(exist = false)
     private ExamSimulateConfigBo simulateConfig;
+    @TableField(exist = false)
+    private Long oId;
 }

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/Question.java

@@ -62,4 +62,7 @@ private static final long serialVersionUID=1L;
     /** 导入顺序 */
     private Long importSort;
     private Long tenantId;
+    @TableField(exist = false)
+    private Long oId;
+
 }

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/QuestionChapter.java

@@ -46,4 +46,7 @@ private static final long serialVersionUID=1L;
     private String code;
 
     private Long tenantId;
+    @TableField(exist = false)
+    private Long oId;
+
 }

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/QuestionModule.java

@@ -44,4 +44,8 @@ private static final long serialVersionUID=1L;
     private String code;
 
     private Long tenantId;
+
+    @TableField(exist = false)
+    private Long oId;
+
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/base/domain/Certificate.java

@@ -42,4 +42,6 @@ private static final long serialVersionUID=1L;
     private String remark;
 
     private Long tenantId;
+    @TableField(exist = false)
+    private Long oId;
 }

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/base/domain/CertificateCommon.java

@@ -44,4 +44,7 @@ private static final long serialVersionUID=1L;
     private Long certificateTypeId;
 
     private Long tenantId;
+
+    @TableField(exist = false)
+    private Long oId;
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/base/domain/CertificateTp.java

@@ -50,4 +50,6 @@ private static final long serialVersionUID=1L;
     private Long certificateId;
 
     private Long tenantId;
+    @TableField(exist = false)
+    private Long oId;
 }

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/base/domain/ProfileField.java

@@ -41,4 +41,7 @@ private static final long serialVersionUID=1L;
     /** 输入类型 1输入框 2下拉选择 3上传文件 4下载文件 5时间选择器 */
     private Long inputType;
     private Long tenantId;
+
+    @TableField(exist = false)
+    private Long oId;
 }

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/base/domain/ProfileTp.java

@@ -48,4 +48,7 @@ private static final long serialVersionUID=1L;
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String goodsIds;
     private Long tenantId;
+
+    @TableField(exist = false)
+    private Long oId;
 }

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/Course.java

@@ -70,4 +70,7 @@ private static final long serialVersionUID=1L;
     /** 1显示 0隐藏 */
     private Integer courseShow;
     private Long tenantId;
+    @TableField(exist = false)
+    private Long oId;
+
 }

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseBusiness.java

@@ -73,4 +73,7 @@ private static final long serialVersionUID=1L;
     /** 学时审核层级:1初审,2初审和复审 */
     private Integer periodNumber;
     private Long tenantId;
+
+    @TableField(exist = false)
+    private Long oId;
 }

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseChapter.java

@@ -49,4 +49,8 @@ private static final long serialVersionUID=1L;
     /** 导入编号 */
     private String importNo;
     private Long tenantId;
+
+    @TableField(exist = false)
+    private Long oId;
+
 }

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseEducationType.java

@@ -45,4 +45,7 @@ private static final long serialVersionUID=1L;
     private Integer sort;
 
     private Long tenantId;
+
+    @TableField(exist = false)
+    private Long oId;
 }

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseHandouts.java

@@ -51,4 +51,7 @@ private static final long serialVersionUID=1L;
     private Integer canDownload;
 
     private Long tenantId;
+    @TableField(exist = false)
+    private Long oId;
+
 }

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseModule.java

@@ -49,4 +49,7 @@ private static final long serialVersionUID=1L;
     /** 赠送卷ID */
     private Long freeExamId;
     private Long tenantId;
+    @TableField(exist = false)
+    private Long oId;
+
 }

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseProjectType.java

@@ -45,4 +45,7 @@ private static final long serialVersionUID=1L;
     /** 排序 */
     private Integer sort;
     private Long tenantId;
+    @TableField(exist = false)
+    private Long oId;
+
 }

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseSection.java

@@ -74,4 +74,7 @@ private static final long serialVersionUID=1L;
     /** 讲师ID */
     private Long teacherId;
     private Long tenantId;
+
+    @TableField(exist = false)
+    private Long oId;
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseStreaming.java

@@ -60,4 +60,6 @@ private static final long serialVersionUID=1L;
     private Long polyvId;
 
     private Long tenantId;
+    @TableField(exist = false)
+    private Long oId;
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseSubject.java

@@ -44,4 +44,6 @@ private static final long serialVersionUID=1L;
     private Integer sort;
 
     private Long tenantId;
+    @TableField(exist = false)
+    private Long oId;
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/Major.java

@@ -47,4 +47,6 @@ private static final long serialVersionUID=1L;
     /** 排序 */
     private Integer sort;
     private Long tenantId;
+    @TableField(exist = false)
+    private Long oId;
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/domain/ExamPaper.java

@@ -42,4 +42,6 @@ private static final long serialVersionUID=1L;
     private String encoder;
 
     private Long tenantId;
+    @TableField(exist = false)
+    private Long oId;
 }

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/Goods.java

@@ -146,4 +146,7 @@ private static final long serialVersionUID=1L;
     /** 显示排序字段 */
     private Long showSort;
     private Long tenantId;
+
+    @TableField(exist = false)
+    private Long oId;
 }

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/GoodsSpec.java

@@ -44,4 +44,7 @@ private static final long serialVersionUID=1L;
     private Long updateTime;
 
     private Long tenantId;
+
+    @TableField(exist = false)
+    private Long oId;
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/GoodsSpecAttribute.java

@@ -43,4 +43,6 @@ private static final long serialVersionUID=1L;
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
     private Long tenantId;
+    @TableField(exist = false)
+    private Long oId;
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/GoodsSpecTemplate.java

@@ -43,4 +43,6 @@ private static final long serialVersionUID=1L;
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
     private Long tenantId;
+    @TableField(exist = false)
+    private Long oId;
 }

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 233 - 190
zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java


+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/domain/PayServe.java

@@ -40,4 +40,6 @@ private static final long serialVersionUID=1L;
     private Long updateTime;
     /** 备注 */
     private String remark;
+    @TableField(exist = false)
+    private Long oId;
 }

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/domain/PaySupply.java

@@ -41,4 +41,7 @@ private static final long serialVersionUID=1L;
     /** 服务类型ID */
     private Long serverId;
     private Long tenantId;
+    @TableField(exist = false)
+    private Long oId;
+
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/domain/PolyvCata.java

@@ -43,4 +43,6 @@ private static final long serialVersionUID=1L;
     /** 修改时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
+    @TableField(exist = false)
+    private Long oId;
 }

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/domain/PolyvVideo.java

@@ -164,4 +164,8 @@ private static final long serialVersionUID=1L;
 
     private Long tenantId;
 
+    @TableField(exist = false)
+    private Long oId;
+
+
 }

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/system/bo/GoodsCopyEnum.java

@@ -31,6 +31,7 @@ public enum GoodsCopyEnum {
     CERTIFICATE_COMMON(48),
     CERTIFICATE(49),
     CERTIFICATE_TP(50),
+    SCHOOL(51),
     ;
     private Integer type;
 

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä