he2802 3 سال پیش
والد
کامیت
e3b576313d

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionAddBo.java

@@ -73,4 +73,6 @@ public class QuestionAddBo {
     /** 导入顺序 */
     @ApiModelProperty("导入顺序")
     private Long importSort;
+
+
 }

+ 6 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionServiceImpl.java

@@ -224,6 +224,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         String errorLog = "";
         String importNo = ServletUtils.getEncoded("IMPORT");
         int i=10;
+        Long nowTime = DateUtils.getNowTime();
         List<QuestionImport> errorList = new ArrayList<>();
         for (QuestionImport question : questionList) {
             QuestionAddBo bo = new QuestionAddBo();
@@ -323,6 +324,8 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
             bo.setCreateBy(operName);
             bo.setImportNo(importNo);
             bo.setPublishStatus(1);
+            bo.setImportSort(nowTime+i); //导入时间从小到大排
+            bo.setCreateTime(nowTime); //从大到小排
             errorLog = insertByAddBoImport(bo,i);
             i++;
         }
@@ -668,6 +671,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                        bo.setPublishStatus(1);
                        bo.setBusinessList(businessList);
                        bo.setImportSort(sort+nowTime);
+                       bo.setCreateTime(nowTime);
                        insertByAddBoImport(bo,i);
                        sort++;
 
@@ -1010,6 +1014,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                         bo.setPublishStatus(1);
                         bo.setBusinessList(businessList);
                         bo.setImportSort(sort+nowTime);
+                        bo.setCreateTime(nowTime);
                         list.add(bo);
                         //清空数据
                         isOption = false;
@@ -1063,7 +1068,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
             errorLog+=bo.getContent()+"-名称重复\n";
            return errorLog;
         }*/
-        add.setCreateTime(DateUtils.getNowTime());
+    //    add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
         boolean result = this.save(add);
         if(bo.getBusinessList()!=null){

+ 1 - 1
zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionMapper.xml

@@ -207,7 +207,7 @@
         </if>
         GROUP BY
         q.question_id
-        ORDER BY q.import_no DESC,q.import_sort
+        ORDER BY q.create_time DESC,q.import_sort
     </select>
 
     <select id="selectList_COUNT" resultType="Long">