Browse Source

练习册管理页面增加返回发布日期

yerongfa 4 years ago
parent
commit
4f1864724f

+ 10 - 0
ssj-bean/src/main/java/com/ssj/bean/kmt/kmt/domain/KmtExerciseBook.java

@@ -161,6 +161,8 @@ public class KmtExerciseBook extends BaseEntity {
      */
     private String assignedBatch;
 
+    private Date publishTime;
+
     public int getAiRollbackImport() {
         return aiRollbackImport;
     }
@@ -497,4 +499,12 @@ public class KmtExerciseBook extends BaseEntity {
     public void setAssignedBatch(String assignedBatch) {
         this.assignedBatch = assignedBatch;
     }
+
+    public Date getPublishTime() {
+        return publishTime;
+    }
+
+    public void setPublishTime(Date publishTime) {
+        this.publishTime = publishTime;
+    }
 }

+ 3 - 3
ssj-kmt-exercise-service-impl/src/main/java/com/ssj/service/kmt/kmt/service/impl/KmtExerciseServiceImpl.java

@@ -18,7 +18,6 @@ import com.ssj.framework.core.security.manager.TokenManager;
 import com.ssj.framework.core.util.*;
 import com.ssj.framework.weixin.util.DateUtil;
 import com.ssj.kmt.utils.JSONFileUtil;
-import com.ssj.service.conch.common.request.PageReq;
 import com.ssj.service.kmt.dto.*;
 import com.ssj.service.kmt.dto.exercise.ExerciseBookEditDto;
 import com.ssj.service.kmt.dto.exercise.ExerciseQuestionRollbacks;
@@ -37,7 +36,6 @@ import com.ssj.service.weixin.zuoyb.service.ZuoybKnowHowDetailsSortService;
 import com.ssj.taskthread.ThreadPool;
 import com.ssj.utils.SortByChineseUtil;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.Factory;
 import org.apache.commons.lang3.StringUtils;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
@@ -693,6 +691,9 @@ public class KmtExerciseServiceImpl implements KmtExerciseService {
                 count = kmtExerciseMapper.countUnFinishQuestionsByExerciseBookId(exerciseBook.getId(), 2);
                 if (count <= questionCount){
                     exerciseBook.setHadAuditing(1);
+                    if (exerciseBook.getPublishTime() == null) {
+                        exerciseBook.setPublishTime(new Date());
+                    }
                 }
             }
             if (exerciseBook.getHadHandle() == 1 && exerciseBook.getHadAuditing() == 1){
@@ -832,7 +833,6 @@ public class KmtExerciseServiceImpl implements KmtExerciseService {
     /**
      * 推送下个角色已完成
      * @param userId
-     * @param bookName
      * @param nextType
      */
     private void pushNextUserMessage (String userId, KmtExerciseBook exerciseBook, int nextType){

+ 1 - 1
ssj-mybatis-service-impl/src/main/resources/mybatis/mapper/KmtExerciseMapper.xml

@@ -1220,7 +1220,7 @@
         t.status,
         t.org_nums orgNums,
         t.progress,
-        if(t.progress = '已发布', (select date(max(publish_time)) from kmt_exercise_questions where exercise_book_id = t.id limit 1), '') publishDate,
+        if(t.progress = '已发布', date(t.publish_time), '') publishDate,
         t.total_grade_priority priority,
         t.identified_nums identifiedNums,
         t.answer_correcter_id answerCorrecterId,