张丁捷迭 -bug fixed 作业证书导入,关联的装置级培训的代码和名称没有关联修改

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

@@ -222,6 +222,13 @@ public class TTrainingRegularController extends BaseController
     {
         //如果确定计划日期新增关联内容
         if (tTrainingRegular.getNotPlan().equals("true")) {
+            //查找跟这条培训计划相关联的装置级培训记录  修改其培训的年份，课程名称和课程代码
+            TTraining t=  tTrainingService.selectTTrainingByRegularId(tTrainingRegular.getId());
+            t.setCourse(tTrainingRegular.getItem());
+            t.setCourseid(tTrainingRegular.getCourseCode());
+            t.setYear(tTrainingRegular.getYear());
+            t.setDelFlag(tTrainingRegular.getDelFlag());
+            int result=   tTrainingService.updateTTraining(t );
             TTrainingRegular oldRegular = tTrainingRegularService.selectTTrainingRegularById(tTrainingRegular.getId());
             int i = 0;
             if (oldRegular.getActualpostId() != null) {

master/src/main/java/com/ruoyi/project/training/mapper/TTrainingMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.project.training.mapper;
 
 import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
 import com.ruoyi.project.training.domain.TTraining;
 
@@ -10,7 +11,7 @@ import com.ruoyi.project.training.domain.TTraining;
  * @author ruoyi
  * @date 2020-12-02
  */
-public interface TTrainingMapper 
+public interface TTrainingMapper  extends BaseMapper<TTraining>
 {
     /**
      * 查询培训计划

ui/src/views/ehs/approveaccident/index.vue

@@ -70,7 +70,7 @@ export default {
       // 弹出层标题
       title: "",
       // 部门树选项
-      deptOptions: undefined,
+      deptOptions: [],
       clientHeight:300,
       // 装置名称字典
       plantCodeOptions: [],