字段类型修改

data_base_design/天泽数据大平台.pdb

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1670217067" Name="cjks" Objects="1336" Symbols="103" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1670218115" Name="cjks" Objects="1337" Symbols="103" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -20915,8 +20915,8 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
 <a:Code>question_log_summary</a:Code>
 <a:CreationDate>1661850632</a:CreationDate>
 <a:Creator>lx</a:Creator>
-<a:ModificationDate>1670172100</a:ModificationDate>
+<a:ModificationDate>1670218115</a:ModificationDate>
-<a:Modifier>lx</a:Modifier>
+<a:Modifier>87966</a:Modifier>
 <a:Comment>学生-题目日志-分析汇总</a:Comment>
 <a:PhysicalOptions>auto_increment = 1
 ENGINE = InnoDB
@@ -20995,6 +20995,17 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
 <a:DataType>float</a:DataType>
 </o:Column>
 <o:Column Id="o1276">
+<a:ObjectID>5B85EBEA-89F7-49A2-88B8-F53C9DDF2778</a:ObjectID>
+<a:Name>question_log_summary_student_total_score</a:Name>
+<a:Code>question_log_summary_student_total_score</a:Code>
+<a:CreationDate>1669987828</a:CreationDate>
+<a:Creator>87966</a:Creator>
+<a:ModificationDate>1670218115</a:ModificationDate>
+<a:Modifier>87966</a:Modifier>
+<a:Comment>学生总得分</a:Comment>
+<a:DataType>float</a:DataType>
+</o:Column>
+<o:Column Id="o1277">
 <a:ObjectID>B6F6BAB4-0EF0-4BE6-B661-74638716B0F8</a:ObjectID>
 <a:Name>person_id</a:Name>
 <a:Code>person_id</a:Code>
@@ -21005,7 +21016,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
 <a:Comment>人员ID（学生ID等等）</a:Comment>
 <a:DataType>bigint</a:DataType>
 </o:Column>
-<o:Column Id="o1277">
+<o:Column Id="o1278">
 <a:ObjectID>425F40EA-F79E-409A-8C41-34C006D6D589</a:ObjectID>
 <a:Name>question_log_ids</a:Name>
 <a:Code>question_log_ids</a:Code>
@@ -21017,7 +21028,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
 <a:DataType>varchar(2000)</a:DataType>
 <a:Length>2000</a:Length>
 </o:Column>
-<o:Column Id="o1278">
+<o:Column Id="o1279">
 <a:ObjectID>2287A3B7-121E-41AE-87AC-FE935B55A80C</a:ObjectID>
 <a:Name>question_log_summary_question_total_count</a:Name>
 <a:Code>question_log_summary_question_total_count</a:Code>
@@ -21028,7 +21039,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
 <a:Comment>配置的题目总数</a:Comment>
 <a:DataType>int</a:DataType>
 </o:Column>
-<o:Column Id="o1279">
+<o:Column Id="o1280">
 <a:ObjectID>9859472C-69C7-4E9A-9316-7BF0939E6BF2</a:ObjectID>
 <a:Name>question_log_summary_student_do_count</a:Name>
 <a:Code>question_log_summary_student_do_count</a:Code>
@@ -21039,7 +21050,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
 <a:Comment>学生做题总数</a:Comment>
 <a:DataType>int</a:DataType>
 </o:Column>
-<o:Column Id="o1280">
+<o:Column Id="o1281">
 <a:ObjectID>B7EDC098-95AB-4219-9242-E644701913C4</a:ObjectID>
 <a:Name>question_log_summary_success_count</a:Name>
 <a:Code>question_log_summary_success_count</a:Code>
@@ -21050,7 +21061,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
 <a:Comment>正确数量</a:Comment>
 <a:DataType>int</a:DataType>
 </o:Column>
-<o:Column Id="o1281">
+<o:Column Id="o1282">
 <a:ObjectID>109364AE-9C76-407B-934A-4307215E4982</a:ObjectID>
 <a:Name>question_log_summary_error_count</a:Name>
 <a:Code>question_log_summary_error_count</a:Code>
@@ -21061,7 +21072,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
 <a:Comment>错误数量</a:Comment>
 <a:DataType>int</a:DataType>
 </o:Column>
-<o:Column Id="o1282">
+<o:Column Id="o1283">
 <a:ObjectID>4EEC3C67-2C8A-45F5-8540-A6FFFEA2968C</a:ObjectID>
 <a:Name>question_log_summary_success_rate</a:Name>
 <a:Code>question_log_summary_success_rate</a:Code>
@@ -21072,7 +21083,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
 <a:Comment>正确率,最大100</a:Comment>
 <a:DataType>float</a:DataType>
 </o:Column>
-<o:Column Id="o1283">
+<o:Column Id="o1284">
 <a:ObjectID>11D26CA6-CB55-43F0-9C8F-D1C07A6BC233</a:ObjectID>
 <a:Name>question_log_summary_current_pass_rate</a:Name>
 <a:Code>question_log_summary_current_pass_rate</a:Code>
@@ -21083,7 +21094,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
 <a:Comment>当前配置的及格比率</a:Comment>
 <a:DataType>float</a:DataType>
 </o:Column>
-<o:Column Id="o1284">
+<o:Column Id="o1285">
 <a:ObjectID>B7B56144-0CE8-4EA3-8315-C097AE2A2B4D</a:ObjectID>
 <a:Name>question_log_summary_is_pass</a:Name>
 <a:Code>question_log_summary_is_pass</a:Code>
@@ -21095,7 +21106,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
 <a:DataType>int(2)</a:DataType>
 <a:Length>2</a:Length>
 </o:Column>
-<o:Column Id="o1285">
+<o:Column Id="o1286">
 <a:ObjectID>45DBB89C-2AC0-4F71-AB87-1350950F054B</a:ObjectID>
 <a:Name>finish_second_time</a:Name>
 <a:Code>finish_second_time</a:Code>
@@ -21106,7 +21117,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
 <a:Comment>完成用时(秒)</a:Comment>
 <a:DataType>int</a:DataType>
 </o:Column>
-<o:Column Id="o1286">
+<o:Column Id="o1287">
 <a:ObjectID>32BB73E0-CEAF-45BD-BC36-F699A354C8D7</a:ObjectID>
 <a:Name>finish_time</a:Name>
 <a:Code>finish_time</a:Code>
@@ -21118,7 +21129,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
 <a:DataType>varchar(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o1287">
+<o:Column Id="o1288">
 <a:ObjectID>30F0DBA1-03FC-493E-B628-E3297D197E97</a:ObjectID>
 <a:Name>question_log_summary_status</a:Name>
 <a:Code>question_log_summary_status</a:Code>
@@ -21130,7 +21141,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
 <a:DataType>int(2)</a:DataType>
 <a:Length>2</a:Length>
 </o:Column>
-<o:Column Id="o1288">
+<o:Column Id="o1289">
 <a:ObjectID>5BDCBCAE-7982-49D0-91A7-2C51706D400F</a:ObjectID>
 <a:Name>question_log_summary_add_time</a:Name>
 <a:Code>question_log_summary_add_time</a:Code>
@@ -21141,7 +21152,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
 <a:Comment>添加时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1289">
+<o:Column Id="o1290">
 <a:ObjectID>37755E03-C150-47C6-98C6-1BB69E36CAC1</a:ObjectID>
 <a:Name>org_id</a:Name>
 <a:Code>org_id</a:Code>
@@ -21152,7 +21163,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
 <a:Comment>组织ID</a:Comment>
 <a:DataType>bigint</a:DataType>
 </o:Column>
-<o:Column Id="o1290">
+<o:Column Id="o1291">
 <a:ObjectID>9A38CEE4-E7F0-4393-8A46-7F0B8D2B44BD</a:ObjectID>
 <a:Name>user_id</a:Name>
 <a:Code>user_id</a:Code>
@@ -21165,7 +21176,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1291">
+<o:Key Id="o1292">
 <a:ObjectID>203F6632-947A-4CFA-815D-E029ACCFD264</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -21179,12 +21190,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1291"/>
+<o:Key Ref="o1292"/>
 </c:PrimaryKey>
 </o:Table>
 </c:Tables>
 <c:DefaultGroups>
-<o:Group Id="o1292">
+<o:Group Id="o1293">
 <a:ObjectID>BFEA4109-96F9-4074-AF58-B84D6574A7FC</a:ObjectID>
 <a:Name>PUBLIC</a:Name>
 <a:Code>PUBLIC</a:Code>
@@ -21195,7 +21206,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
 </o:Group>
 </c:DefaultGroups>
 <c:ChildTraceabilityLinks>
-<o:ExtendedDependency Id="o1293">
+<o:ExtendedDependency Id="o1294">
 <a:ObjectID>ABEFC813-1056-4507-A9A7-809C149B4ABE</a:ObjectID>
 <a:CreationDate>1661954753</a:CreationDate>
 <a:Creator>lx</a:Creator>
@@ -21483,7 +21494,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
 </o:ExtendedDependency>
 </c:ChildTraceabilityLinks>
 <c:TargetModels>
-<o:TargetModel Id="o1294">
+<o:TargetModel Id="o1295">
 <a:ObjectID>5963E417-B2CE-431D-988A-B3493AAE5EE4</a:ObjectID>
 <a:Name>MySQL 5.0</a:Name>
 <a:Code>MYSQL50</a:Code>

data_base_design/天泽数据大平台.pdm

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1670218115" Name="cjks" Objects="1337" Symbols="103" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1670227741" Name="cjks" Objects="1337" Symbols="103" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -21022,11 +21022,10 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
 <a:Code>question_log_ids</a:Code>
 <a:CreationDate>1670155136</a:CreationDate>
 <a:Creator>lx</a:Creator>
-<a:ModificationDate>1670155185</a:ModificationDate>
+<a:ModificationDate>1670227741</a:ModificationDate>
-<a:Modifier>lx</a:Modifier>
+<a:Modifier>87966</a:Modifier>
 <a:Comment>关联的做题日志IDs</a:Comment>
-<a:DataType>varchar(2000)</a:DataType>
+<a:DataType>text</a:DataType>
-<a:Length>2000</a:Length>
 </o:Column>
 <o:Column Id="o1279">
 <a:ObjectID>2287A3B7-121E-41AE-87AC-FE935B55A80C</a:ObjectID>

web/src/main/java/com/ibeetl/jlw/entity/vo/TeacherOpenCourseQuestionTestSimpleInfoVO.java

@@ -1,7 +1,7 @@
 package com.ibeetl.jlw.entity.vo;
 
 import com.ibeetl.admin.core.annotation.DictEnum;
-import com.ibeetl.admin.core.entity.BaseEntity;
+import com.ibeetl.jlw.entity.QuestionLogSummary;
 import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -15,7 +15,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-public class TeacherOpenCourseQuestionTestSimpleInfoVO extends BaseEntity {
+public class TeacherOpenCourseQuestionTestSimpleInfoVO extends QuestionLogSummary {
 
     //开课题目配置ID
 
@@ -38,28 +38,35 @@ public class TeacherOpenCourseQuestionTestSimpleInfoVO extends BaseEntity {
 
     private Date teacherOpenCourseQuestionEndTime;
 
-    // 我的分数
-
-    private String myScore;
-
-    // 题目总数
-
-    private Integer questionTotalCount;
-
     // 是否已交卷
 
     private Boolean isFinished;
 
-    // 完成用时
+    @Override
-
+    public void setQuestionLogSummaryId(Long questionLogSummaryId) {
-    private String finishTime;
+        super.setQuestionLogSummaryId(questionLogSummaryId);
-
+        this.setIsFinished(null != questionLogSummaryId);
-    // 完成用时（秒）
+    }
-
+
-    private String finishSecondTime;
+//    // 我的分数
-
+//
-    // 正确率 最大100
+//    private String myScore;
-
+//
-    private Float correctRate;
+//    // 题目总数
+//
+//    private Integer questionTotalCount;
+//
+//
+//    // 完成用时
+//
+//    private String finishTime;
+//
+//    // 完成用时（秒）
+//
+//    private String finishSecondTime;
+//
+//    // 正确率 最大100
+//
+//    private Float correctRate;
 
 }