LY 会议修改

master/src/main/java/com/ruoyi/project/plant/controller/TMtdDailyController.java

@@ -398,7 +398,7 @@ public class TMtdDailyController extends BaseController {
         }
 
         params.put("venue", tMtdDaily.getVenue());
-
+        params.put("safetyTopic", tMtdDaily.getSafetyTopic());
         params.put("optMode", tMtdDaily.getOptMode());
         params.put("optItem", tMtdDaily.getOptItem());
         params.put("split", tMtdDaily.getSplit());
@@ -411,6 +411,8 @@ public class TMtdDailyController extends BaseController {
 //            params.put("recorder", recorder.getNickName());
 //        }
         params.put("recorder", tMtdDaily.getRecorder());
+
+
         params.put("cracker", tMtdDaily.getAttendCracker());
         params.put("ctm", tMtdDaily.getAttendCtm());
         params.put("cta", tMtdDaily.getAttendCta());

master/src/main/java/com/ruoyi/project/training/elearn/service/impl/TElPaperServiceImpl.java

@@ -356,63 +356,66 @@ public class TElPaperServiceImpl implements ITElPaperService {
             }
         }, "错题本").start();
 
-        new Thread(() -> {
-            TTsNew tTsNew = new TTsNew();
-            tTsNew.setPlanStatus(0L);
-            tTsNew.setStaffId(user.getStaffId());
-            List<TTsNew> tTsNews = tsNewService.selectTTsNewList(tTsNew);
-            if (!CollectionUtils.isEmpty(tTsNews)) {
-                TTsFirstplan tTsFirstplan = new TTsFirstplan();
-                tTsFirstplan.setExamId(paper.getExamId());
-                tTsFirstplan.setNewId(tTsNews.get(0).getNewId());
-                for (TTsFirstplan tsFirstplan : tsFirstplanService.selectTTsFirstplanList(tTsFirstplan)) {
-                    if (paper.getUserScore() >= 80) {
-                        if (StringUtils.isEmpty(tsFirstplan.getScore1())) {
-                            tsFirstplan.setScore1("合格");
-                        } else if (StringUtils.isEmpty(tsFirstplan.getScore2())) {
-                            tsFirstplan.setScore2("合格");
-                        }
-                        tsFirstplan.setPlanStatus(5L);
-                    } else {
-                        if (StringUtils.isEmpty(tsFirstplan.getScore1())) {
-                            tsFirstplan.setScore1("不合格");
-                        }else if (tsFirstplan.getScore1().equals("不合格") && StringUtils.isEmpty(tsFirstplan.getScore2())) {
-                            tsFirstplan.setScore2("不合格");
+        TElExam exam = tElExamMapper.selectTElExamById(paper.getExamId());
+        if (exam.getExamType() == 2) {
+            new Thread(() -> {
+
+                TTrainingbcc param = new TTrainingbcc();
+                param.setExamId(paper.getExamId());
+                List<TTrainingbcc> tTrainingbccList = tTrainingbccMapper.selectTTrainingbccList(param);
+                if (!CollectionUtils.isEmpty(tTrainingbccList)) {
+                    for (TTrainingbcc t: tTrainingbccList
+                    ) {
+                        TTrainingbccDevice device = new TTrainingbccDevice();
+                        device.setRegularId(t.getId());
+                        device.setStaffId(user.getStaffId());
+                        List<TTrainingbccDevice> deviceList =  tTrainingbccDeviceMapper.selectTTrainingbccDeviceList(device);
+                        if (!CollectionUtils.isEmpty(deviceList)) {
+                            for (TTrainingbccDevice d: deviceList
+                            ) {
+                                long pass = objScore >= paper.getQualifyScore() ? 1 : 0;
+                                d.setExamState(pass);
+                                d.setExamNum(d.getExamNum()+ 1);
+                                d.setExamDate(new Date());
+                                tTrainingbccDeviceMapper.updateTTrainingbccDevice(d);
+                            }
                         }
                     }
-                    tsFirstplan.setUserId(user.getUserId());
-                    tsFirstplan.setNickName(user.getNickName());
-                    tTsFirstplanService.updateTTsFirstplan(tsFirstplan);
                 }
-            }
-        }, "导师带徒-装置级培训考试成绩").start();
 
-        new Thread(() -> {
-
-            TTrainingbcc param = new TTrainingbcc();
-            param.setExamId(paper.getExamId());
-            List<TTrainingbcc> tTrainingbccList = tTrainingbccMapper.selectTTrainingbccList(param);
-            if (!CollectionUtils.isEmpty(tTrainingbccList)) {
-                for (TTrainingbcc t: tTrainingbccList
-                     ) {
-                    TTrainingbccDevice device = new TTrainingbccDevice();
-                    device.setRegularId(t.getId());
-                    device.setStaffId(user.getStaffId());
-                    List<TTrainingbccDevice> deviceList =  tTrainingbccDeviceMapper.selectTTrainingbccDeviceList(device);
-                    if (!CollectionUtils.isEmpty(deviceList)) {
-                        for (TTrainingbccDevice d: deviceList
-                             ) {
-                            long pass = objScore >= paper.getQualifyScore() ? 1 : 0;
-                            d.setExamState(pass);
-                            d.setExamNum(d.getExamNum()+ 1);
-                            d.setExamDate(new Date());
-                            tTrainingbccDeviceMapper.updateTTrainingbccDevice(d);
+            },"装置培训考试成绩").start();
+        }else if (exam.getExamType() == 3) {
+            new Thread(() -> {
+                TTsNew tTsNew = new TTsNew();
+                tTsNew.setPlanStatus(0L);
+                tTsNew.setStaffId(user.getStaffId());
+                List<TTsNew> tTsNews = tsNewService.selectTTsNewList(tTsNew);
+                if (!CollectionUtils.isEmpty(tTsNews)) {
+                    TTsFirstplan tTsFirstplan = new TTsFirstplan();
+                    tTsFirstplan.setExamId(paper.getExamId());
+                    tTsFirstplan.setNewId(tTsNews.get(0).getNewId());
+                    for (TTsFirstplan tsFirstplan : tsFirstplanService.selectTTsFirstplanList(tTsFirstplan)) {
+                        if (paper.getUserScore() >= 80) {
+                            if (StringUtils.isEmpty(tsFirstplan.getScore1())) {
+                                tsFirstplan.setScore1("合格");
+                            } else if (StringUtils.isEmpty(tsFirstplan.getScore2())) {
+                                tsFirstplan.setScore2("合格");
+                            }
+                            tsFirstplan.setPlanStatus(5L);
+                        } else {
+                            if (StringUtils.isEmpty(tsFirstplan.getScore1())) {
+                                tsFirstplan.setScore1("不合格");
+                            }else if (tsFirstplan.getScore1().equals("不合格") && StringUtils.isEmpty(tsFirstplan.getScore2())) {
+                                tsFirstplan.setScore2("不合格");
+                            }
                         }
+                        tsFirstplan.setUserId(user.getUserId());
+                        tsFirstplan.setNickName(user.getNickName());
+                        tTsFirstplanService.updateTTsFirstplan(tsFirstplan);
                     }
                 }
-            }
-
-        },"装置培训考试成绩").start();
+            }, "导师带徒-装置级培训考试成绩").start();
+        }
     }
 
     @Override

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

@@ -122,7 +122,7 @@
         <tr class="yellowbg" v-for="(item1, index) in form.items1" :key="'item1'+index">
           <td>1.{{ 3 + index }}</td>
           <td>
-            <el-input type="textarea" :autosize="{ minRows: 1}" v-model="item1.description"></el-input>
+            <el-input type="textarea"  v-model="item1.description"></el-input>
           </td>
           <td>
             <el-select multiple filterable allow-create v-model="item1.actionby">
@@ -154,7 +154,7 @@
         <tr class="greenbg" v-for="(item2, index) in form.items2" :key="'item2'+index">
           <td>2.{{ 1 + index }}</td>
           <td>
-            <el-input type="textarea" :autosize="{ minRows: 1}" v-model="item2.description"></el-input>
+            <el-input type="textarea"  v-model="item2.description"></el-input>
           </td>
           <td>
             <el-select filterable multiple allow-create v-model="item2.actionby">
@@ -186,7 +186,7 @@
         <tr class="yellowbg" v-for="(item3, index) in form.items3" :key="'item3'+index">
           <td>3.{{ 1 + index }}</td>
           <td>
-            <el-input type="textarea" :autosize="{ minRows: 1}" v-model="item3.description"></el-input>
+            <el-input type="textarea"  v-model="item3.description"></el-input>
           </td>
           <td>
             <el-select filterable multiple allow-create v-model="item3.actionby">
@@ -217,7 +217,7 @@
         <tr class="greenbg" v-for="(item4, index) in form.items4" :key="'item4'+index">
           <td>4.{{ 1 + index }}</td>
           <td>
-            <el-input type="textarea" :autosize="{ minRows: 1}" v-model="item4.description"></el-input>
+            <el-input type="textarea"  v-model="item4.description"></el-input>
           </td>
           <td>
             <el-select filterable multiple allow-create v-model="item4.actionby">
@@ -248,7 +248,7 @@
         <tr class="yellowbg" v-for="(item5, index) in form.items5" :key="'item5'+index">
           <td>5.{{ 1 + index }}</td>
           <td>
-            <el-input type="textarea" :autosize="{ minRows: 1}" v-model="item5.description">
+            <el-input type="textarea"  v-model="item5.description">
 
             </el-input>
           </td>

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

@@ -1,15 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="题库编号" prop="code">
-        <el-input
-          v-model="queryParams.code"
-          placeholder="请输入题库编号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="题库名称" prop="title">
         <el-input
           v-model="queryParams.title"
@@ -19,58 +10,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="创建人" prop="createrCode">
-        <el-input
-          v-model="queryParams.createrCode"
-          placeholder="请输入创建人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createdate">
-        <el-date-picker clearable size="small" style="width: 200px"
-                        v-model="queryParams.createdate"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="选择创建时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="更新人" prop="updaterCode">
-        <el-input
-          v-model="queryParams.updaterCode"
-          placeholder="请输入更新人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="更新日期" prop="updatedate">
-        <el-date-picker clearable size="small" style="width: 200px"
-                        v-model="queryParams.updatedate"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="选择更新日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="所属部门" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入所属部门"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备注" prop="remarks">
-        <el-input
-          v-model="queryParams.remarks"
-          placeholder="请输入备注"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -137,6 +76,12 @@
         prop="judgeCount"
         align="center"
       />
+      <el-table-column label="用于练习" align="center" prop="isStudy" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span v-if="scope.row.isStudy == 0" size="small" type="info">否</span>
+          <span v-else-if="scope.row.isStudy == 1" size="small" type="success">是</span>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -177,6 +122,18 @@
         <el-form-item label="题库名称" prop="title">
           <el-input v-model="form.title" placeholder="请输入题库名称"/>
         </el-form-item>
+          <el-form-item label="是否练习" prop="isStudy">
+            <el-radio-group v-model="form.isStudy">
+              <el-radio
+                key="0"
+                :label="0"
+              >否</el-radio>
+              <el-radio
+                key="1"
+                :label="1"
+              >是</el-radio>
+            </el-radio-group>
+          </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注"/>
         </el-form-item>
@@ -334,7 +291,8 @@ export default {
         updaterCode: null,
         updatedate: null,
         deptId: null,
-        remarks: null
+        remarks: null,
+        isStudy: null
       };
       this.resetForm("form");
     },