cq

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

@@ -321,22 +321,16 @@ public class TTrainingNonController extends BaseController
             logger.info("isFinish：" + isFinish);
             logger.info("nonParticipants：" + nonParticipants);
             tTrainingService.updateTTraining(tTraining);
-            /*//定期类-关联培训成绩
+            //定期类-关联培训成绩
             TTrainingDevice tTrainingDevice = new TTrainingDevice();
             tTrainingDevice.setRegularId(tTraining.getId());
-            tTrainingDevice.setStaffId(id.toString());
+            tTrainingDevice.setStaffId(tTrainingNon.getStaffId());
             List<TTrainingDevice> tTrainingDevices = tTrainingDeviceService.selectTTrainingDeviceList(tTrainingDevice);
-            for (TTrainingDevice d : tTrainingDevices) {
-                if (d.getStaffId().equals(tTrainingNon.getStaffId())) {
-                    if (tTrainingNon.getTrainingDate() != null) {
-                        d.setStartDate(tTrainingNon.getTrainingDate());
-                    }else {
-                        d.setStartDate(null);
-                    }
-                    d.setSupplementary("1");
-                    tTrainingDeviceService.updateTTrainingDevice(d);
-                }
-            }*/
+            if (tTrainingDevices.get(0).getStaffId().equals(tTrainingNon.getStaffId())) {
+                tTrainingDevices.get(0).setStartDate(tTraining.getStartDate());
+                tTrainingDevices.get(0).setSupplementary("0");
+                tTrainingDeviceService.updateTTrainingDevice(tTrainingDevices.get(0));
+            }
         }
         return toAjax(tTrainingNonService.deleteTTrainingNonByIds(ids));
     }