Merge branch 'dev-v5.2' into dev

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

@@ -72,5 +72,5 @@ public class QuestionAddBo {
     private String importNo;
     /** 导入顺序 */
     @ApiModelProperty("导入顺序")
-    private Integer importSort;
+    private Long importSort;
 }

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

@@ -60,5 +60,5 @@ private static final long serialVersionUID=1L;
     /** 导入编号 */
     private String importNo;
     /** 导入顺序 */
-    private Integer importSort;
+    private Long importSort;
 }

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

@@ -5,8 +5,6 @@ import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.tokenizer.Word;
 import com.alibaba.fastjson.JSON;
-import com.spire.doc.Document;
-import com.spire.doc.FileFormat;
 import com.zhongzheng.common.constant.Constants;
 import com.zhongzheng.common.core.domain.entity.SysUser;
 import com.zhongzheng.common.core.redis.RedisCache;
@@ -352,8 +350,9 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         String errorLog = ""; //错误提示
         String buffer = "";
         String importNo = ServletUtils.getEncoded("IMPORT");
-        int sort = 1;
+        Long sort = 1L;
         try{
+            Long nowTime = DateUtils.getNowTime();
             String path = file.getOriginalFilename();
             if (path.endsWith(".doc")) {
                 throw new CustomException("不支持doc格式");
@@ -668,7 +667,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                        bo.setImportNo(importNo);
                        bo.setPublishStatus(1);
                        bo.setBusinessList(businessList);
-                       bo.setImportSort(sort);
+                       bo.setImportSort(sort+nowTime);
                        insertByAddBoImport(bo,i);
                        sort++;
 
@@ -701,8 +700,9 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         String errorLog = ""; //错误提示
         String buffer = "";
         String importNo = ServletUtils.getEncoded("IMPORT");
-        int sort = 1;
+        Long sort = 1L;
         try{
+            Long nowTime = DateUtils.getNowTime();
             String path = file.getOriginalFilename();
             if (path.endsWith(".doc")) {
                 throw new CustomException("不支持doc格式");
@@ -1009,7 +1009,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                         bo.setImportNo(importNo);
                         bo.setPublishStatus(1);
                         bo.setBusinessList(businessList);
-                        bo.setImportSort(sort);
+                        bo.setImportSort(sort+nowTime);
                         list.add(bo);
                         //清空数据
                         isOption = false;

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/UserProfileServiceImpl.java

@@ -451,7 +451,7 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
                 informUserAddBo.setSystemStatus(1);
                 informUserAddBo.setRemind("资料审核通过通知");
                 informUserAddBo.setGoodsId(userProfileVo.getGoodsId());
-                informUserAddBo.setOrderGoodsId(userProfileVo.getOrderGoodsId());
+                informUserAddBo.setOrderGoodsId(bo.getOrderGoodsId());
                 informUserAddBo.setGradeId(gradeId);
                 GoodsVo goodsVo1 = iGoodsService.queryById(userProfileVo.getGoodsId());
                 informUserAddBo.setText("尊敬的用户：您上传" + goodsVo1.getGoodsName() + "课程的承诺书审核成功");
@@ -469,7 +469,7 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
                 informUserAddBo.setSystemStatus(3);
                 informUserAddBo.setRemind("资料审核通过通知");
                 informUserAddBo.setGoodsId(userProfileVo.getGoodsId());
-                informUserAddBo.setOrderGoodsId(userProfileVo.getOrderGoodsId());
+                informUserAddBo.setOrderGoodsId(bo.getOrderGoodsId());
                 GoodsVo goodsVo1 = iGoodsService.queryById(userProfileVo.getGoodsId());
                 informUserAddBo.setText("尊敬的用户：您上传" + goodsVo1.getGoodsName() + "课程的承诺书审核成功");
                 iInformUserService.insertByAddBo(informUserAddBo);
@@ -492,7 +492,7 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
                 informUserAddBo.setSystemStatus(1);
                 informUserAddBo.setRemind("资料审核不通过通知");
                 informUserAddBo.setGoodsId(userProfileVo.getGoodsId());
-                informUserAddBo.setOrderGoodsId(userProfileVo.getOrderGoodsId());
+                informUserAddBo.setOrderGoodsId(bo.getOrderGoodsId());
                 informUserAddBo.setGradeId(gradeId);
                 GoodsVo goodsVo1 = iGoodsService.queryById(userProfileVo.getGoodsId());
                 informUserAddBo.setText("尊敬的用户：您上传" + goodsVo1.getGoodsName() + "课程的承诺书审核不通过，请重新完善吧");
@@ -510,7 +510,7 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
                 informUserAddBo.setSystemStatus(3);
                 informUserAddBo.setRemind("资料审核不通过通知");
                 informUserAddBo.setGoodsId(userProfileVo.getGoodsId());
-                informUserAddBo.setOrderGoodsId(userProfileVo.getOrderGoodsId());
+                informUserAddBo.setOrderGoodsId(bo.getOrderGoodsId());
                 GoodsVo goodsVo1 = iGoodsService.queryById(userProfileVo.getGoodsId());
                 informUserAddBo.setText("尊敬的用户：您上传" + goodsVo1.getGoodsName() + "课程的承诺书审核不通过，请重新完善吧");
                 iInformUserService.insertByAddBo(informUserAddBo);

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

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