LY 调度会议

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

@@ -8,7 +8,9 @@ import com.ruoyi.project.plant.service.ITStaffmgrService;
 import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysDictTypeService;
 import com.ruoyi.project.training.domain.TTrainingCompanylevel;
+import com.ruoyi.project.training.domain.TTrainingMatrix;
 import com.ruoyi.project.training.service.ITTrainingCompanylevelService;
+import com.ruoyi.project.training.service.ITTrainingMatrixService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -41,6 +43,8 @@ public class TTrainingParticipantsController extends BaseController
     private ISysDeptService iSysDeptService;
     @Autowired
     private ISysDictTypeService iSysDictTypeService;
+    @Autowired
+    private ITTrainingMatrixService tTrainingMatrixService;
 
     /**
      * 查询人员-公司级培训关系列表
@@ -101,8 +105,17 @@ public class TTrainingParticipantsController extends BaseController
                 company.add("每" + tTrainingCompanylevels.get(i).getFrequency() + "年一次");
                 companyDate.add("每" + tTrainingCompanylevels.get(i).getFrequency() + "年一次");
             }else {
-                company.add("一次");
-                companyDate.add("一次");
+                TTrainingMatrix matrix = new TTrainingMatrix();
+                matrix.setCourseCode(tTrainingCompanylevels.get(i).getCourseCode());
+                matrix.setDeptId(tTrainingCompanylevels.get(i).getDeptId());
+                List<TTrainingMatrix> matrixList = tTrainingMatrixService.selectTTrainingMatrixList(matrix);
+                if (matrixList.size() > 0) {
+                    company.add(matrixList.get(0).getFrequency());
+                    companyDate.add(matrixList.get(0).getFrequency());
+                }else {
+                    company.add("一次");
+                    companyDate.add("一次");
+                }
             }
             for (TStaffmgr s : staffmgrs) {
                 //按人员筛

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

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.training.mapper.TTrainingMatrixMapper">
-    
+
     <resultMap type="TTrainingMatrix" id="TTrainingMatrixResult">
         <result property="id"    column="id"    />
         <result property="courseCode"    column="course_code"    />
@@ -37,18 +37,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="trainingLevel != null  and trainingLevel != ''"> and training_level = #{trainingLevel}</if>
             <if test="item != null  and item != ''"> and item like concat(concat('%', #{item}), '%')</if>
+            <if test="courseCode != null  and courseCode != ''"> and d.course_code = #{courseCode}</if>
+            <if test="deptId != null  and deptId != ''"> and d.dept_id = #{deptId}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
         order by d.id asc
     </select>
-    
+
     <select id="selectTTrainingMatrixById" parameterType="Long" resultMap="TTrainingMatrixResult">
         <include refid="selectTTrainingMatrixVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTTrainingMatrix" parameterType="TTrainingMatrix">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_training_matrix.NEXTVAL as id FROM DUAL
@@ -135,5 +137,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

ui/src/router/index.js

@@ -215,7 +215,7 @@ export const constantRoutes = [
       {
         path: 'detail/:id(\\d+)',
         component: (resolve) => require(['@/views/plant/dailyMeeting/detail'], resolve),
-        name: 'detail',
+        name: 'dailyMeetingDetail',
         meta: { title: '调度会议详情'}
       },
       {

ui/src/views/plant/dailyMeeting/detail.vue

@@ -237,6 +237,7 @@ import { listDailyMeeting, getDailyMeeting, delDailyMeeting, addDailyMeeting, up
 import { listDailyMeetingConfig, getDailyMeetingConfig} from "@/api/plant/dailyMeetingConfig";
 
 export default {
+  name: "dailyMeetingDetail",
   data () {
     return {
       optModeData: null,

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

@@ -31,7 +31,7 @@
               {{ scope.row[1] }}
             </template>
           </el-table-column>
-          <el-table-column :label="$t('频率')" align="center" fixed width="90">
+          <el-table-column :label="$t('频率')" align="center" :show-overflow-tooltip="true" fixed width="90">
             <template slot-scope="scope">
               {{ scope.row[2] }}
             </template>