ly 培训矩阵到培训计划跟踪

master/src/main/java/com/ruoyi/project/training/controller/TTrainingbccRegularController.java

@@ -3,6 +3,7 @@ package com.ruoyi.project.training.controller;
 import java.time.LocalDate;
 import java.util.*;
 
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.project.plant.domain.TStaffmgr;
 import com.ruoyi.project.plant.service.ITStaffmgrService;
 import com.ruoyi.project.system.domain.SysDictData;
@@ -249,6 +250,7 @@ public class TTrainingbccRegularController extends BaseController
     @PreAuthorize("@ss.hasPermi('training:bccregular:add')")
     @Log(title = "装置培训计划", businessType = BusinessType.INSERT)
     @GetMapping("batchAddTraining")
+    @RepeatSubmit
     public AjaxResult addBatch() {
         TTrainingbccRegular tr =new TTrainingbccRegular();
         TTrainingMatrix tTrainingMatrix = new TTrainingMatrix();
@@ -257,6 +259,7 @@ public class TTrainingbccRegularController extends BaseController
         List<TTrainingMatrix> list = tTrainingMatrixService.selectTTrainingMatrixList(tTrainingMatrix);
         logger.info("===========" + list.size() + "");
         int currentYear = LocalDate.now().getYear();
+        int resNum = 0;
         for (TTrainingMatrix matrix: list
              ) {
             int addFlag = 0;
@@ -279,11 +282,15 @@ public class TTrainingbccRegularController extends BaseController
             if ("每月一次".equals(matrix.getFrequency()) ) {
                 tr.setYear(String.valueOf(currentYear));
                 tr.setItem(matrix.getItem());
+                List<TTrainingbccRegular> regulars0 = tTrainingbccRegularService.selectTTrainingbccRegularList(tr);
                 tr.setPlanTrainingdate(new Date());
                 List<TTrainingbccRegular> regulars = tTrainingbccRegularService.selectTTrainingbccRegularList(tr);
                 if (regulars.size() == 0) {
                     addFlag = 1;
                 }
+                if (regulars0.size() >= LocalDate.now().getMonthValue()) { //数量够了不需要增加了
+                    addFlag = 0;
+                }
             }
             if (addFlag == 1) {
                 TTrainingbccRegular tTrainingRegular = new TTrainingbccRegular();
@@ -393,9 +400,10 @@ public class TTrainingbccRegularController extends BaseController
                             trainingbccDeviceService.insertTTrainingbccDevice(tTrainingDevice);
                         }
                     }
+                resNum ++;
             }
         }
-        return AjaxResult.success();
+        return AjaxResult.success("成功添加" + resNum + "条培训");
     }
 
     /**

ui/src/views/training/bccregular/index.vue

@@ -586,7 +586,7 @@ export default {
     handleAddBatch(){
       batchAddTraining(null).then(response => {
         this.getList()
-        this.msgSuccess('操作成功');
+        this.msgSuccess(response.msg);
       })
     },
     /** 修改按钮操作 */

ui/src/views/training/trainingbcc/index.vue

@@ -719,6 +719,9 @@ export default {
         courseStartdate: [
           { required: true, message: this.$t('培训开始日期') + this.$t('不能为空'), trigger: "blur" }
         ],
+        courseEnddate: [
+          { required: true, message: this.$t('培训结束日期') + this.$t('不能为空'), trigger: "blur" }
+        ],
         isfinish: [
           { required: true, message: this.$t('是否完成') + this.$t('不能为空'), trigger: "blur" }
         ],