|
@@ -23,9 +23,11 @@ import com.ruoyi.project.system.service.ISysDeptService;
|
|
|
import com.ruoyi.project.system.service.ISysDictTypeService;
|
|
|
import com.ruoyi.project.training.domain.TTrainingDevice;
|
|
|
import com.ruoyi.project.training.domain.TTrainingNon;
|
|
|
+import com.ruoyi.project.training.domain.TTrainingRegular;
|
|
|
import com.ruoyi.project.training.mapper.TTrainingMapper;
|
|
|
import com.ruoyi.project.training.service.ITTrainingDeviceService;
|
|
|
import com.ruoyi.project.training.service.ITTrainingNonService;
|
|
|
+import com.ruoyi.project.training.service.ITTrainingRegularService;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
|
|
|
import org.apache.poi.ss.usermodel.*;
|
|
@@ -61,6 +63,9 @@ public class TTrainingController extends BaseController
|
|
|
@Autowired
|
|
|
private ITTrainingService tTrainingService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ITTrainingRegularService tTrainingRegularService;
|
|
|
+
|
|
|
@Autowired
|
|
|
private ISysDeptService iSysDeptService;
|
|
|
|
|
@@ -184,6 +189,13 @@ public class TTrainingController extends BaseController
|
|
|
{
|
|
|
tTraining.setUpdaterCode(getUserId().toString());
|
|
|
tTraining.setUpdatedate(new Date());
|
|
|
+ //查找跟这条培训计划相关联的装置级培训记录 修改其培训的年份,课程名称和课程代码
|
|
|
+ TTrainingRegular t= tTrainingRegularService.selectTTrainingRegularById(tTraining.getRegularId());
|
|
|
+ t.setItem(tTraining.getCourse());
|
|
|
+ t.setCourseCode(tTraining.getCourseid());
|
|
|
+ t.setYear(tTraining.getYear());
|
|
|
+ t.setDelFlag(tTraining.getDelFlag());
|
|
|
+ int result= tTrainingRegularService.updateTTrainingRegular(t );
|
|
|
TTraining oldTraining = tTrainingService.selectTTrainingById(tTraining.getId());
|
|
|
int i = 0;
|
|
|
if (oldTraining.getPosition() != null) {
|