cq

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

@@ -97,11 +97,13 @@ public class TTrainingController extends BaseController
             t.setMustTraining(t.getPositionNum() + mustTraining);
             TTrainingNon tTrainingNon = new TTrainingNon();
             tTrainingNon.setTrainingId(t.getId());
-            List<TTrainingNon> tTrainingNons = t.gettTrainingNons();
+            List<TTrainingNon> tTrainingNons = tTrainingNonService.selectTTrainingNonList(tTrainingNon);
+
             int i = 0;
             for (TTrainingNon n : tTrainingNons) {
-                if (n.getTrainingDate() == null || n.getTrainingStaff() == null) {
+                if (n.getTrainingDate() == null && n.getTrainingStaff() == null) {
                     i++;
+                    logger.info("nons:" + n);
                 }
             }
             t.setHaveTraining(t.getPositionNum() + mustTraining - i);

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

@@ -52,9 +52,8 @@
   <select id="selectTTrainingList" parameterType="TTraining" resultMap="TTrainingResult">
     select
     (select count(1) from t_staffmgr st where st.del_flag = 0 and st.ACTUALPOST in (SELECT REGEXP_SUBSTR (d.POSITION, '[^,]+', 1,rownum) FROM DUAL CONNECT BY ROWNUM <![CDATA[<=]]> LENGTH (d.POSITION) - LENGTH (REPLACE (d.POSITION, ',', ''))+1)) as positionNum,
-    non.staff_id, non.training_date, non.training_staff, d.id, d.regular_id, d.content, d.unit, d.training_type, d.pic_url, d.plant_code, d.course, d.courseid, d.period, d.duration, d.trainer, d.position, d.designated_position, d.designated_staff, d.years, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.remarks, d.dept_id, d.course_startdate, d.course_enddate, d.isfinish, d.confirmor , d.non_participants, s.dept_name from t_training d
+    d.id, d.regular_id, d.content, d.unit, d.training_type, d.pic_url, d.plant_code, d.course, d.courseid, d.period, d.duration, d.trainer, d.position, d.designated_position, d.designated_staff, d.years, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.remarks, d.dept_id, d.course_startdate, d.course_enddate, d.isfinish, d.confirmor , d.non_participants, s.dept_name from t_training d
     left join sys_dept s on s.dept_id = d.dept_id
-    left join t_training_non non on non.training_id = d.id
     <where>
       <if test="course != null  and course != ''"> and course like concat(concat('%', #{course}), '%')</if>
       <if test="position != null  and position != ''"> and position = #{position}</if>

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

@@ -814,7 +814,7 @@ export default {
           }
           _this.trainingList[key].trainer = parentName;
         })
-        this.total = response.rows.length;
+        this.total = response.total;
         this.loading = false;
       });
     },