- 学习模块签名时自动带出签名时间

- 学习模块完成学习时自动带出培训完成时间
- 首页轮播内容按名称、上传时间ASC排序

ruoyi-admin/src/main/java/com/ruoyi/web/controller/branch/TBranchLearningController.java

@@ -79,18 +79,23 @@ public class TBranchLearningController extends BaseController
             learningTimeStudied += 1L;
         }
 
-        if (learningTimeStudied < learningTimeRequired) {
+        if (learningTimeStudied < learningTimeRequired) {//累计学习时长<规定学习时长，状态=未完成
             learningProgress = learningProgress.multiply(new BigDecimal(learningTimeStudied))
                     .divide(new BigDecimal(learningTimeRequired), 1, RoundingMode.HALF_UP);
             learningStatus = "1";
-        } else {
+        } else {//累计学习时长>规定学习时长，状态=已完成
             learningStatus = "2";
+            if (tBranchLearning.getSignTime() == null) {//培训完成时间==null，填写当前时间
+                tBranchLearning.setSignTime(new Date());
+            }
         }
 
         tBranchLearning.setLearningTimeStudied(learningTimeStudied);
         tBranchLearning.setLearningProgress(learningProgress.toString());
         tBranchLearning.setLearningStatus(learningStatus);
 
+        // 如果学习完成时间==null
+
         tBranchLearningService.updateTBranchLearning(tBranchLearning);
 
         return AjaxResult.success(tBranchLearning);

ruoyi-system/src/main/resources/mapper/branch/TBranchTemplateMapper.xml

@@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by u.template_name asc, u.create_time asc
     </select>
     
     <select id="selectTBranchTemplateByTemplateId" parameterType="Long" resultMap="TBranchTemplateResult">

ruoyi-system/src/main/resources/mapper/branch/TFileMapper.xml

@@ -49,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by u.name asc, u.createdate asc
     </select>
 
     <select id="selectTFileById" parameterType="Long" resultMap="TFileResult">

ruoyi-ui/src/views/branch/xxyd/mystudy/index.vue

@@ -206,6 +206,7 @@ export default {
     },
     handleSign(row) {
       row.isSigned = "1";
+      row.signTime = new Date();
       updateLearning(row).then(response => {
         this.$modal.msgSuccess("确认签名成功");
         this.getList();