|
|
@@ -192,14 +192,17 @@ public class TTrainingController extends BaseController
|
|
|
//查找跟这条培训计划相关联的装置级培训记录 修改其培训的年份，课程名称和课程代码
|
|
|
//如果是定期类 就修改下培训计划里面的内容
|
|
|
if(tTraining.getTrainingType().equals(10)){
|
|
|
- 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 );
|
|
|
+ if (tTraining.getRegularId() == null) {
|
|
|
+ logger.info("没有对应培训计划");
|
|
|
+ }else {
|
|
|
+ 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) {
|
