cq

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

@@ -127,20 +127,18 @@ public class TTrainingNonController extends BaseController
         logger.info("nonParticipants：" + nonParticipants);
         tTrainingService.updateTTraining(tTraining);
         //定期类-关联培训成绩
-        if (tTraining.getTrainingType().equals("10")) {
-            TTrainingDevice tTrainingDevice = new TTrainingDevice();
-            tTrainingDevice.setRegularId(tTraining.getRegularId());
-            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);
+        TTrainingDevice tTrainingDevice = new TTrainingDevice();
+        tTrainingDevice.setRegularId(tTraining.getId());
+        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);
             }
         }
         return toAjax(tTrainingNonService.insertTTrainingNon(tTrainingNon));
@@ -245,20 +243,18 @@ public class TTrainingNonController extends BaseController
         logger.info("nonParticipants：" + nonParticipants);
         tTrainingService.updateTTraining(tTraining);
         //定期类-关联培训成绩
-        if (tTraining.getTrainingType().equals("10")) {
-            TTrainingDevice tTrainingDevice = new TTrainingDevice();
-            tTrainingDevice.setRegularId(tTraining.getRegularId());
-            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);
+        TTrainingDevice tTrainingDevice = new TTrainingDevice();
+        tTrainingDevice.setRegularId(tTraining.getId());
+        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);
             }
         }
         return toAjax(tTrainingNonService.updateTTrainingNon(tTrainingNon));
@@ -325,6 +321,22 @@ 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());
+            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);
+                }
+            }*/
         }
         return toAjax(tTrainingNonService.deleteTTrainingNonByIds(ids));
     }

master/src/main/resources/mybatis/training/TTrainingDeviceMapper.xml

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTTrainingDeviceVo"/>
         <where>  
             <if test="staffId != null  and staffId != ''"> and staff_id = #{staffId}</if>
-            <if test="regularId != null "> and regular_id = #{regularId}</if>
+            <if test="regularId != null "> and d.regular_id = #{regularId}</if>
             <if test="startDate != null "> and start_date = #{startDate}</if>
             <if test="year != null  and year != ''"> and t.years = #{year}</if>
             <if test="trainingType != null and trainingType != ''"> and t.training_type = #{trainingType}</if>

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

@@ -904,7 +904,7 @@ export default {
   methods: {
     colspanMethod({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 0) {
-        const _row = this.setTable(this.companylevelList).one[rowIndex];
+        const _row = this.setTable(this.companylevelList).merge[rowIndex];
         const _col = _row > 0 ? 1 : 0;
         return {
           rowspan: _row,
@@ -912,7 +912,7 @@ export default {
         };
       }
       if (columnIndex === 1 ) {
-        const _row = this.setTable(this.companylevelList).two[rowIndex];
+        const _row = this.setTable(this.companylevelList).merge[rowIndex];
         const _col = _row > 0 ? 1 : 0;
         return {
           rowspan: _row,