LY 公司培训成绩

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

@@ -3,6 +3,8 @@ package com.ruoyi.project.training.controller;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Iterator;
 import java.util.List;
 
 import com.alibaba.fastjson.JSON;
@@ -17,6 +19,7 @@ import com.ruoyi.project.system.service.ISysDictTypeService;
 import com.ruoyi.project.training.domain.TNewemployee;
 import com.ruoyi.project.training.domain.TTrainingCompanylevel;
 import com.ruoyi.project.training.service.ITTrainingCompanylevelService;
+import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -75,7 +78,28 @@ public class TTrainingParticipantsController extends BaseController
         List<TTrainingCompanylevel> tTrainingCompanylevels = tTrainingCompanylevelService.selectTTrainingCompanylevelList(new TTrainingCompanylevel());
         TStaffmgr staffmgr = new TStaffmgr();
         staffmgr.setUnits("10,18,20");
+        staffmgr.setLeftYear(String.valueOf(Calendar.getInstance().YEAR));
         List<TStaffmgr> staffmgrs = tStaffmgrService.selectRecordList(staffmgr);
+        try {
+            //判断离职
+            if (!StringUtils.isEmpty(staffmgr.getLeftYear())) {
+                Iterator<TStaffmgr> iterator = staffmgrs.iterator();
+                while (iterator.hasNext()) {
+                    TStaffmgr t = iterator.next();
+                    if (t.getLeftDate() != null && t.getDelFlag() == 9){
+                        Calendar cal = Calendar.getInstance();
+                        cal.setTime(t.getLeftDate());
+                        Integer year = cal.get(Calendar.YEAR);//获取年
+                        if (year < Integer.parseInt(staffmgr.getLeftYear())) {
+                            logger.debug(t.getName() + "离职年份小于数据");
+                            iterator.remove();
+                        }
+                    }
+                }
+            }
+        }catch (Exception e) {
+            logger.error(e.toString());
+        }
         for (int i = 0; i < tTrainingCompanylevels.size(); i++) {
             //每一类公司级培训数据
             List<String> company = new ArrayList<>();

master/src/main/resources/freeMaker/monthFMaker.ftl

@@ -42,7 +42,7 @@
 				<tr style="height:15pt">
 					<td colspan="2" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:87.85pt">
 						<p style="margin:0pt">
-							<span style="font-family:SimSun; font-size:10pt; font-weight:bold">${month.plantCode}装置（单元）</span>
+							<span style="font-family:SimSun; font-size:10pt; font-weight:bold">${month.plantCode!''}装置（单元）</span>
 						</p>
 					</td>
 					<td colspan="9" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:511.3pt">
@@ -52,12 +52,12 @@
 					</td>
 					<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:58.95pt">
 						<p style="margin:0pt; text-align:right">
-							<span style="font-family:SimSun; font-size:10pt; font-weight:bold">${checkDateYear}年</span>
+							<span style="font-family:SimSun; font-size:10pt; font-weight:bold">${checkDateYear!''}年</span>
 						</p>
 					</td>
 					<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:31.95pt">
 						<p style="margin:0pt; text-align:right">
-							<span style="font-family:SimSun; font-size:10pt; font-weight:bold">${checkDateMonth}月</span>
+							<span style="font-family:SimSun; font-size:10pt; font-weight:bold">${checkDateMonth!''}月</span>
 						</p>
 					</td>
 				</tr>
@@ -106,7 +106,7 @@
 					</td>
 					<td rowspan="7" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:51.95pt">
 						<p style="margin:0pt; text-align:center">
-							<span style="font-family:SimSun; font-size:10pt">${month.rqUnit}</span>
+							<span style="font-family:SimSun; font-size:10pt">${month.rqUnit!''}</span>
 						</p>
 					</td>
 					<td rowspan="7" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:51.7pt">
@@ -362,7 +362,7 @@
 					</td>
 					<td rowspan="6" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:51.95pt">
 						<p style="margin:0pt; text-align:center">
-							<span style="font-family:SimSun; font-size:10pt">${month.gdUnit}</span>
+							<span style="font-family:SimSun; font-size:10pt">${month.gdUnit!''}</span>
 						</p>
 					</td>
 					<td rowspan="6" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:51.7pt">
@@ -581,7 +581,7 @@
 					</td>
 					<td rowspan="7" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:51.95pt">
 						<p style="margin:0pt; text-align:center">
-							<span style="font-family:SimSun; font-size:10pt">${month.glUnit}</span>
+							<span style="font-family:SimSun; font-size:10pt">${month.glUnit!''}</span>
 						</p>
 					</td>
 					<td rowspan="7" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:51.7pt">
@@ -864,7 +864,7 @@
 							<span style="font-family:SimSun; font-size:11pt"><#if gybmSign??>${gybmSign}</#if></span>
 						</p>
 						<p style="margin:0pt; text-align: left">
-							<span style="font-family:SimSun; font-size:11pt">日期：<#if gybmEndTime??>${gybmEndTime}</#if></span>
+							<span style="font-family:SimSun; font-size:11pt">日期：<#if gybmEndTime??>${gybmEndTime!''}</#if></span>
 						</p>
 					</td>
 				</tr>
@@ -957,42 +957,42 @@
 						</td>
 						<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:61.2pt">
 							<p style="margin:0pt; text-align:center">
-								<span style="font-family:SimSun; font-size:11pt; font-weight:bold">${list.devno}</span>
+								<span style="font-family:SimSun; font-size:11pt; font-weight:bold">${list.devno!''}</span>
 							</p>
 						</td>
 						<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:61.2pt">
 							<p style="margin:0pt; text-align:center">
-								<span style="font-family:SimSun; font-size:11pt; font-weight:bold">${(list.startDate)?string("yyyy-MM-dd")}</span>
+								<span style="font-family:SimSun; font-size:11pt; font-weight:bold"><#if list.startDate??>${(list.startDate)?string("yyyy-MM-dd")}</#if></span>
 							</p>
 						</td>
 						<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:52.2pt">
 							<p style="margin:0pt; text-align:center">
-								<span style="font-family:SimSun; font-size:11pt; font-weight:bold">${list.problem}</span>
+								<span style="font-family:SimSun; font-size:11pt; font-weight:bold">${list.problem!''}</span>
 							</p>
 						</td>
 						<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:173.7pt">
 							<p style="margin:0pt; text-align:center">
-								<span style="font-family:SimSun; font-size:11pt; font-weight:bold">${list.inspector}</span>
+								<span style="font-family:SimSun; font-size:11pt; font-weight:bold">${list.inspector!''}</span>
 							</p>
 						</td>
 						<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:47.7pt">
 							<p style="margin:0pt; text-align:center">
-								<span style="font-family:SimSun; font-size:11pt; font-weight:bold">${list.approach}</span>
+								<span style="font-family:SimSun; font-size:11pt; font-weight:bold">${list.approach!''}</span>
 							</p>
 						</td>
 						<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:110.7pt">
 							<p style="margin:0pt; text-align:center">
-								<span style="font-family:SimSun; font-size:11pt; font-weight:bold">${list.dealUnit}</span>
+								<span style="font-family:SimSun; font-size:11pt; font-weight:bold">${list.dealUnit!''}</span>
 							</p>
 						</td>
 						<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:52.2pt">
 							<p style="margin:0pt; text-align:center">
-								<span style="font-family:SimSun; font-size:11pt; font-weight:bold">${(list.endDate)?string("yyyy-MM-dd")}</span>
+								<span style="font-family:SimSun; font-size:11pt; font-weight:bold"><#if list.endDate??> ${(list.endDate)?string("yyyy-MM-dd")}</#if></span>
 							</p>
 						</td>
 						<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:42pt">
 							<p style="margin:0pt; text-align:center">
-								<span style="font-family:SimSun; font-size:11pt; font-weight:bold">${list.remarks}</span>
+								<span style="font-family:SimSun; font-size:11pt; font-weight:bold">${list.remarks!''}</span>
 							</p>
 						</td>
 					</tr>

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

@@ -191,11 +191,10 @@
         where del_flag = 0
     </update>
 
-    <update id="deleteTParticipantsByCompanyId">
-        update t_training_participants
-        set del_flag = 2
+    <delete id="deleteTParticipantsByCompanyId">
+        delete from t_training_participants
         where company_id = #{companyId}
-    </update>
+    </delete>
 
     <delete id="duplicateParticipants">
         DELETE

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

@@ -183,7 +183,7 @@
           </el-col>
         </el-row>
         <el-form-item :label="$t('参会人员名单')" prop="staffId">
-          <el-input v-model="form.staffId" :placeholder="$t('请输入') + $t('参会人员名单')" />
+          <el-input v-model="form.staffId" :placeholder="$t('请输入') + $t('参会人员名单')" type="textarea"/>
         </el-form-item>
         <el-form-item :label="$t('备注')" prop="remarks">
           <el-input v-model="form.remarks" :placeholder="$t('请输入') + $t('备注')" />