cq

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

@@ -98,6 +98,7 @@ public class TTrainingController extends BaseController
             TTrainingNon tTrainingNon = new TTrainingNon();
             tTrainingNon.setTrainingId(t.getId());
             List<TTrainingNon> tTrainingNons = t.gettTrainingNons();
+            logger.info("tTrainingNons:" + tTrainingNons);
             int i = 0;
             for (TTrainingNon n : tTrainingNons) {
                 if (n.getTrainingDate() == null || n.getTrainingStaff() == null) {

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

@@ -38,6 +38,7 @@
     <result property="regularId"    column="regular_id"    />
     <result property="positionNum"    column="positionNum"    />
     <collection property="tTrainingNons" javaType="ArrayList" ofType="TTrainingNon">
+      <result property="staffId"    column="staff_id"    />
       <result property="trainingDate"    column="training_date"    />
       <result property="trainingStaff"    column="training_staff"    />
     </collection>
@@ -50,8 +51,8 @@
 
   <select id="selectTTrainingList" parameterType="TTraining" resultMap="TTrainingResult">
     select
-    (select count(1) from t_staffmgr st where 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.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
+    (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
     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>