|
@@ -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){
|