-人员数据分析添加平均年龄

-培训成绩修改装置级培训记录

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

@@ -11,7 +11,6 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.config.RuoYiConfig;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.domain.BaseEntity;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.common.domain.DataEntity;
 import com.ruoyi.project.plant.domain.TStaffmgr;
@@ -53,8 +52,7 @@ import java.util.concurrent.Executors;
  */
 @RestController
 @RequestMapping("/plant/staffmgr")
-public class TStaffmgrController extends BaseController
-{
+public class TStaffmgrController extends BaseController {
     @Autowired
     private ITStaffmgrService tStaffmgrService;
 
@@ -102,8 +100,7 @@ public class TStaffmgrController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('plant:staffmgr:list')")
     @GetMapping("/listSaiExecutors")
-    public AjaxResult listSaiExecutors()
-    {
+    public AjaxResult listSaiExecutors() {
         return AjaxResult.success(tStaffmgrService.selectSaiExecutors());
     }
 
@@ -112,8 +109,7 @@ public class TStaffmgrController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('plant:staffmgr:list')")
     @GetMapping("/listSaiInspectors")
-    public AjaxResult listSaiInspectors()
-    {
+    public AjaxResult listSaiInspectors() {
         return AjaxResult.success(tStaffmgrService.selectSaiInspectors());
     }
 
@@ -122,15 +118,14 @@ public class TStaffmgrController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('plant:staffmgr:query')")
     @GetMapping(value = "/loginStaffInfo")
-    public AjaxResult getLoginStaffInfo()
-    {
+    public AjaxResult getLoginStaffInfo() {
         Long userId = getUserId();
         SysUser sysUser = sysUserService.selectUserById(userId);
         String staffId = sysUser.getStaffId();
         TStaffmgr staffmgr = tStaffmgrService.selectTStaffmgrByStaffId(staffId);
         if (staffmgr != null) {
             staffmgr.setUserId(userId.toString());
-            if (staffmgr.getActualpost().contains("14")||staffmgr.getActualpost().contains("12")){
+            if (staffmgr.getActualpost().contains("14") || staffmgr.getActualpost().contains("12")) {
                 staffmgr.setChecker(true);
             }
         }
@@ -139,12 +134,12 @@ public class TStaffmgrController extends BaseController
 
     /**
      * 获取当前用户id
+     *
      * @return 当前用户id
      */
     @PreAuthorize("@ss.hasPermi('plant:staffmgr:query')")
     @GetMapping("/getStaffId")
-    public AjaxResult getStaffId()
-    {
+    public AjaxResult getStaffId() {
         Long userId = getUserId();
         SysUser sysUser = sysUserService.selectUserById(userId);
         String staffId = sysUser.getStaffId();
@@ -153,12 +148,12 @@ public class TStaffmgrController extends BaseController
 
     /**
      * 判断当前用户是否为导师
+     *
      * @return 是否为导师
      */
     @PreAuthorize("@ss.hasPermi('plant:staffmgr:query')")
     @GetMapping("/isMentor")
-    public AjaxResult isMentor()
-    {
+    public AjaxResult isMentor() {
         // 是否为导师
         boolean isMentor = false;
         ServletUtils.getParameter("sexs");
@@ -182,8 +177,7 @@ public class TStaffmgrController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('plant:staffmgr:list')")
     @GetMapping("/listMentors")
-    public AjaxResult listMentors(TStaffmgr tStaffmgr)
-    {
+    public AjaxResult listMentors(TStaffmgr tStaffmgr) {
         ServletUtils.getParameter("sexs");
         return AjaxResult.success(tStaffmgrService.selectMentorList(tStaffmgr));
     }
@@ -192,8 +186,7 @@ public class TStaffmgrController extends BaseController
      * 查询人员管理列表--包含离职人员
      */
     @GetMapping("/listAll")
-    public TableDataInfo listAll(TStaffmgr tStaffmgr)
-    {
+    public TableDataInfo listAll(TStaffmgr tStaffmgr) {
         ServletUtils.getParameter("sexs");
         startPage();
         logger.info("staffmgr:" + tStaffmgr);
@@ -206,8 +199,7 @@ public class TStaffmgrController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('plant:staffmgr:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TStaffmgr tStaffmgr)
-    {
+    public TableDataInfo list(TStaffmgr tStaffmgr) {
         ServletUtils.getParameter("sexs");
         startPage();
         logger.info("staffmgr:" + tStaffmgr);
@@ -215,12 +207,31 @@ public class TStaffmgrController extends BaseController
         return getDataTable(list);
     }
 
+    @PreAuthorize("@ss.hasPermi('plant:staffmgr:list')")
+    @GetMapping("/averageAge")
+    public AjaxResult averageAge(TStaffmgr tStaffmgr) {
+        int sumAge = 0;
+        Calendar calendar = Calendar.getInstance();
+        List<TStaffmgr> tStaffmgrs = tStaffmgrService.selectTStaffmgrList(tStaffmgr);
+        for (TStaffmgr staffmgr : tStaffmgrs) {
+            if (staffmgr.getBirthday() != null) {
+                calendar.setTime(staffmgr.getBirthday());
+                int birthYear = calendar.get(Calendar.YEAR);
+                calendar.setTime(new Date());
+                int currentYear = calendar.get(Calendar.YEAR);
+                sumAge += (currentYear - birthYear);
+            }
+        }
+        int result = sumAge / tStaffmgrs.size();
+        return AjaxResult.success(result);
+    }
+
+
     /**
      * 通过部门查询人员列表
      */
     @GetMapping("/listByDeptAndTeam")
-    public TableDataInfo listByDeptAndTeam(TStaffmgr tStaffmgr)
-    {
+    public TableDataInfo listByDeptAndTeam(TStaffmgr tStaffmgr) {
         startPage();
         List<TStaffmgr> list = tStaffmgrService.selectTStaffmgrListByDeptAndTeam(tStaffmgr);
         return getDataTable(list);
@@ -231,8 +242,7 @@ public class TStaffmgrController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('plant:staffmgr:list')")
     @GetMapping("/getAllList")
-    public TableDataInfo getAllList(TStaffmgr tStaffmgr)
-    {
+    public TableDataInfo getAllList(TStaffmgr tStaffmgr) {
         ServletUtils.getParameter("sexs");
         startPage();
         logger.info("staffmgr:" + tStaffmgr);
@@ -243,7 +253,7 @@ public class TStaffmgrController extends BaseController
                 Iterator<TStaffmgr> iterator = list.iterator();
                 while (iterator.hasNext()) {
                     TStaffmgr t = iterator.next();
-                    if (t.getLeftDate() != null && t.getDelFlag() == 9){
+                    if (t.getLeftDate() != null && t.getDelFlag() == 9) {
                         Calendar cal = Calendar.getInstance();
                         cal.setTime(t.getLeftDate());
                         Integer year = cal.get(Calendar.YEAR);//获取年
@@ -254,7 +264,7 @@ public class TStaffmgrController extends BaseController
                     }
                 }
             }
-        }catch (Exception e) {
+        } catch (Exception e) {
             logger.error(e.toString());
         }
 
@@ -267,8 +277,7 @@ public class TStaffmgrController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('plant:staffmgr:list')")
     @GetMapping("/selectTime")
-    public TableDataInfo selectTime(TStaffmgr tStaffmgr)
-    {
+    public TableDataInfo selectTime(TStaffmgr tStaffmgr) {
         startPage();
         List<TStaffmgr> list = tStaffmgrService.selectRecordList(tStaffmgr);
         try {
@@ -277,7 +286,7 @@ public class TStaffmgrController extends BaseController
                 Iterator<TStaffmgr> iterator = list.iterator();
                 while (iterator.hasNext()) {
                     TStaffmgr t = iterator.next();
-                    if (t.getLeftDate() != null && t.getDelFlag() == 9){
+                    if (t.getLeftDate() != null && t.getDelFlag() == 9) {
                         Calendar cal = Calendar.getInstance();
                         cal.setTime(t.getLeftDate());
                         Integer year = cal.get(Calendar.YEAR);//获取年
@@ -288,7 +297,7 @@ public class TStaffmgrController extends BaseController
                     }
                 }
             }
-        }catch (Exception e) {
+        } catch (Exception e) {
             logger.error(e.toString());
         }
         logger.info("selectTime:" + list.size());
@@ -310,8 +319,8 @@ public class TStaffmgrController extends BaseController
                                     if (t.getTrainingDuration() != null) {
                                         try {
                                             time = time + Double.parseDouble(t.getTrainingDuration());
-                                        }catch (Exception e) {
-                                            logger.error("转double出错",JSON.toJSONString(e));
+                                        } catch (Exception e) {
+                                            logger.error("转double出错", JSON.toJSONString(e));
                                         }
 
                                     }
@@ -320,7 +329,7 @@ public class TStaffmgrController extends BaseController
                         }
                     }
                     list.get(finalI).setTrainingTime(String.valueOf(time));
-                }finally {
+                } finally {
                     latch.countDown(); //线程计数
                 }
             });
@@ -336,12 +345,12 @@ public class TStaffmgrController extends BaseController
 
     /**
      * 查询人员管理列表
+     *
      * @return
      */
     @PreAuthorize("@ss.hasPermi('plant:staffmgr:list')")
     @GetMapping("/ogzList")
-    public List<TStaffmgr> ogzList(TStaffmgr tStaffmgr)
-    {
+    public List<TStaffmgr> ogzList(TStaffmgr tStaffmgr) {
         List<TStaffmgr> list = tStaffmgrService.selectTStaffmgrList(tStaffmgr);
         return list;
     }
@@ -351,8 +360,7 @@ public class TStaffmgrController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('plant:staffmgr:list')")
     @GetMapping("/pIdList")
-    public AjaxResult pIdList(TStaffmgr tStaffmgr)
-    {
+    public AjaxResult pIdList(TStaffmgr tStaffmgr) {
         List<TStaffmgr> list = tStaffmgrService.selectTStaffmgrList(tStaffmgr);
         return AjaxResult.success(list);
     }
@@ -362,8 +370,7 @@ public class TStaffmgrController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('plant:staffmgr:list')")
     @GetMapping("/leftList")
-    public TableDataInfo leftList(TStaffmgr tStaffmgr)
-    {
+    public TableDataInfo leftList(TStaffmgr tStaffmgr) {
         startPage();
         List<TStaffmgr> list = tStaffmgrService.selectLeftTStaffmgrList(tStaffmgr);
         return getDataTable(list);
@@ -371,19 +378,18 @@ public class TStaffmgrController extends BaseController
 
     //学历统计
     @GetMapping("/eduData")
-    public List<DataEntity> eduData(TStaffmgr param)
-    {
+    public List<DataEntity> eduData(TStaffmgr param) {
         List<DataEntity> list = tStaffmgrMapper.selectEduData(param);
         List<SysDictData> education = iSysDictTypeService.selectDictDataByType("EDUCATION");
-        for (DataEntity d: list
-             ) {
-            for (SysDictData s: education
-                 ) {
-                if (StringUtils.isBlank(d.getDataName())){
+        for (DataEntity d : list
+        ) {
+            for (SysDictData s : education
+            ) {
+                if (StringUtils.isBlank(d.getDataName())) {
                     d.setDataName("未知");
                     break;
                 }
-                if (s.getDictValue().equals(d.getDataName())){
+                if (s.getDictValue().equals(d.getDataName())) {
                     d.setDataName(s.getDictLabel());
                     break;
                 }
@@ -394,19 +400,18 @@ public class TStaffmgrController extends BaseController
 
     //年龄统计
     @GetMapping("/ageData")
-    public List<DataEntity> ageData(TStaffmgr param)
-    {
+    public List<DataEntity> ageData(TStaffmgr param) {
         List<DataEntity> list = tStaffmgrMapper.selectAgeData(param);
         List<SysDictData> education = iSysDictTypeService.selectDictDataByType("EDUCATION");
-        for (DataEntity d: list
+        for (DataEntity d : list
         ) {
-            for (SysDictData s: education
+            for (SysDictData s : education
             ) {
-                if (StringUtils.isBlank(d.getDataName())){
+                if (StringUtils.isBlank(d.getDataName())) {
                     d.setDataName("未知");
                     break;
                 }
-                if (s.getDictValue().equals(d.getDataName())){
+                if (s.getDictValue().equals(d.getDataName())) {
                     d.setDataName(s.getDictLabel());
                     break;
                 }
@@ -417,19 +422,18 @@ public class TStaffmgrController extends BaseController
 
     //英语统计
     @GetMapping("/engData")
-    public List<DataEntity> engData(TStaffmgr param)
-    {
+    public List<DataEntity> engData(TStaffmgr param) {
         List<DataEntity> list = tStaffmgrMapper.selectEngData(param);
         List<SysDictData> englishability = iSysDictTypeService.selectDictDataByType("ENGLISHABILITY");
-        for (DataEntity d: list
+        for (DataEntity d : list
         ) {
-            for (SysDictData s: englishability
+            for (SysDictData s : englishability
             ) {
-                if (StringUtils.isBlank(d.getDataName())){
+                if (StringUtils.isBlank(d.getDataName())) {
                     d.setDataName("未知");
                     break;
                 }
-                if (s.getDictValue().equals(d.getDataName())){
+                if (s.getDictValue().equals(d.getDataName())) {
                     d.setDataName(s.getDictLabel());
                     break;
                 }
@@ -440,19 +444,18 @@ public class TStaffmgrController extends BaseController
 
     //班值统计
     @GetMapping("/teamData")
-    public List<DataEntity> teamData(TStaffmgr param)
-    {
+    public List<DataEntity> teamData(TStaffmgr param) {
         List<DataEntity> list = tStaffmgrMapper.selectTeamData(param);
         List<SysDictData> englishability = iSysDictTypeService.selectDictDataByType("TEAM_DIVIDE");
-        for (DataEntity d: list
+        for (DataEntity d : list
         ) {
-            for (SysDictData s: englishability
+            for (SysDictData s : englishability
             ) {
-                if (StringUtils.isBlank(d.getDataName())){
+                if (StringUtils.isBlank(d.getDataName())) {
                     d.setDataName("未知");
                     break;
                 }
-                if (s.getDictValue().equals(d.getDataName())){
+                if (s.getDictValue().equals(d.getDataName())) {
                     d.setDataName(s.getDictLabel());
                     break;
                 }
@@ -467,8 +470,7 @@ public class TStaffmgrController extends BaseController
     @PreAuthorize("@ss.hasPermi('plant:staffmgr:export')")
     @Log(title = "人员管理", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TStaffmgr tStaffmgr)
-    {
+    public AjaxResult export(TStaffmgr tStaffmgr) {
         List<TStaffmgr> list = tStaffmgrService.selectTStaffmgrList(tStaffmgr);
         ExcelUtil<TStaffmgr> util = new ExcelUtil<TStaffmgr>(TStaffmgr.class);
         return util.exportExcel(list, "staffmgr");
@@ -479,8 +481,7 @@ public class TStaffmgrController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('plant:staffmgr:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         TStaffmgr staffmgr = tStaffmgrService.selectTStaffmgrById(id);
         return AjaxResult.success(staffmgr);
     }
@@ -490,10 +491,9 @@ public class TStaffmgrController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('plant:staffmgr:query')")
     @GetMapping("/byStaffId/{staffIds}")
-    public AjaxResult byStaffId(@PathVariable String[] staffIds)
-    {
+    public AjaxResult byStaffId(@PathVariable String[] staffIds) {
         List<TStaffmgr> staffmgrs = new ArrayList<TStaffmgr>();
-        for (int i = 0; i <staffIds.length ; i++) {
+        for (int i = 0; i < staffIds.length; i++) {
             TStaffmgr staffmgr = tStaffmgrService.selectTStaffmgrByStaffId(staffIds[i]);
             staffmgrs.add(staffmgr);
         }
@@ -506,8 +506,7 @@ public class TStaffmgrController extends BaseController
     @PreAuthorize("@ss.hasPermi('plant:staffmgr:add')")
     @Log(title = "人员管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TStaffmgr tStaffmgr)
-    {
+    public AjaxResult add(@RequestBody TStaffmgr tStaffmgr) {
         //判断是否重复员工
         TStaffmgr tStaffmgr1 = tStaffmgrMapper.selectTStaffmgrByStaffId(tStaffmgr.getStaffid());
         if (tStaffmgr1 != null) {
@@ -516,7 +515,7 @@ public class TStaffmgrController extends BaseController
 
         int insertResult = tStaffmgrService.insertTStaffmgr(tStaffmgr);
         tStaffmgr.setCreaterCode(getUserId().toString());
-        if (tStaffmgr.getUnit().equals("10") || tStaffmgr.getUnit().equals("18")|| tStaffmgr.getUnit().equals("20")|| tStaffmgr.getUnit().equals("30")) {
+        if (tStaffmgr.getUnit().equals("10") || tStaffmgr.getUnit().equals("18") || tStaffmgr.getUnit().equals("20") || tStaffmgr.getUnit().equals("30")) {
             TTrainingrecords tTrainingrecords = new TTrainingrecords();
             tTrainingrecords.setStaffId(tStaffmgr.getId());
             tTrainingrecords.setPlantCode(tStaffmgr.getPlantCode());
@@ -580,8 +579,7 @@ public class TStaffmgrController extends BaseController
     @PreAuthorize("@ss.hasPermi('plant:staffmgr:edit')")
     @Log(title = "人员管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TStaffmgr tStaffmgr)
-    {
+    public AjaxResult edit(@RequestBody TStaffmgr tStaffmgr) {
         //判断是否重复员工
         TStaffmgr tStaffmgr1 = tStaffmgrMapper.selectTStaffmgrByStaffId(tStaffmgr.getStaffid());
         if (tStaffmgr1 != null) {
@@ -606,7 +604,7 @@ public class TStaffmgrController extends BaseController
         if (!tStaffmgr.getTeam().equals("18")) {
             //非W班组人员
             TWorklicense tWorklicense = tWorklicenseService.selectTWorklicenseByEmployeeid(tStaffmgr.getStaffid());
-            if (tWorklicense == null){
+            if (tWorklicense == null) {
                 TWorklicense newWorklicense = new TWorklicense();
                 newWorklicense.setPlantCode(tStaffmgr.getPlantCode());
                 newWorklicense.setClasses(tStaffmgr.getTeam());
@@ -615,7 +613,7 @@ public class TStaffmgrController extends BaseController
                 newWorklicense.setPost(tStaffmgr.getActualpost());
                 newWorklicense.setDeptId(tStaffmgr.getDeptId());
                 tWorklicenseService.insertTWorklicense(newWorklicense);
-            }else {
+            } else {
                 tWorklicense.setPlantCode(tStaffmgr.getPlantCode());
                 tWorklicense.setClasses(tStaffmgr.getTeam());
                 tWorklicense.setName(tStaffmgr.getName());
@@ -634,11 +632,10 @@ public class TStaffmgrController extends BaseController
     @PreAuthorize("@ss.hasPermi('plant:staffmgr:remove')")
     @Log(title = "人员管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        for (int i = 0; i <ids.length ; i++) {
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        for (int i = 0; i < ids.length; i++) {
             TTrainingrecords tTrainingrecords = tTrainingrecordsService.selectTTrainingrecordsBystaffId(ids[i]);
-            if (tTrainingrecords!= null) {
+            if (tTrainingrecords != null) {
                 tTrainingrecords.setDelFlag(2l);
                 tTrainingrecordsService.updateTTrainingrecords(tTrainingrecords);
             }
@@ -673,10 +670,9 @@ public class TStaffmgrController extends BaseController
     @PreAuthorize("@ss.hasPermi('plant:staffmgr:remove')")
     @Log(title = "人员管理", businessType = BusinessType.DELETE)
     @GetMapping("/left/{id}")
-    public AjaxResult removeLeft(@PathVariable Long id)
-    {
+    public AjaxResult removeLeft(@PathVariable Long id) {
         TTrainingrecords tTrainingrecords = tTrainingrecordsService.selectTTrainingrecordsBystaffId(id);
-        if (tTrainingrecords!= null) {
+        if (tTrainingrecords != null) {
             tTrainingrecords.setDelFlag(9l);
             tTrainingrecordsService.updateTTrainingrecords(tTrainingrecords);
         }
@@ -694,10 +690,9 @@ public class TStaffmgrController extends BaseController
     @PreAuthorize("@ss.hasPermi('plant:staffmgr:remove')")
     @Log(title = "人员管理", businessType = BusinessType.DELETE)
     @GetMapping("/retire/{id}")
-    public AjaxResult removeRetire(@PathVariable Long id)
-    {
+    public AjaxResult removeRetire(@PathVariable Long id) {
         TTrainingrecords tTrainingrecords = tTrainingrecordsService.selectTTrainingrecordsBystaffId(id);
-        if (tTrainingrecords!= null) {
+        if (tTrainingrecords != null) {
             tTrainingrecords.setDelFlag(9l);
             tTrainingrecordsService.updateTTrainingrecords(tTrainingrecords);
         }
@@ -715,10 +710,9 @@ public class TStaffmgrController extends BaseController
     @PreAuthorize("@ss.hasPermi('plant:staffmgr:remove')")
     @Log(title = "人员管理", businessType = BusinessType.DELETE)
     @GetMapping("/reLeft/{id}")
-    public AjaxResult reLeft(@PathVariable Long id)
-    {
+    public AjaxResult reLeft(@PathVariable Long id) {
         TTrainingrecords tTrainingrecords = tTrainingrecordsService.selectTTrainingrecordsBystaffId(id);
-        if(tTrainingrecords!=null){
+        if (tTrainingrecords != null) {
             tTrainingrecords.setDelFlag(0l);
             tTrainingrecordsService.updateTTrainingrecords(tTrainingrecords);
         }
@@ -731,12 +725,11 @@ public class TStaffmgrController extends BaseController
     @PreAuthorize("@ss.hasPermi('plant:staffmgr:add')")
     @Log(title = "人员管理", businessType = BusinessType.INSERT)
     @PostMapping("/importData")
-    public AjaxResult importData(@RequestParam("file") MultipartFile file) throws IOException
-    {
+    public AjaxResult importData(@RequestParam("file") MultipartFile file) throws IOException {
         //获取操作人员ID
         Long userId = getUserId();
         //报错行数统计
-        List<Integer> failRow =new ArrayList<Integer>();
+        List<Integer> failRow = new ArrayList<Integer>();
         Workbook workbook = ExcelUtils.getWorkBook(file);
         Sheet sheet = workbook.getSheetAt(0);
         List<TStaffmgr> list = new ArrayList<TStaffmgr>();
@@ -833,7 +826,7 @@ public class TStaffmgrController extends BaseController
                 entity.setCreaterCode(userId.toString());
                 logger.info("entity:" + entity);
                 list.add(entity);
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
                 logger.info("e:" + e);
                 failRow.add(i + 1);
@@ -846,7 +839,7 @@ public class TStaffmgrController extends BaseController
             failNum++;
             try {
                 tStaffmgrService.insertTStaffmgr(t);
-                if (t.getUnit().equals("10") || t.getUnit().equals("18")|| t.getUnit().equals("20")) {
+                if (t.getUnit().equals("10") || t.getUnit().equals("18") || t.getUnit().equals("20")) {
                     TTrainingrecords tTrainingrecords = new TTrainingrecords();
                     tTrainingrecords.setStaffId(t.getId());
                     tTrainingrecords.setPlantCode(t.getPlantCode());
@@ -902,16 +895,16 @@ public class TStaffmgrController extends BaseController
                     }
                 }
                 successNumber++;
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
                 logger.info("e:" + e);
                 failRow.add(failNum + 1);
             }
         }
         logger.info("list:" + JSON.toJSONString(list));
-        logger.info("successNumber:" +String.valueOf(successNumber));
-        logger.info("failNumber:" +String.valueOf(failNumber));
-        logger.info("failRow:" +String.valueOf(failRow));
+        logger.info("successNumber:" + String.valueOf(successNumber));
+        logger.info("failNumber:" + String.valueOf(failNumber));
+        logger.info("failRow:" + String.valueOf(failRow));
         return AjaxResult.success(String.valueOf(successNumber), failRow);
     }
 
@@ -919,11 +912,9 @@ public class TStaffmgrController extends BaseController
      * 证件照上传
      */
     @PostMapping("/uploadPhoto")
-    public AjaxResult uploadFile(@RequestParam("file") MultipartFile file,String pType,String pId) throws IOException
-    {
-        if (!file.isEmpty())
-        {
-            String url = FileUploadUtils.upload(RuoYiConfig.getFilePath("/"+ pType), file);
+    public AjaxResult uploadFile(@RequestParam("file") MultipartFile file, String pType, String pId) throws IOException {
+        if (!file.isEmpty()) {
+            String url = FileUploadUtils.upload(RuoYiConfig.getFilePath("/" + pType), file);
             TStaffmgr staffmgr = tStaffmgrService.selectTStaffmgrById(Long.parseLong(pId));
             staffmgr.setPhoto(url);
             tStaffmgrService.updateTStaffmgr(staffmgr);

master/src/main/java/com/ruoyi/project/sems/controller/TApproveController.java

@@ -1,9 +1,10 @@
 package com.ruoyi.project.sems.controller;
 
-import java.io.IOException;
-import java.io.OutputStream;
+import java.awt.*;
+import java.io.*;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
@@ -11,7 +12,10 @@ import java.util.concurrent.Executors;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.deepoove.poi.XWPFTemplate;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.itextpdf.text.Document;
+import com.itextpdf.text.pdf.PdfWriter;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.document.DocumentHandler;
 import com.ruoyi.common.utils.document.PDFTemplateUtil;
@@ -41,6 +45,12 @@ import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Comment;
 import org.activiti.engine.task.Task;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.apache.poi.xwpf.usermodel.XWPFPicture;
+import org.apache.poi.xwpf.usermodel.XWPFPictureData;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

ui/src/api/plant/staffmgr.js

@@ -90,6 +90,14 @@ export function selectTimeStaffmgr(query) {
   })
 }
 
+export function selectAverageAge(query) {
+  return request({
+    url: '/plant/staffmgr/averageAge',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询组织架构人员管理列表
 export function listOgzStaffmgr(query) {
   return request({

ui/src/router/index.js

@@ -254,6 +254,12 @@ export const constantRoutes = [
         component: (resolve) => require(['@/views/production/matrix'], resolve),
         name: 'matrix',
         meta: { title: 'PPE矩阵管理' }
+      },
+      {
+        path: '/training/records',
+        component: (resolve) => require(['@/views/training/records'], resolve),
+        name: 'records',
+        meta: { title: '装置级培训记录' }
       }
     ]
   },

ui/src/views/plant/staffmgr/ageChart.vue

@@ -5,99 +5,110 @@
 </template>
 
 <script>
-  import { ageData } from "@/api/plant/staffmgr";
-  export default {
-    props: {
-      width: {
-        type: String,
-        default: '100%'
-      },
-      height: {
-        type: String,
-        default: '200px'
-      },
-      queryParams : {
-        type: Object,
-        required: true
-      }
+import {ageData, selectAverageAge} from "@/api/plant/staffmgr";
+
+export default {
+  props: {
+    width: {
+      type: String,
+      default: '100%'
     },
-    data() {
-      return {
-        option: {
-          title: {
-            subtext: '年龄分布',
-            left: 'center'
-          },
-          tooltip: {
-            trigger: 'item',
-            formatter: '{a} <br/>{b} : {c} ({d}%)'
-          },
-          legend: {
-            orient: 'vertical',
-            left: 'left',
-            data: [this.$t('直接访问'), this.$t('邮件营销'), this.$t('联盟广告'), this.$t('视频广告'), this.$t('搜索引擎')]
+    height: {
+      type: String,
+      default: '200px'
+    },
+    queryParams: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      option: {
+        title: [
+          {
+            text: '平均年龄',
+            x: 'center',
+            top: '35%',
           },
-          toolbox: {
-            show: true,
-            feature: {
-              mark: {show: true},
-              magicType: {
-                show: true,
-                type: ['pie', 'funnel']
-              },
-              restore: {show: true},
-              saveAsImage: {show: true}
-            }
+          {
+            text: 0,
+            x: 'center',
+            top: '50%',
           },
-          series: [
-            {
-              label: {
-                formatter: '{b}: ({d}%)'
-              },
-              name: '年龄段',
-              type: 'pie',
-              radius: ['50%', '70%'],
-              selectedMode: 'single',
-              data: [
-                {value: 335, name: this.$t('直接访问')},
-              ],
-              emphasis: {
-                label: {
-                  show: true,
-                  fontSize: '21',
-                  fontWeight: 'bold'
-                }
-              },
-            }
-          ]
+        ],
+        tooltip: {
+          trigger: 'item',
+          formatter: '{a} <br/>{b} : {c} ({d}%)'
         },
-
-        chart: null,
-        ageData : []
-      }
-    },
-    mounted() {
-      this.$nextTick(() => {
-        ageData(this.queryParams).then(response => {
-          this.ageData = response
-          for(let i = 0 ; i <this.ageData.length ; i++){
-            this.option.legend.data[i] = this.ageData[i].dataName
-            this.option.series[0].data[i] = {value:this.ageData[i].dataNum , name: this.ageData[i].dataName }
+        legend: {
+          orient: 'vertical',
+          left: 'left',
+          data: [this.$t('直接访问'), this.$t('邮件营销'), this.$t('联盟广告'), this.$t('视频广告'), this.$t('搜索引擎')]
+        },
+        toolbox: {
+          show: true,
+          feature: {
+            mark: {show: true},
+            magicType: {
+              show: true,
+              type: ['pie', 'funnel']
+            },
+            restore: {show: true},
+            saveAsImage: {show: true}
           }
+        },
+        series: [
+          {
+            label: {
+              formatter: '{b}: ({d}%)'
+            },
+            name: '年龄段',
+            type: 'pie',
+            radius: ['50%', '70%'],
+            selectedMode: 'single',
+            data: [
+              {value: 335, name: this.$t('直接访问')},
+            ],
+            emphasis: {
+              label: {
+                show: true,
+                fontSize: '21',
+                fontWeight: 'bold'
+              }
+            },
+          }
+        ]
+      },
+      chart: null,
+      ageData: []
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      ageData(this.queryParams).then(response => {
+        this.ageData = response
+        for (let i = 0; i < this.ageData.length; i++) {
+          this.option.legend.data[i] = this.ageData[i].dataName
+          this.option.series[0].data[i] = {value: this.ageData[i].dataNum, name: this.ageData[i].dataName}
+        }
+        selectAverageAge(this.queryParams).then(response => {
+          this.option.title[1].text = response.data;
           this.initChart()
-        });
-      })
+        })
+      });
+    })
+  },
+  methods: {
+    /** 获取当前年份 */
+    getNowTime() {
+      var now = new Date();
     },
-    methods: {
-      /** 获取当前年份 */
-      getNowTime() {
-        var now = new Date();
-      },
-      initChart() {
-        // 基于准备好的dom，初始化echarts实例
-        this.chart = this.echarts.init(document.getElementById('ageChart'))
-        this.chart.setOption(this.option)
-      }
+    initChart() {
+      // 基于准备好的dom，初始化echarts实例
+      this.chart = this.echarts.init(document.getElementById('ageChart'))
+      this.chart.setOption(this.option)
     }
   }
+}
 </script>

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

@@ -0,0 +1,1068 @@
+<template>
+  <div class="app-container" >
+    <el-form :inline="true" :model="deviceParams" label-width="68px">
+      <el-form-item :label="$t('年份')" prop="year">
+        <el-date-picker v-model="deviceParams.year" :placeholder="$t('请选择')+$t('年份')" clearable
+                        size="small"
+                        style="width: 200px"
+                        type="year"
+                        value-format="yyyy">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item :label="$t('培训类型')" prop="trainingType">
+        <el-select v-model="deviceParams.trainingType" :placeholder="$t('请选择') + $t('培训类型')" clearable
+                   size="small">
+          <el-option
+              v-for="dict in trainingTypeOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-button icon="el-icon-search" size="mini" style="margin-left: 20px;" type="cyan" @click="handleDeviceQuery">
+        {{ $t('搜索') }}
+      </el-button>
+      <el-row style="text-align: right">
+        <svg-icon class="rectangleGreen" icon-class="rectangleGreen"></svg-icon>
+        <span>{{ $t('需参加培训，已经完成培训人员') }}</span>
+        <svg-icon class="rectangleRed" icon-class="rectanglered"></svg-icon>
+        <span style="line-height: 40px">{{ $t('需参加培训，尚未进行培训人员') }}</span>
+        <span style="line-height: 40px;margin-left: 22px;">╳ 需要参加培训</span>
+        <span style="line-height: 40px;margin-left: 22px;">⚪ 不需要参加培训</span>
+      </el-row>
+    </el-form>
+    <vue-draggable-resizable :draggable="dragMove" h="auto" style="background-color:white" w="auto" >
+      <div ref="branch" class="zoom" @wheel.prevent="handleTableWheel($event)">
+        <el-table v-if="tableShow" ref="deviceTable" v-loading="deviceTrainingLoad"
+                  :cell-class-name="tableCellClassName"
+                  :data="devicelevelList"  :span-method="colspanDeviceMethod"
+                  border
+                  :height="height-100"
+                  class="companyLevelTable">
+          <el-table-column :label="$t('课程代码')" align="center" fixed width="100">
+            <template slot-scope="scope">
+              {{ scope.row[0] }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('装置级') +$t('空格') + $t('培训课程')+$t('空格') + $t('名称')" align="center"
+                           fixed width="250">
+            <template slot-scope="scope">
+              {{ scope.row[1] }}
+            </template>
+          </el-table-column>
+          <el-table-column v-for="(item, index) in deviceStaffmgrs" :key="index" :label="item.actualpost" align="center"
+                           width="150">
+            <el-table-column :key="index" :label="item.name" align="center" width="150">
+              <template slot-scope="scope">
+                {{ scope.row[index + 2] }}
+              </template>
+            </el-table-column>
+          </el-table-column>
+        </el-table>
+      </div>
+    </vue-draggable-resizable>
+  </div>
+</template>
+
+<script>
+import {
+  addTrainingrecords,
+  delTrainingrecords,
+  exportTrainingrecords,
+  exportTrainingTime,
+  getTrainingrecords,
+  listTrainingrecords,
+  updateTrainingrecords
+} from "@/api/training/trainingrecords";
+import {listTraining} from "@/api/training/worklicense";
+import {companyListParticipants, delParticipants, listParticipants} from "@/api/training/participants";
+import {deviceListParticipants, listDevice} from "@/api/training/device";
+import {treeselect} from "@/api/system/dept";
+import {selectTimeStaffmgr} from "@/api/plant/staffmgr";
+import {getToken} from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {addCommonfile, allFileList, delCommonfile, updateCommonfile} from "@/api/common/commonfile";
+import VueDraggableResizable from 'vue-draggable-resizable';
+
+export default {
+  name: "records",
+  components: {Treeselect, VueDraggableResizable},
+  mounted() {
+    window.onresize = () => {    //写在mounted中,onresize事件会在页面大小被调整时触发
+      return (() => {
+        window.screenHeight = document.body.clientHeight - 155;
+        this.height = window.screenHeight;
+      })();
+    };
+  },
+  data() {
+    return {
+      height: document.body.clientHeight - 155,
+      dragMove: true,
+      transTitle: [], // transTitle 该标题为转化后的标题, 注意多一列,  因为原来的标题变成了竖着显示了, 所以多一列标题, 第一个为空即可
+      companyStaffmgrs: [],
+      deviceStaffmgrs: [],
+      companylevelList: [],
+      devicelevelList: [],
+      devicelevelListTemp: [],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 培训成绩表格数据
+      trainingrecordsList: [],
+      // 人员-公司级培训关系表格数据
+      participantsList: [],
+      // 人员-装置级培训关系表格数据
+      devicceList: [],
+      //上岗证培训列表
+      worklicenseList: [],
+      // 弹出层标题
+      title: "",
+      companyTitle: "",
+      deviceTitle: "",
+      companyTrainingTitle: "",
+      trainingTimeTitle: "",
+      deviceTrainingTitle: "",
+      worklicenseTitle: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight: 300,
+      // 是否显示弹出层
+      open: false,
+      companyOpen: false,
+      deviceOpen: false,
+      companyTrainingOpen: false,
+      deviceTrainingOpen: false,
+      worklicenseOpen: false,
+      companyTrainingLoad: false,
+      deviceTrainingLoad: false,
+      tableShow: true,
+      trainingTimeOpen: false,
+      // 装置名称字典
+      plantCodeOptions: [],
+      // 班值字典
+      classesOptions: [],
+      // SUB字典
+      subOptions: [],
+      // 裂解字典
+      crackingOptions: [],
+      // 热区字典
+      hotareaOptions: [],
+      // 冷区字典
+      coldareaOptions: [],
+      // AEU/PGU字典
+      aeupguOptions: [],
+      // 入职字典
+      onboardOptions: [],
+      // TDS字典
+      tdsOptions: [],
+      // 上岗证复证字典
+      postCardOptions: [],
+      // 工艺培训字典
+      craftOptions: [],
+      //公司级培训字典
+      companyOptions: [],
+      //装置级培训字典
+      deviceOptions: [],
+      // 培训岗位字典
+      positionOptions: [],
+      //培训类型字典
+      trainingTypeOptions: [],
+      //点击查看的员工号
+      employeeid: '',
+      // 用户导入参数
+      upload: {
+        downloadAction: process.env.VUE_APP_BASE_API + '/common/template',
+        //下载模板类型
+        type: "trainingrecords",
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: {Authorization: "Bearer " + getToken()},
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/training/trainingrecords/importData"
+      },
+      // 报告附件参数
+      doc: {
+        file: "",
+        // 是否显示弹出层（报告附件）
+        open: false,
+        // 弹出层标题（报告附件）
+        title: this.$t('附件'),
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 报告附件上传位置编号
+        ids: 0,
+        // 设置上传的请求头部
+        headers: {Authorization: "Bearer " + getToken()},
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/common/commonfile/uploadFile",
+        commonfileList: null,
+        queryParams: {
+          pId: null,
+          pType: 'traning'
+        },
+        pType: 'traning',
+        pId: null,
+        form: {}
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        name: null,
+        employeeid: null,
+        classes: null,
+        sortDate: null,
+        sortOrder: null,
+        onboard: null,
+        tds: null,
+        postCard: null,
+        craft: null,
+        company: null
+      },
+      //人员表查询参数
+      staffmgrQueryParams: {
+        units: "10,18,20,30",
+        leftYear: this.getNowTime(),
+      },
+      queryCompanyParams: {
+        staffId: null,
+        companyId: null,
+      },
+      queryDeviceParams: {
+        staffId: null,
+        regularId: null,
+        year: this.getNowTime(),
+        trainingType: null
+      },
+      deviceParams: {
+        units: "10,18,20,30",
+        staffId: null,
+        regularId: null,
+        year: null,
+        trainingType: null
+      },
+      worklicenseParams: {
+        employeeid: null,
+      },
+      companyQueryParams: {},
+      // 表单参数
+      form: {},
+      pdf: {
+        title: '',
+        pdfUrl: '',
+        numPages: null,
+        open: false,
+        pageNum: 1,
+        pageTotalNum: 1,
+        loadedRatio: 0,
+      },
+      // 表单校验
+      rules: {
+        plantCode: [
+          {required: true, message: this.$t('装置名称') + this.$t('不能为空'), trigger: "change"}
+        ],
+        year: [
+          {required: true, message: this.$t('年份') + this.$t('不能为空'), trigger: "blur"}
+        ],
+        deptId: [
+          {required: true, message: this.$t('部门编号') + this.$t('不能为空'), trigger: "blur"}
+        ]
+      },
+    };
+
+  },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    },
+    height(val) {        //在watch中监听height,浏览器窗口大小变动时自适应高度。
+      this.height = val;
+      console.log(this.height, "新的高度");
+    },
+  },
+  created() {
+    //设置表格高度对应屏幕高度
+    this.$nextTick(() => {
+      this.clientHeight = (document.body.clientHeight - 80) * 0.8
+    })
+    this.getList();
+    this.handleDevice();
+    this.getStaffmar();
+    this.getTreeselect();
+    this.getDicts("PLANT_DIVIDE").then(response => {
+      this.plantCodeOptions = response.data;
+    });
+    this.getDicts("TEAM_DIVIDE").then(response => {
+      this.classesOptions = response.data;
+    });
+    this.getDicts("TICK_CROSS").then(response => {
+      this.subOptions = response.data;
+    });
+    this.getDicts("TICK_CROSS").then(response => {
+      this.crackingOptions = response.data;
+    });
+    this.getDicts("TICK_CROSS").then(response => {
+      this.hotareaOptions = response.data;
+    });
+    this.getDicts("TICK_CROSS").then(response => {
+      this.coldareaOptions = response.data;
+    });
+    this.getDicts("TICK_CROSS").then(response => {
+      this.aeupguOptions = response.data;
+    });
+    this.getDicts("TRAINING_QUALIFY").then(response => {
+      this.onboardOptions = response.data;
+    });
+    this.getDicts("TRAINING_QUALIFY").then(response => {
+      this.tdsOptions = response.data;
+    });
+    this.getDicts("TRAINING_QUALIFY").then(response => {
+      this.postCardOptions = response.data;
+    });
+    this.getDicts("TRAINING_QUALIFY").then(response => {
+      this.craftOptions = response.data;
+    });
+    this.getDicts("TRAINING_QUALIFY").then(response => {
+      this.companyOptions = response.data;
+    });
+    this.getDicts("TRAINING_QUALIFY").then(response => {
+      this.deviceOptions = response.data;
+    });
+    this.getDicts("ACTUALPOST").then(response => {
+      this.positionOptions = response.data;
+    });
+    this.getDicts("TRAINING_TYPE").then(response => {
+      this.trainingTypeOptions = response.data;
+    });
+  },
+  methods: {
+    handleTableWheel(event) {
+      let obj = this.$refs['branch']
+      return this.tableZoom(obj, event)
+    },
+    tableZoom(obj, event) {
+      // 一开始默认是100%
+      let zoom = parseInt(obj.style.zoom, 10) || 100
+      // 滚轮滚一下wheelDelta的值增加或减少120
+      zoom += event.wheelDelta / 12
+      if (zoom > 25) {
+        obj.style.zoom = zoom + '%'
+      }
+      return false
+    },
+    colspanMethod({row, column, rowIndex, columnIndex}) {
+      if (columnIndex === 0) {
+        const _row = this.setTable(this.companylevelList).merge[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return {
+          rowspan: _row,
+          colspan: _col
+        };
+      }
+      if (columnIndex === 1) {
+        const _row = this.setTable(this.companylevelList).merge[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return {
+          rowspan: _row,
+          colspan: _col
+        };
+      }
+      if (columnIndex === 2) {
+        const _row = this.setTable(this.companylevelList).merge[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return {
+          rowspan: _row,
+          colspan: _col
+        };
+      }
+    },
+    colspanDeviceMethod({row, column, rowIndex, columnIndex}) {
+      if (columnIndex === 0) {
+        const _row = this.setTable(this.devicelevelList).merge[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return {
+          rowspan: _row,
+          colspan: _col
+        };
+      }
+      if (columnIndex === 1) {
+        const _row = this.setTable(this.devicelevelList).merge[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return {
+          rowspan: _row,
+          colspan: _col
+        };
+      }
+    },
+    setTable(tableData) {
+      let spanArr = [],
+          concat = 0;
+      tableData.forEach((item, index) => {
+        if (index === 0) {
+          spanArr.push(1);
+        } else {
+          if (item[1] === tableData[index - 1][1] && item[0] === tableData[index - 1][0]) {
+            //第一列需合并相同内容的判断条件
+            spanArr[concat] += 1;
+            spanArr.push(0);
+          } else {
+            spanArr.push(1);
+            concat = index;
+          }
+        }
+      });
+      return {
+        merge: spanArr
+      };
+    },
+    //根据是否存在最后培训时间显示颜色提示
+    tableCellClassName({row, column, rowIndex, columnIndex}) {
+      // for (let i = 2; i < this.transTitle.length + 2; i++) {
+      //   if (columnIndex == i){
+      //     return this.changeColor(row[i])
+      //   }
+      // }
+      return this.changeColor(row[columnIndex])
+    },
+    changeColor(value) {
+      if (value == null) {
+        return 'companyNot'
+      }
+      if (value.trim().startsWith('20')) {
+        return 'companyFinish'
+      }
+      if (value === "-") {
+        return 'companyUrgent'
+      }
+      if (value === "尚未开始培训") {
+        return 'companyNot'
+      }
+    },
+    /** 查询培训成绩列表 */
+    getList() {
+      this.loading = true;
+      listTrainingrecords(this.queryParams).then(response => {
+        this.trainingrecordsList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    //获取人员表
+    getStaffmar() {
+      selectTimeStaffmgr(this.staffmgrQueryParams).then(response => {
+        const allData = response.rows
+        const data = [];
+        for (let i = 0; i < allData.length; i++) {
+          data.push({
+            name: allData[i].name,
+            actualpost: this.selectDictLabel(this.positionOptions, allData[i].actualpost),
+            trainingTime: allData[i].trainingTime
+          });
+        }
+        this.transTitle = data;
+      })
+    },
+    //获取公司级培训列表
+    getCompanyTraining() {
+      companyListParticipants(this.companyQueryParams).then(response => {
+        this.companylevelList = response.companyLevelList
+        const allData = response.staffmgrs
+        const data = [];
+        for (let i = 0; i < allData.length; i++) {
+          data.push({
+            name: allData[i].name,
+            actualpost: this.selectDictLabel(this.positionOptions, allData[i].actualpost),
+          });
+        }
+        this.companyStaffmgrs = data
+        this.companyTrainingLoad = false
+        this.$nextTick(() => {
+          this.$refs.companyTable.doLayout(); // 解决表格错位
+        });
+      })
+    },
+    //获取装置级培训列表
+    getDeviceTraining() {
+      deviceListParticipants(this.deviceParams).then(response => {
+        this.devicelevelList = response.deviceLevelList
+        const allData = response.staffmgrs
+        const data = [];
+        for (let i = 0; i < allData.length; i++) {
+          data.push({
+            name: allData[i].name,
+            actualpost: this.selectDictLabel(this.positionOptions, allData[i].actualpost),
+          });
+        }
+        this.deviceStaffmgrs = data
+        this.deviceTrainingLoad = false
+        this.$nextTick(() => {
+          this.$refs.deviceTable.doLayout(); // 解决表格错位
+        });
+      })
+    },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      treeselect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 装置名称字典翻译
+    plantCodeFormat(row, column) {
+      return this.selectDictLabel(this.plantCodeOptions, row.plantCode);
+    },
+    // 班值字典翻译
+    classesFormat(row, column) {
+      return this.selectDictLabel(this.classesOptions, row.classes);
+    },
+    // SUB字典翻译
+    subFormat(row, column) {
+      return this.selectDictLabel(this.subOptions, row.sub);
+    },
+    // 裂解字典翻译
+    crackingFormat(row, column) {
+      return this.selectDictLabel(this.crackingOptions, row.cracking);
+    },
+    // 热区字典翻译
+    hotareaFormat(row, column) {
+      return this.selectDictLabel(this.hotareaOptions, row.hotarea);
+    },
+    // 冷区字典翻译
+    coldareaFormat(row, column) {
+      return this.selectDictLabel(this.coldareaOptions, row.coldarea);
+    },
+    // AEU/PGU字典翻译
+    aeupguFormat(row, column) {
+      return this.selectDictLabel(this.aeupguOptions, row.aeupgu);
+    },
+    // 入职字典翻译
+    onboardFormat(row, column) {
+      return this.selectDictLabel(this.onboardOptions, row.onboard);
+    },
+    // TDS字典翻译
+    tdsFormat(row, column) {
+      return this.selectDictLabel(this.tdsOptions, row.tds);
+    },
+    // 上岗证复证字典翻译
+    postCardFormat(row, column) {
+      return this.selectDictLabel(this.postCardOptions, row.postCard);
+    },
+    // 工艺培训字典翻译
+    craftFormat(row, column) {
+      return this.selectDictLabel(this.craftOptions, row.craft);
+    },
+    //公司级培训字典翻译
+    companyFormat(row, column) {
+      return this.selectDictLabel(this.companyOptions, row.company);
+    },
+    //装置级培训字典翻译
+    deviceFormat(row, column) {
+      return this.selectDictLabel(this.deviceOptions, row.device);
+    },
+    // 培训类型翻译
+    trainingTypeFormat(row, column) {
+      return this.selectDictLabel(this.trainingTypeOptions, row.trainingType);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        plantCode: null,
+        name: null,
+        employeeid: null,
+        classes: null,
+        companysafe: null,
+        plantsafe: null,
+        teamsafe: null,
+        sub: null,
+        cracking: null,
+        hotarea: null,
+        coldarea: null,
+        aeupgu: null,
+        upscore: null,
+        downscore: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        remarks: null,
+        deptId: null,
+        onboard: null,
+        tds: null,
+        postCard: null,
+        craft: null,
+        company: null,
+        device: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    //搜索按钮
+    handleDeviceQuery() {
+      this.deviceTrainingLoad = true;
+      this.$nextTick(() => {
+        this.getDeviceTraining();
+      });
+    },
+    staffDeviceQuery() {
+      this.getDevice(this.employeeid)
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    //根据分数显示颜色提示
+    tableCellStyle({row, column, rowIndex, columnIndex}) {
+      if (columnIndex === 4 && row.onboard === "2") {
+        return "color: rgba(255, 26, 26, 0.98) "
+      } else if (columnIndex === 5 && row.tds === "2") {
+        return "color: rgba(255, 26, 26, 0.98) "
+      } else if (columnIndex === 6 && row.postCard === "2") {
+        return "color: rgba(255, 26, 26, 0.98) "
+      } else if (columnIndex === 7 && row.craft === "2") {
+        return "color: rgba(255, 26, 26, 0.98) "
+      } else if (columnIndex === 8 && row.company === "2") {
+        return "color: rgba(255, 26, 26, 0.98) "
+      }
+    },
+    //排序
+    sortChange(val) {
+      if (val.prop == 'companysafe') {
+        this.queryParams.sortDate = 'companysafe';
+      } else if (val.prop == 'plantsafe') {
+        this.queryParams.sortDate = 'plantsafe';
+      } else if (val.prop == 'teamsafe') {
+        this.queryParams.sortDate = 'teamsafe';
+      }
+      if (val.order === 'descending') {
+        this.queryParams.sortOrder = 'desc'
+      } else {
+        this.queryParams.sortOrder = 'asc'
+      }
+      this.getList()
+    },
+    /** 获取当前年份 */
+    getNowTime() {
+      var now = new Date();
+      var year = now.getFullYear(); //得到年份
+      var defaultDate = `${year}`;
+      defaultDate = `${year}`
+      return defaultDate;
+    },
+    /** 公司级培训矩阵按钮操作 */
+    handleCompany() {
+      this.companyTrainingLoad = true
+      this.companyTrainingTitle = this.$t('参加') + this.$t('空格') + this.$t('公司级') + this.$t('空格') + this.$t('培训人员') + this.$t('空格') + this.$t('名单')
+      this.companyTrainingOpen = true
+      // loading.close();
+      this.tableShow = true
+      setTimeout(() => {
+        this.getCompanyTraining();
+      }, 10);
+    },
+    /** 装置级培训矩阵按钮操作 */
+    handleDevice() {
+      this.deviceTrainingLoad = true
+      this.resetForm("queryRegularForm");
+      this.deviceTrainingTitle = this.$t('参加') + this.$t('空格') + this.$t('装置级') + this.$t('空格') + this.$t('培训人员') + this.$t('空格') + this.$t('名单')
+      this.deviceTrainingOpen = true
+      this.tableShow = true
+      this.deviceParams.year = this.getNowTime();
+      // this.$nextTick(() => {
+      //   deviceListParticipants(this.deviceParams).then(response => {
+      //     this.devicelevelListTemp = response;
+      //     this.devicelevelList = response
+      //     this.deviceTrainingLoad = false
+      //     this.$nextTick(() => {
+      //       this.$refs.deviceTable.doLayout(); // 解决表格错位
+      //     });
+      //   })
+      // });
+      setTimeout(() => {
+        this.getDeviceTraining();
+      }, 10);
+    },
+    /** 人员培训时长按钮操作 */
+    handleTime() {
+      this.trainingTimeOpen = true;
+      this.trainingTimeTitle = this.$t('人员培训时长');
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = this.$t('新增') + this.$t('空格') + this.$t('培训成绩');
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getTrainingrecords(id).then(response => {
+        this.form = response.data;
+        if (response.data.sub == 10) {
+          this.form.sub = true
+        }
+        if (response.data.cracking == 10) {
+          this.form.cracking = true
+        }
+        if (response.data.hotarea == 10) {
+          this.form.hotarea = true
+        }
+        if (response.data.coldarea == 10) {
+          this.form.coldarea = true
+        }
+        if (response.data.aeupgu == 10) {
+          this.form.aeupgu = true
+        }
+        this.open = true;
+        this.title = this.$t('修改') + this.$t('培训成绩');
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateTrainingrecords(this.form).then(response => {
+              this.msgSuccess(this.$t('修改成功'));
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addTrainingrecords(this.form).then(response => {
+              this.msgSuccess(this.$t('新增成功'));
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm(this.$t('是否确认删除?'), this.$t('警告'), {
+        confirmButtonText: this.$t('确定'),
+        cancelButtonText: this.$t('取消'),
+        type: "warning"
+      }).then(function () {
+        return delTrainingrecords(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess(this.$t('删除成功'));
+      })
+    },
+    /** 公司级培训删除按钮操作 */
+    participantsHandleDelete(row) {
+      const ids = row.id
+      this.$confirm(this.$t('是否确认删除?'), this.$t('警告'), {
+        confirmButtonText: this.$t('确定'),
+        cancelButtonText: this.$t('取消'),
+        type: "warning"
+      }).then(function () {
+        return delParticipants(ids);
+      }).then(() => {
+        this.getParticipants(row.staffId)
+        this.msgSuccess(this.$t('删除成功'));
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm(this.$t('是否确认导出所有培训成绩数据项?'), this.$t('警告'), {
+        confirmButtonText: this.$t('确定'),
+        cancelButtonText: this.$t('取消'),
+        type: "warning"
+      }).then(function () {
+        return exportTrainingrecords(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
+    },
+    /** 导出人员培训时长按钮操作 */
+    exportTrainingTime() {
+      const queryParams = this.transTitle;
+      this.$confirm(this.$t('是否确认导出人员培训时长?'), this.$t('警告'), {
+        confirmButtonText: this.$t('确定'),
+        cancelButtonText: this.$t('取消'),
+        type: "warning"
+      }).then(function () {
+        return exportTrainingTime();
+      }).then(response => {
+        this.download(response.msg);
+      })
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = this.$t('用户导入');
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      this.$refs['downloadFileForm'].submit()
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      if (response.data[0] != null) {
+        this.$alert(this.$t('成功导入') + response.msg + this.$t('条数据') + "，" + this.$t('第') + response.data + this.$t('行数据出现错误导入失败') + "。", this.$t('导入结果'), {dangerouslyUseHTMLString: true});
+      } else {
+        this.$alert(this.$t('成功导入') + response.msg + this.$t('条数据'), this.$t('导入结果'), {dangerouslyUseHTMLString: true});
+      }
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+    /** 报告附件按钮操作 */
+    handleDoc(row, fileType) {
+      this.doc.pType = fileType
+      this.doc.queryParams.pType = fileType
+      this.doc.id = row.id;
+      var titleType = '';
+      if (fileType === 'trainingrecords-onbord') {
+        titleType = row.name + this.$t('空格') + this.$t('的') + this.$t('入职') + this.$t('空格') + this.$t('培训')
+      } else if (fileType === 'trainingrecords-tds') {
+        titleType = row.name + this.$t('空格') + this.$t('的') + this.$t('TDS培训')
+      } else if (fileType === 'trainingrecords-craft') {
+        titleType = row.name + this.$t('空格') + this.$t('的') + this.$t('工艺培训')
+      } else {
+        titleType = this.$t('上岗证') + this.$t('空格') + this.$t('培训')
+      }
+      this.doc.title = titleType;
+      this.doc.open = true;
+      this.doc.queryParams.pId = row.id
+      this.doc.pId = row.id
+      this.getFileList()
+      this.$nextTick(() => {
+        this.$refs.doc.clearFiles()
+      })
+    },
+    getFileList() {
+      allFileList(this.doc.queryParams).then(response => {
+        response.forEach(element => {
+          element["isEdit"] = false
+        });
+        response.forEach(element => {
+          element["isAdd"] = false
+        });
+        this.doc.commonfileList = response;
+      });
+    },
+    //附件上传中处理
+    handleFileDocProgress(event, file, fileList) {
+      this.doc.file = file;
+      this.doc.isUploading = true;
+    },
+    //附件上传成功处理
+    handleFileDocSuccess(response, file, fileList) {
+      this.doc.isUploading = false;
+      this.$alert(response.msg, this.$t('导入结果'), {dangerouslyUseHTMLString: true});
+      this.getFileList()
+    },
+    // 文件下载处理
+    handleDownload(row) {
+      var name = row.fileName;
+      var url = row.fileUrl;
+      var suffix = url.substring(url.lastIndexOf("."), url.length);
+      const a = document.createElement('a')
+      a.setAttribute('download', name)
+      a.setAttribute('target', '_blank')
+      a.setAttribute('href', process.env.VUE_APP_BASE_API + url)
+      a.click()
+    },
+    //pdf预览
+    openPdf() {
+      window.open(this.pdf.pdfUrl);//path是文件的全路径地址
+    },
+    handleSee(row) {
+      this.pdf.open = true
+      this.pdf.title = row.fileName
+      this.pdf.pdfUrl = process.env.VUE_APP_BASE_API + '/pdf/web/viewer.html?file=' + process.env.VUE_APP_BASE_API + row.fileUrl
+    },
+    /** 打开上岗证复证列表 */
+    openWorklicense(row) {
+      this.worklicenseOpen = true;
+      this.worklicenseTitle = row.name + this.$t('的') + this.$t('上岗证复证') + this.$t('列表');
+      this.worklicenseParams.employeeid = row.employeeid
+      listTraining(this.worklicenseParams).then(response => {
+        this.worklicenseList = response;
+      });
+    },
+    /** 打开公司级培训列表 */
+    openCompany(row) {
+      this.companyOpen = true;
+      this.companyTitle = row.name + this.$t('空格') + this.$t('的') + this.$t('公司级') + this.$t('空格') + this.$t('培训信息');
+      this.$nextTick(() => {
+        this.getParticipants(row.employeeid)
+      })
+    },
+    /** 打开装置级培训列表 */
+    openDevice(row) {
+      this.deviceOpen = true;
+      this.resetForm("queryRegularForm");
+      this.deviceTitle = row.name + this.$t('空格') + this.$t('的') + this.$t('装置级') + this.$t('空格') + this.$t('培训信息');
+      this.employeeid = row.employeeid;
+      this.queryDeviceParams.year = this.getNowTime();
+      this.$nextTick(() => {
+        this.getDevice(row.employeeid)
+      })
+    },
+    getParticipants(employeeid) {
+      this.queryCompanyParams.staffId = employeeid
+      listParticipants(this.queryCompanyParams).then(response => {
+        this.participantsList = response.rows;
+      });
+    },
+    getDevice(employeeid) {
+      this.queryDeviceParams.staffId = employeeid
+      listDevice(this.queryDeviceParams).then(response => {
+        this.devicceList = response.rows;
+      });
+    },
+    // 取消
+    cancelFile(row, index) {
+      // 如果是新增的数据
+      if (row.isAdd) {
+        this.doc.commonfileList.splice(index, 1)
+      } else {
+        // 不是新增的数据  还原数据
+        for (const i in row.oldRow) {
+          row[i] = row.oldRow[i]
+        }
+        row.isEdit = false
+      }
+    },
+    edit(row) {
+      // 备份原始数据
+      row['oldRow'] = JSON.parse(JSON.stringify(row));
+      this.$nextTick(() => {
+        row.isEdit = true;
+      })
+    },
+    save(row) {
+      row.isEdit = false;
+      var that = this;
+      that.loading = true;
+      this.form = row;
+      if (row.isAdd == true) {
+        addCommonfile(this.form).then(response => {
+          this.msgSuccess(this.$t('新增成功'));
+          this.open = false;
+          this.getList();
+        });
+      } else {
+        updateCommonfile(this.form).then(response => {
+          this.msgSuccess(this.$t('修改成功'));
+          this.open = false;
+          this.getList();
+        });
+      }
+    },
+    /** 删除按钮操作 */
+    handleDeleteDoc(row) {
+      const ids = row.id || this.ids;
+      this.$confirm(this.$t('是否确认删除?'), this.$t('警告'), {
+        confirmButtonText: this.$t('确定'),
+        cancelButtonText: this.$t('取消'),
+        type: "warning"
+      }).then(function () {
+        return delCommonfile(ids);
+      }).then(() => {
+        this.getFileList()
+        this.msgSuccess(this.$t('删除成功'));
+      })
+    },
+
+    /** 公司级培训修改按钮操作 */
+    handleCompanyUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+    },
+    closeDialog() {
+      this.companylevelList = []
+      this.devicelevelList = []
+      this.tableShow = false
+    },
+  }
+};
+</script>
+
+<style>
+.companyLevelTable {
+  color: black;
+}
+
+::v-deep.el-table tbody tr:hover > td {
+  background-color: transparent !important;
+}
+
+.el-dialog__body {
+  padding-top: 0px
+}
+
+.el-table--scrollable-x .el-table__body-wrapper {
+  z-index: 1;
+}
+
+.rectangleRed {
+  width: 60px !important;
+  height: 30px !important;
+  margin-bottom: -8px;
+}
+
+.rectangleGreen {
+  width: 60px !important;
+  height: 30px !important;
+  margin-bottom: -8px;
+}
+
+
+</style>
+
+

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

@@ -1299,7 +1299,8 @@ export default {
     },
     /** 装置级培训矩阵按钮操作 */
     handleDevice() {
-      this.deviceTrainingLoad = true
+      this.$router.push({ path: '/training/records'});
+      /*this.deviceTrainingLoad = true
       this.resetForm("queryRegularForm");
       this.deviceTrainingTitle = this.$t('参加') + this.$t('空格') + this.$t('装置级') + this.$t('空格') + this.$t('培训人员') + this.$t('空格') + this.$t('名单')
       this.deviceTrainingOpen = true
@@ -1317,7 +1318,7 @@ export default {
       // });
       setTimeout(() => {
         this.getDeviceTraining();
-      }, 10);
+      }, 10);*/
     },
     /** 人员培训时长按钮操作 */
     handleTime() {