LY 合成器

master/src/main/java/com/ruoyi/project/ehs/controller/ByxHomeDataController.java → master/src/main/java/com/ruoyi/project/common/controller/ByxHomeDataController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.project.ehs.controller;
+package com.ruoyi.project.common.controller;
 
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;

master/src/main/java/com/ruoyi/project/common/controller/CBPSHomeDataController.java

@@ -0,0 +1,123 @@
+package com.ruoyi.project.common.controller;
+
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.project.document.domain.TPlantproglist;
+import com.ruoyi.project.document.service.ITPlantproglistService;
+import com.ruoyi.project.ehs.domain.TEnvironapproval;
+import com.ruoyi.project.ehs.domain.TFireapproval;
+import com.ruoyi.project.ehs.domain.THealthapproval;
+import com.ruoyi.project.ehs.domain.TSafetyapproval;
+import com.ruoyi.project.ehs.service.ITEnvironapprovalService;
+import com.ruoyi.project.ehs.service.ITFireapprovalService;
+import com.ruoyi.project.ehs.service.ITHealthapprovalService;
+import com.ruoyi.project.ehs.service.ITSafetyapprovalService;
+import com.ruoyi.project.training.domain.TTraining;
+import com.ruoyi.project.training.service.ITTrainingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/cbps/home")
+public class CBPSHomeDataController extends BaseController {
+    @Autowired
+    private ITSafetyapprovalService tSafetyapprovalService;
+
+    @Autowired
+    private ITFireapprovalService tFireapprovalService;
+
+    @Autowired
+    private ITEnvironapprovalService tEnvironapprovalService;
+
+    @Autowired
+    private ITHealthapprovalService tHealthapprovalService;
+
+    @Autowired
+    private ITPlantproglistService tPlantproglistService;
+
+    @Autowired
+    private ITTrainingService tTrainingService;
+
+    @GetMapping("/countNum")
+    public AjaxResult getCountNum() {
+        List<TSafetyapproval> safeList = tSafetyapprovalService.selectTSafetyapprovalList(new TSafetyapproval());
+        List<TFireapproval> fireList = tFireapprovalService.selectTFireapprovalList(new TFireapproval());
+        List<TEnvironapproval> envList = tEnvironapprovalService.selectTEnvironapprovalList(new TEnvironapproval());
+        List<THealthapproval> healthList = tHealthapprovalService.selectTHealthapprovalList(new THealthapproval());
+        HashMap<String, Integer> result = new HashMap<>();
+        result.put("safeNum", safeList.size());
+        result.put("fireNum", fireList.size());
+        result.put("envNum", envList.size());
+        result.put("healthNum", healthList.size());
+        return AjaxResult.success(result);
+    }
+
+    @GetMapping("/procedureCount")
+    public AjaxResult procedureCount() {
+        TPlantproglist tPlantproglist = new TPlantproglist();
+        HashMap<String, Object> result = new HashMap<>();
+        tPlantproglist.setItem(2L);
+        List<TPlantproglist> list = tPlantproglistService.selectTPlantproglistList(tPlantproglist);
+        result.put("appNum", list.size());
+        result.put("app", "程序总汇");
+
+        tPlantproglist.setItem(3L);
+        list = tPlantproglistService.selectTPlantproglistList(tPlantproglist);
+        result.put("fingerpostNum", list.size());
+        result.put("fingerpost", "指南总汇");
+
+        tPlantproglist.setItem(4L);
+        list = tPlantproglistService.selectTPlantproglistList(tPlantproglist);
+        result.put("guideNum", list.size());
+        result.put("guide", "指导书总汇");
+
+        tPlantproglist.setItem(5L);
+        list = tPlantproglistService.selectTPlantproglistList(tPlantproglist);
+        result.put("fileNum", list.size());
+        result.put("file", "附件总汇");
+
+        tPlantproglist.setItem(1L);
+        list = tPlantproglistService.selectTPlantproglistList(tPlantproglist);
+        result.put("excelNum", list.size());
+        result.put("excel", "表格总汇");
+
+        tPlantproglist.setItem(6L);
+        list = tPlantproglistService.selectTPlantproglistList(tPlantproglist);
+        result.put("trainNum", list.size());
+        result.put("train", "培训材料");
+        return AjaxResult.success(result);
+    }
+
+    @GetMapping("/trainCount")
+    public AjaxResult getTrainCount() {
+        TTraining tTraining = new TTraining();
+        Calendar cal = Calendar.getInstance();
+        tTraining.setYear(String.valueOf(cal.get(Calendar.YEAR)));
+        return AjaxResult.success(tTrainingService.countTTraining(tTraining));
+    }
+
+    @GetMapping("/getLine")
+    public AjaxResult getLine() {
+
+        TPlantproglist tPlantproglist = new TPlantproglist();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM");
+        Calendar cal = Calendar.getInstance();
+        Map<String, List<TPlantproglist>> result = new HashMap<>();
+        List<TPlantproglist> nextEdits = new ArrayList<>();
+        List<TPlantproglist> nextReviews = new ArrayList<>();
+        for (int i = 1; i < 8; i++) {
+            tPlantproglist.setStartDate(sdf.format(cal.getTime()));
+            cal.add(Calendar.MONTH, 1);
+            nextEdits.addAll(tPlantproglistService.countNextEditDate(tPlantproglist));
+            nextReviews.addAll(tPlantproglistService.countNextReviewDate(tPlantproglist));
+        }
+        result.put("nextEdit", nextEdits);
+        result.put("nextReview",nextReviews);
+        return AjaxResult.success(result);
+    }
+}

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

@@ -42,7 +42,7 @@ public class TMtActionlistController extends BaseController
     /**
      * 查询装置会议执行列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:list')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:list')")
     @GetMapping("/list")
     public TableDataInfo list(TMtActionlist tMtActionlist)
     {
@@ -80,7 +80,7 @@ public class TMtActionlistController extends BaseController
     /**
      * 导出装置会议执行列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:export')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:export')")
     @Log(title = "装置会议执行", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TMtActionlist tMtActionlist)
@@ -93,7 +93,7 @@ public class TMtActionlistController extends BaseController
     /**
      * 获取装置会议执行详细信息
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:query')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -103,7 +103,7 @@ public class TMtActionlistController extends BaseController
     /**
      * 新增装置会议执行
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:add')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:add')")
     @Log(title = "装置会议执行", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TMtActionlist tMtActionlist)
@@ -114,7 +114,7 @@ public class TMtActionlistController extends BaseController
     /**
      * 修改装置会议执行
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:edit')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:edit')")
     @Log(title = "装置会议执行", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TMtActionlist tMtActionlist)
@@ -125,7 +125,7 @@ public class TMtActionlistController extends BaseController
     /**
      * 删除装置会议执行
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:remove')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:remove')")
     @Log(title = "装置会议执行", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

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

@@ -36,7 +36,7 @@ public class TMtEhsopenitemController extends BaseController
     /**
      * 查询EHS开项跟踪列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:list')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:list')")
     @GetMapping("/list")
     public TableDataInfo list(TMtEhsopenitem tMtEhsopenitem)
     {
@@ -48,7 +48,7 @@ public class TMtEhsopenitemController extends BaseController
     /**
      * 查询EHS开项跟踪列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:list')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:list')")
     @GetMapping("/ehsData")
     public List<TMtEhsopenitem> ehsData(TMtEhsopenitem tMtEhsopenitem)
     {
@@ -60,7 +60,7 @@ public class TMtEhsopenitemController extends BaseController
     /**
      * 导出EHS开项跟踪列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:export')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:export')")
     @Log(title = "EHS开项跟踪", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TMtEhsopenitem tMtEhsopenitem)
@@ -73,7 +73,7 @@ public class TMtEhsopenitemController extends BaseController
     /**
      * 获取EHS开项跟踪详细信息
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:query')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -83,7 +83,7 @@ public class TMtEhsopenitemController extends BaseController
     /**
      * 新增EHS开项跟踪
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:add')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:add')")
     @Log(title = "EHS开项跟踪", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TMtEhsopenitem tMtEhsopenitem)
@@ -94,7 +94,7 @@ public class TMtEhsopenitemController extends BaseController
     /**
      * 修改EHS开项跟踪
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:edit')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:edit')")
     @Log(title = "EHS开项跟踪", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TMtEhsopenitem tMtEhsopenitem)
@@ -105,7 +105,7 @@ public class TMtEhsopenitemController extends BaseController
     /**
      * 删除EHS开项跟踪
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:remove')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:remove')")
     @Log(title = "EHS开项跟踪", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

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

@@ -36,7 +36,7 @@ public class TMtInterlockController extends BaseController
     /**
      * 查询关键机组联锁旁路列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:list')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:list')")
     @GetMapping("/list")
     public TableDataInfo list(TMtInterlock tMtInterlock)
     {
@@ -48,7 +48,7 @@ public class TMtInterlockController extends BaseController
     /**
      * 导出关键机组联锁旁路列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:export')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:export')")
     @Log(title = "关键机组联锁旁路", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TMtInterlock tMtInterlock)
@@ -61,7 +61,7 @@ public class TMtInterlockController extends BaseController
     /**
      * 获取关键机组联锁旁路详细信息
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:query')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -71,7 +71,7 @@ public class TMtInterlockController extends BaseController
     /**
      * 新增关键机组联锁旁路
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:add')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:add')")
     @Log(title = "关键机组联锁旁路", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TMtInterlock tMtInterlock)
@@ -82,7 +82,7 @@ public class TMtInterlockController extends BaseController
     /**
      * 修改关键机组联锁旁路
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:edit')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:edit')")
     @Log(title = "关键机组联锁旁路", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TMtInterlock tMtInterlock)
@@ -93,7 +93,7 @@ public class TMtInterlockController extends BaseController
     /**
      * 删除关键机组联锁旁路
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:remove')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:remove')")
     @Log(title = "关键机组联锁旁路", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

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

@@ -43,7 +43,7 @@ public class TMtKeymaintenanceController extends BaseController
     /**
      * 查询下周关键维修工作列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:list')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:list')")
     @GetMapping("/list")
     public TableDataInfo list(TMtKeymaintenance tMtKeymaintenance)
     {
@@ -80,7 +80,7 @@ public class TMtKeymaintenanceController extends BaseController
     /**
      * 导出下周关键维修工作列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:export')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:export')")
     @Log(title = "下周关键维修工作", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TMtKeymaintenance tMtKeymaintenance)
@@ -93,7 +93,7 @@ public class TMtKeymaintenanceController extends BaseController
     /**
      * 获取下周关键维修工作详细信息
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:query')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -103,7 +103,7 @@ public class TMtKeymaintenanceController extends BaseController
     /**
      * 新增下周关键维修工作
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:add')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:add')")
     @Log(title = "下周关键维修工作", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TMtKeymaintenance tMtKeymaintenance)
@@ -114,7 +114,7 @@ public class TMtKeymaintenanceController extends BaseController
     /**
      * 修改下周关键维修工作
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:edit')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:edit')")
     @Log(title = "下周关键维修工作", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TMtKeymaintenance tMtKeymaintenance)
@@ -125,7 +125,7 @@ public class TMtKeymaintenanceController extends BaseController
     /**
      * 删除下周关键维修工作
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:remove')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:remove')")
     @Log(title = "下周关键维修工作", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

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

@@ -48,7 +48,7 @@ public class TMtMessageattentionController extends BaseController
     /**
      * 导出信息提醒列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:export')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:export')")
     @Log(title = "信息提醒", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TMtMessageattention tMtMessageattention)
@@ -61,7 +61,7 @@ public class TMtMessageattentionController extends BaseController
     /**
      * 获取信息提醒详细信息
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:query')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -71,7 +71,7 @@ public class TMtMessageattentionController extends BaseController
     /**
      * 新增信息提醒
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:add')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:add')")
     @Log(title = "信息提醒", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TMtMessageattention tMtMessageattention)
@@ -82,7 +82,7 @@ public class TMtMessageattentionController extends BaseController
     /**
      * 修改信息提醒
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:edit')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:edit')")
     @Log(title = "信息提醒", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TMtMessageattention tMtMessageattention)
@@ -93,7 +93,7 @@ public class TMtMessageattentionController extends BaseController
     /**
      * 删除信息提醒
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:remove')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:remove')")
     @Log(title = "信息提醒", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

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

@@ -36,7 +36,7 @@ public class TMtOpextrackController extends BaseController
     /**
      * 查询OpEx项目跟踪列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:list')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:list')")
     @GetMapping("/list")
     public TableDataInfo list(TMtOpextrack tMtOpextrack)
     {
@@ -48,7 +48,7 @@ public class TMtOpextrackController extends BaseController
     /**
      * 导出OpEx项目跟踪列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:export')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:export')")
     @Log(title = "OpEx项目跟踪", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TMtOpextrack tMtOpextrack)
@@ -61,7 +61,7 @@ public class TMtOpextrackController extends BaseController
     /**
      * 获取OpEx项目跟踪详细信息
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:query')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -71,7 +71,7 @@ public class TMtOpextrackController extends BaseController
     /**
      * 新增OpEx项目跟踪
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:add')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:add')")
     @Log(title = "OpEx项目跟踪", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TMtOpextrack tMtOpextrack)
@@ -82,7 +82,7 @@ public class TMtOpextrackController extends BaseController
     /**
      * 修改OpEx项目跟踪
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:edit')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:edit')")
     @Log(title = "OpEx项目跟踪", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TMtOpextrack tMtOpextrack)
@@ -93,7 +93,7 @@ public class TMtOpextrackController extends BaseController
     /**
      * 删除OpEx项目跟踪
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:remove')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:remove')")
     @Log(title = "OpEx项目跟踪", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

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

@@ -43,7 +43,7 @@ public class TMtPersonController extends BaseController
     /**
      * 查询会议人员列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:list')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:list')")
     @GetMapping("/list")
     public TableDataInfo list(TMtPerson tMtPerson)
     {
@@ -55,7 +55,7 @@ public class TMtPersonController extends BaseController
     /**
      * 导出会议人员列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:export')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:export')")
     @Log(title = "会议人员", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TMtPerson tMtPerson)
@@ -68,7 +68,7 @@ public class TMtPersonController extends BaseController
     /**
      * 获取会议人员详细信息
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:query')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -78,7 +78,7 @@ public class TMtPersonController extends BaseController
     /**
      * 新增会议人员
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:add')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:add')")
     @Log(title = "会议人员", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TMtPerson tMtPerson)
@@ -98,7 +98,7 @@ public class TMtPersonController extends BaseController
     /**
      * 修改会议人员
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:edit')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:edit')")
     @Log(title = "会议人员", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TMtPerson tMtPerson)
@@ -109,7 +109,7 @@ public class TMtPersonController extends BaseController
     /**
      * 删除会议人员
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:remove')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:remove')")
     @Log(title = "会议人员", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

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

@@ -36,7 +36,7 @@ public class TMtRiskreminderController extends BaseController
     /**
      * 查询风险提醒列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:list')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:list')")
     @GetMapping("/list")
     public TableDataInfo list(TMtRiskreminder tMtRiskreminder)
     {
@@ -48,7 +48,7 @@ public class TMtRiskreminderController extends BaseController
     /**
      * 导出风险提醒列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:export')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:export')")
     @Log(title = "风险提醒", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TMtRiskreminder tMtRiskreminder)
@@ -61,7 +61,7 @@ public class TMtRiskreminderController extends BaseController
     /**
      * 获取风险提醒详细信息
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:query')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -71,7 +71,7 @@ public class TMtRiskreminderController extends BaseController
     /**
      * 新增风险提醒
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:add')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:add')")
     @Log(title = "风险提醒", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TMtRiskreminder tMtRiskreminder)
@@ -82,7 +82,7 @@ public class TMtRiskreminderController extends BaseController
     /**
      * 修改风险提醒
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:edit')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:edit')")
     @Log(title = "风险提醒", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TMtRiskreminder tMtRiskreminder)
@@ -93,7 +93,7 @@ public class TMtRiskreminderController extends BaseController
     /**
      * 删除风险提醒
      */
-    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:remove')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:remove')")
     @Log(title = "风险提醒", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

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

@@ -40,6 +40,9 @@ import javax.annotation.Resource;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * 人员管理Controller
@@ -260,7 +263,6 @@ public class TStaffmgrController extends BaseController
     @GetMapping("/selectTime")
     public TableDataInfo selectTime(TStaffmgr tStaffmgr)
     {
-        ServletUtils.getParameter("sexs");
         startPage();
         List<TStaffmgr> list = tStaffmgrService.selectRecordList(tStaffmgr);
         try {
@@ -286,21 +288,37 @@ public class TStaffmgrController extends BaseController
         logger.info("selectTime:" + list.size());
         List<TTrainingParticipants> tTrainingParticipants = tTrainingParticipantsService.selectTTrainingParticipantsList(new TTrainingParticipants());
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
+        //线程池
+        ExecutorService executorService = Executors.newFixedThreadPool(10);
+        final CountDownLatch latch = new CountDownLatch(list.size()); //相同线程数量的计数
         for (int i = 0; i < list.size(); i++) {
-            double time = 0;
-            for (TTrainingParticipants t : tTrainingParticipants) {
-                if (t.getStaffId().equals(list.get(i).getStaffid())) {
-                    if (t.getStartDate() != null) {
-                        if (sdf.format(t.getStartDate()).equals(sdf.format(new Date()))) {
-                            if (t.getTrainingDuration() != null) {
-                                time = time + Double.parseDouble(t.getTrainingDuration());
+            int finalI = i;
+            executorService.execute(() -> {
+                try {
+                    double time = 0;
+                    for (TTrainingParticipants t : tTrainingParticipants) {
+                        if (t.getStaffId().equals(list.get(finalI).getStaffid())) {
+                            if (t.getStartDate() != null) {
+                                if (sdf.format(t.getStartDate()).equals(sdf.format(new Date()))) {
+                                    if (t.getTrainingDuration() != null) {
+                                        time = time + Double.parseDouble(t.getTrainingDuration());
+                                    }
+                                }
                             }
                         }
                     }
+                    list.get(finalI).setTrainingTime(String.valueOf(time));
+                }finally {
+                    latch.countDown(); //线程计数
                 }
-            }
-            list.get(i).setTrainingTime(String.valueOf(time));
+            });
+        }
+        try {
+            latch.await(); //线程计数完毕后继续执行
+        } catch (InterruptedException e) {
+            e.printStackTrace();
         }
+        executorService.shutdown();
         return getDataTable(list);
     }
 

master/src/main/java/com/ruoyi/project/training/newstaff/controller/TTnFirstplanController.java

@@ -90,6 +90,17 @@ public class TTnFirstplanController extends BaseController
         return toAjax(tTnFirstplanService.updateTTnFirstplan(tTnFirstplan));
     }
 
+    /**
+     * 修改进组培训
+     */
+    @PreAuthorize("@ss.hasPermi('newstaff:firstplan:edit')")
+    @Log(title = "进组培训", businessType = BusinessType.UPDATE)
+    @GetMapping("batchStatus/{ids}")
+    public AjaxResult batchPlan(@PathVariable Long[] ids)
+    {
+        return toAjax(tTnFirstplanService.batchStatusTTnFirstplanByids(ids));
+    }
+
     /**
      * 删除进组培训
      */

master/src/main/java/com/ruoyi/project/training/newstaff/controller/TTnNewController.java

@@ -3,14 +3,19 @@ package com.ruoyi.project.training.newstaff.controller;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import com.ruoyi.project.plant.domain.TStaffmgr;
 import com.ruoyi.project.plant.service.ITStaffmgrService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.training.domain.TTraining;
-import com.ruoyi.project.training.newstaff.domain.TTnFirstplan;
-import com.ruoyi.project.training.newstaff.domain.TTnFirstplanTmpl;
+import com.ruoyi.project.training.newstaff.domain.*;
 import com.ruoyi.project.training.newstaff.mapper.TTnFirstplanMapper;
+import com.ruoyi.project.training.newstaff.mapper.TTnSchoolplanMapper;
+import com.ruoyi.project.training.newstaff.mapper.TTnTransferplanMapper;
+import com.ruoyi.project.training.newstaff.service.ITTnFirstplanService;
 import com.ruoyi.project.training.newstaff.service.ITTnFirstplanTmplService;
 import com.ruoyi.project.training.spec.domain.TStSuccessor;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,7 +30,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.training.newstaff.domain.TTnNew;
 import com.ruoyi.project.training.newstaff.service.ITTnNewService;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
@@ -50,7 +54,12 @@ public class TTnNewController extends BaseController
     private ITStaffmgrService tStaffmgrService;
     @Resource
     private TTnFirstplanMapper tTnFirstplanMapper;
-
+    @Resource
+    private TTnSchoolplanMapper tTnSchoolplanMapper;
+    @Resource
+    private TTnTransferplanMapper tTnTransferplanMapper;
+    @Autowired
+    private ITTnFirstplanService tTnFirstplanService;
 
     /**
      * 查询新员工培训列表
@@ -61,19 +70,57 @@ public class TTnNewController extends BaseController
     {
         startPage();
         List<TTnNew> list = tTnNewService.selectTTnNewList(tTnNew);
+        //线程池
+        ExecutorService executorService = Executors.newFixedThreadPool(10);
+        final CountDownLatch latch = new CountDownLatch(list.size()); //相同线程数量的计数
         for (TTnNew t: list
              ) {
-            TTnFirstplan tTnFirstplan = new TTnFirstplan();
-            tTnFirstplan.setNewId(t.getNewId());
-            List<TTnFirstplan> list1 = tTnFirstplanMapper.selectTTnFirstplanList(tTnFirstplan);
-            tTnFirstplan.setPlanStatus(1l);
-            List<TTnFirstplan> list2 = tTnFirstplanMapper.selectTTnFirstplanList(tTnFirstplan);
-            if (list1.size() != 0) {
-                t.setPlanFinish( String.valueOf(list2.size()*100 / list1.size()) );
-            }else {
-                t.setPlanFinish("0");
-            }
+            executorService.execute(() -> {
+                try {
+                    //岗前培训
+                    TTnFirstplan tTnFirstplan = new TTnFirstplan();
+                    tTnFirstplan.setNewId(t.getNewId());
+                    List<TTnFirstplan> firstplanAll = tTnFirstplanMapper.selectTTnFirstplanListByNewId(tTnFirstplan);
+                    tTnFirstplan.setPlanStatus(1l);
+                    List<TTnFirstplan> firstplanNow = tTnFirstplanMapper.selectTTnFirstplanListByNewId(tTnFirstplan);
+                    Integer firstAll = firstplanAll.size();
+                    Integer firstNow = firstplanNow.size();
+                    Integer secAll = 0;
+                    Integer secNow = 0;
+                    if (t.getPlanType() == 1) {
+                        TTnSchoolplan tTnSchoolplan = new TTnSchoolplan();
+                        tTnSchoolplan.setNewId(t.getNewId());
+                        List<TTnSchoolplan> schoolplansAll = tTnSchoolplanMapper.selectTTnSchoolplanListByNewId(tTnSchoolplan);
+                        tTnSchoolplan.setPlanStatus(1l);
+                        List<TTnSchoolplan> schoolplansNow = tTnSchoolplanMapper.selectTTnSchoolplanListByNewId(tTnSchoolplan);
+                        secAll = schoolplansAll.size();
+                        secNow= schoolplansNow.size();
+                    }else {
+                        TTnTransferplan tTnTransferplan = new TTnTransferplan();
+                        List<TTnTransferplan> transferplanAll = tTnTransferplanMapper.selectTTnTransferplanListByNewId(tTnTransferplan);
+                        tTnTransferplan.setPlanStatus(1l);
+                        List<TTnTransferplan> transferplanNow = tTnTransferplanMapper.selectTTnTransferplanListByNewId(tTnTransferplan);
+                        secAll = transferplanAll.size();
+                        secNow= transferplanNow.size();
+                    }
+                    if (secAll + firstAll != 0) {
+                        String finsh = String.valueOf((secNow + firstNow) * 100 / (secAll + firstAll));
+                        t.setPlanFinish(finsh);
+                    }else {
+                        t.setPlanFinish("0");
+                    }
+                }finally {
+                    latch.countDown(); //线程计数
+                }
+            });
+        }
+
+        try {
+            latch.await(); //线程计数完毕后继续执行
+        } catch (InterruptedException e) {
+            e.printStackTrace();
         }
+        executorService.shutdown();
         return getDataTable(list);
     }
 

master/src/main/java/com/ruoyi/project/training/newstaff/controller/TTnSchoolplanController.java

@@ -89,7 +89,16 @@ public class TTnSchoolplanController extends BaseController
     {
         return toAjax(tTnSchoolplanService.updateTTnSchoolplan(tTnSchoolplan));
     }
-
+    /**
+     * 修改校招培训
+     */
+    @PreAuthorize("@ss.hasPermi('newstaff:schoolplan:remove')")
+    @Log(title = "校招培训批量", businessType = BusinessType.UPDATE)
+    @GetMapping("batchStatus/{ids}")
+    public AjaxResult batchPlan(@PathVariable Long[] ids)
+    {
+        return toAjax(tTnSchoolplanService.batchStatusByIds(ids));
+    }
     /**
      * 删除校招培训
      */

master/src/main/java/com/ruoyi/project/training/newstaff/controller/TTnTransferplanController.java

@@ -90,6 +90,17 @@ public class TTnTransferplanController extends BaseController
         return toAjax(tTnTransferplanService.updateTTnTransferplan(tTnTransferplan));
     }
 
+    /**
+     * 删除转岗培训
+     */
+    @PreAuthorize("@ss.hasPermi('newstaff:transferplan:remove')")
+    @Log(title = "转岗培训批量", businessType = BusinessType.UPDATE)
+    @GetMapping("batchStatus/{ids}")
+    public AjaxResult batchPlan(@PathVariable Long[] ids)
+    {
+        return toAjax(tTnTransferplanService.batchStatusByIds(ids));
+    }
+
     /**
      * 删除转岗培训
      */

master/src/main/java/com/ruoyi/project/training/newstaff/mapper/TTnFirstplanMapper.java

@@ -30,6 +30,7 @@ public interface TTnFirstplanMapper
     @DataScope(deptAlias = "d")
     public List<TTnFirstplan> selectTTnFirstplanList(TTnFirstplan tTnFirstplan);
 
+    public List<TTnFirstplan> selectTTnFirstplanListByNewId(TTnFirstplan tTnFirstplan);
     /**
      * 新增进组培训
      *
@@ -63,4 +64,6 @@ public interface TTnFirstplanMapper
     public int deleteTTnFirstplanByIds(Long[] ids);
 
     void insertTTnFirstplanTmpl(TTnFirstplanTmpl t);
+
+    int batchStatusTTnFirstplanByids(Long[] ids);
 }

master/src/main/java/com/ruoyi/project/training/newstaff/mapper/TTnSchoolplanMapper.java

@@ -30,6 +30,7 @@ public interface TTnSchoolplanMapper
     @DataScope(deptAlias = "d")
     public List<TTnSchoolplan> selectTTnSchoolplanList(TTnSchoolplan tTnSchoolplan);
 
+    public List<TTnSchoolplan> selectTTnSchoolplanListByNewId(TTnSchoolplan tTnSchoolplan);
     /**
      * 新增校招培训
      *
@@ -63,4 +64,6 @@ public interface TTnSchoolplanMapper
     public int deleteTTnSchoolplanByIds(Long[] ids);
 
     void insertTTnSchoolplanTmpl(TTnSchoolplanTmpl t);
+
+    int batchStatusByIds(Long[] ids);
 }

master/src/main/java/com/ruoyi/project/training/newstaff/mapper/TTnTransferplanMapper.java

@@ -30,6 +30,8 @@ public interface TTnTransferplanMapper
     @DataScope(deptAlias = "d")
     public List<TTnTransferplan> selectTTnTransferplanList(TTnTransferplan tTnTransferplan);
 
+    public List<TTnTransferplan> selectTTnTransferplanListByNewId(TTnTransferplan tTnTransferplan);
+
     /**
      * 新增转岗培训
      *
@@ -63,4 +65,6 @@ public interface TTnTransferplanMapper
     public int deleteTTnTransferplanByIds(Long[] ids);
 
     void insertTTnTransferplanTmpl(TTnTransferplanTmpl t);
+
+    int batchStatusByIds(Long[] ids);
 }

master/src/main/java/com/ruoyi/project/training/newstaff/service/ITTnFirstplanService.java

@@ -58,4 +58,6 @@ public interface ITTnFirstplanService
      * @return 结果
      */
     public int deleteTTnFirstplanById(Long id);
+
+    int batchStatusTTnFirstplanByids(Long[] ids);
 }

master/src/main/java/com/ruoyi/project/training/newstaff/service/ITTnSchoolplanService.java

@@ -5,15 +5,15 @@ import com.ruoyi.project.training.newstaff.domain.TTnSchoolplan;
 
 /**
  * 校招培训Service接口
- * 
+ *
  * @author ruoyi
  * @date 2023-07-05
  */
-public interface ITTnSchoolplanService 
+public interface ITTnSchoolplanService
 {
     /**
      * 查询校招培训
-     * 
+     *
      * @param id 校招培训ID
      * @return 校招培训
      */
@@ -21,7 +21,7 @@ public interface ITTnSchoolplanService
 
     /**
      * 查询校招培训列表
-     * 
+     *
      * @param tTnSchoolplan 校招培训
      * @return 校招培训集合
      */
@@ -29,7 +29,7 @@ public interface ITTnSchoolplanService
 
     /**
      * 新增校招培训
-     * 
+     *
      * @param tTnSchoolplan 校招培训
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface ITTnSchoolplanService
 
     /**
      * 修改校招培训
-     * 
+     *
      * @param tTnSchoolplan 校招培训
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface ITTnSchoolplanService
 
     /**
      * 批量删除校招培训
-     * 
+     *
      * @param ids 需要删除的校招培训ID
      * @return 结果
      */
@@ -53,9 +53,13 @@ public interface ITTnSchoolplanService
 
     /**
      * 删除校招培训信息
-     * 
+     *
      * @param id 校招培训ID
      * @return 结果
      */
     public int deleteTTnSchoolplanById(Long id);
+
+    int batchStatusByIds(Long[] ids);
+
+
 }

master/src/main/java/com/ruoyi/project/training/newstaff/service/ITTnTransferplanService.java

@@ -5,15 +5,15 @@ import com.ruoyi.project.training.newstaff.domain.TTnTransferplan;
 
 /**
  * 转岗培训Service接口
- * 
+ *
  * @author ruoyi
  * @date 2023-07-05
  */
-public interface ITTnTransferplanService 
+public interface ITTnTransferplanService
 {
     /**
      * 查询转岗培训
-     * 
+     *
      * @param id 转岗培训ID
      * @return 转岗培训
      */
@@ -21,7 +21,7 @@ public interface ITTnTransferplanService
 
     /**
      * 查询转岗培训列表
-     * 
+     *
      * @param tTnTransferplan 转岗培训
      * @return 转岗培训集合
      */
@@ -29,7 +29,7 @@ public interface ITTnTransferplanService
 
     /**
      * 新增转岗培训
-     * 
+     *
      * @param tTnTransferplan 转岗培训
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface ITTnTransferplanService
 
     /**
      * 修改转岗培训
-     * 
+     *
      * @param tTnTransferplan 转岗培训
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface ITTnTransferplanService
 
     /**
      * 批量删除转岗培训
-     * 
+     *
      * @param ids 需要删除的转岗培训ID
      * @return 结果
      */
@@ -53,9 +53,11 @@ public interface ITTnTransferplanService
 
     /**
      * 删除转岗培训信息
-     * 
+     *
      * @param id 转岗培训ID
      * @return 结果
      */
     public int deleteTTnTransferplanById(Long id);
+
+    int batchStatusByIds(Long[] ids);
 }

master/src/main/java/com/ruoyi/project/training/newstaff/service/impl/TTnFirstplanServiceImpl.java

@@ -90,4 +90,9 @@ public class TTnFirstplanServiceImpl implements ITTnFirstplanService
     {
         return tTnFirstplanMapper.deleteTTnFirstplanById(id);
     }
+
+    @Override
+    public int batchStatusTTnFirstplanByids(Long[] ids) {
+        return tTnFirstplanMapper.batchStatusTTnFirstplanByids(ids);
+    }
 }

master/src/main/java/com/ruoyi/project/training/newstaff/service/impl/TTnSchoolplanServiceImpl.java

@@ -90,4 +90,9 @@ public class TTnSchoolplanServiceImpl implements ITTnSchoolplanService
     {
         return tTnSchoolplanMapper.deleteTTnSchoolplanById(id);
     }
+
+    @Override
+    public int batchStatusByIds(Long[] ids) {
+        return tTnSchoolplanMapper.batchStatusByIds(ids);
+    }
 }

master/src/main/java/com/ruoyi/project/training/newstaff/service/impl/TTnTransferplanServiceImpl.java

@@ -90,4 +90,9 @@ public class TTnTransferplanServiceImpl implements ITTnTransferplanService
     {
         return tTnTransferplanMapper.deleteTTnTransferplanById(id);
     }
+
+    @Override
+    public int batchStatusByIds(Long[] ids) {
+        return tTnTransferplanMapper.batchStatusByIds(ids);
+    }
 }

master/src/main/resources/application.yml

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /u03/cpmsfile/uploadPath）
-  profile: /u03/cpmsfile/uploadPath
+  profile: D:/ruoyi/uploadPath
   # 邮件中链接跳转路径 示例（本地：http://localhost/#，服务器：http://47.114.101.16:8080/cpms/index.html#）
   requestJumpPath: https://cpms.basf-ypc.net.cn/cpms/index.html#
   # 获取ip地址开关
@@ -182,7 +182,7 @@ jodconverter:
     enabled: true
     # 设置LibreOffice主目录
     #    office-home: /opt/libreoffice7.2  C:/Program Files/LibreOffice
-    office-home: /opt/libreoffice7.2
+    office-home: C:/Program Files/LibreOffice
     max-tasks-per-process: 100
     port-numbers: 8100
     # 开启多个LibreOffice进程，每个端口对应一个进程

master/src/main/resources/mybatis/training/newstaff/TTnFirstplanMapper.xml

@@ -53,6 +53,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ${params.dataScope}
     </select>
 
+    <select id="selectTTnFirstplanListByNewId" parameterType="TTnFirstplan" resultMap="TTnFirstplanResult">
+        <include refid="selectTTnFirstplanVo"/>
+        <where>
+            <if test="newId != null "> and new_id = #{newId}</if>
+            <if test="courseCode != null  and courseCode != ''"> and course_code = #{courseCode}</if>
+            <if test="topic != null  and topic != ''"> and topic = #{topic}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="courseDay != null "> and course_day = #{courseDay}</if>
+            <if test="courseHour != null "> and course_hour = #{courseHour}</if>
+            <if test="courseType != null  and courseType != ''"> and course_type = #{courseType}</if>
+            <if test="trainer != null  and trainer != ''"> and trainer = #{trainer}</if>
+            <if test="courseDate != null "> and course_date = #{courseDate}</if>
+            <if test="planStatus != null "> and plan_status = #{planStatus}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+    </select>
+
     <select id="selectTTnFirstplanById" parameterType="Long" resultMap="TTnFirstplanResult">
         <include refid="selectTTnFirstplanVo"/>
         where id = #{id}
@@ -187,4 +205,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </update>
 
+
+    <update id="batchStatusTTnFirstplanByids" parameterType="String">
+        update t_tn_firstplan set plan_status = 1 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
 </mapper>

master/src/main/resources/mybatis/training/newstaff/TTnSchoolplanMapper.xml

@@ -51,6 +51,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ${params.dataScope}
     </select>
 
+    <select id="selectTTnSchoolplanListByNewId" parameterType="TTnSchoolplan" resultMap="TTnSchoolplanResult">
+        <include refid="selectTTnSchoolplanVo"/>
+        <where>
+            <if test="newId != null "> and new_id = #{newId}</if>
+            <if test="courseCode != null  and courseCode != ''"> and course_code = #{courseCode}</if>
+            <if test="topic != null  and topic != ''"> and topic = #{topic}</if>
+            <if test="detailPlan != null  and detailPlan != ''"> and detail_plan = #{detailPlan}</if>
+            <if test="trainer != null  and trainer != ''"> and trainer = #{trainer}</if>
+            <if test="courseDate != null "> and course_date = #{courseDate}</if>
+            <if test="assess != null  and assess != ''"> and assess = #{assess}</if>
+            <if test="planStatus != null "> and plan_status = #{planStatus}</if>
+
+            and d.del_flag = 0
+        </where>
+    </select>
+
     <select id="selectTTnSchoolplanById" parameterType="Long" resultMap="TTnSchoolplanResult">
         <include refid="selectTTnSchoolplanVo"/>
         where id = #{id}
@@ -186,4 +202,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </update>
 
+    <update id="batchStatusByIds" parameterType="String">
+        update t_tn_schoolplan set plan_status = 1 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
 </mapper>

master/src/main/resources/mybatis/training/newstaff/TTnTransferplanMapper.xml

@@ -46,6 +46,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ${params.dataScope}
     </select>
 
+    <select id="selectTTnTransferplanListByNewId" parameterType="TTnTransferplan" resultMap="TTnTransferplanResult">
+        <include refid="selectTTnTransferplanVo"/>
+        <where>
+            <if test="courseCode != null  and courseCode != ''"> and course_code like concat(concat('%', #{courseCode}), '%')</if>
+            <if test="topic != null  and topic != ''"> and topic like concat(concat('%', #{topic}), '%')</if>
+            <if test="planStatus != null "> and plan_status = #{planStatus}</if>
+            <if test="newId != null "> and new_id = #{newId}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
     <select id="selectTTnTransferplanById" parameterType="Long" resultMap="TTnTransferplanResult">
         <include refid="selectTTnTransferplanVo"/>
         where id = #{id}
@@ -181,4 +194,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </update>
 
+    <update id="batchStatusByIds" parameterType="String">
+        update t_tn_transferplan set plan_status = 1 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
 </mapper>

ui/src/api/common/homedataCbps.js

@@ -0,0 +1,30 @@
+import request from '@/utils/request'
+
+// 查询4个统计
+export function countNum() {
+  return request({
+    url: '/byx/home/countNum',
+    method: 'get',
+  })
+}
+// 查询装置程序清单统计
+export function procedureCount() {
+  return request({
+    url: '/byx/home/procedureCount',
+    method: 'get',
+  })
+}
+// 统计培训
+export function trainCount() {
+  return request({
+    url: '/byx/home/trainCount',
+    method: 'get',
+  })
+}
+// 根据时间统计
+export function getLine() {
+  return request({
+    url: '/byx/home/getLine',
+    method: 'get',
+  })
+}

ui/src/api/training/newstaff/firstplan.js

@@ -35,11 +35,11 @@ export function updateFirstplan(data) {
   })
 }
 
-// 删除进组培训
-export function delFirstplan(id) {
+// 批量进组培训
+export function batchStatus(id) {
   return request({
-    url: '/newstaff/firstplan/' + id,
-    method: 'delete'
+    url: '/newstaff/firstplan/batchStatus/' + id,
+    method: 'get'
   })
 }
 
@@ -50,4 +50,4 @@ export function exportFirstplan(query) {
     method: 'get',
     params: query
   })
-}
+}

ui/src/api/training/newstaff/schoolplan.js

@@ -50,4 +50,12 @@ export function exportSchoolplan(query) {
     method: 'get',
     params: query
   })
-}
+}
+
+// 批量校招培训
+export function batchStatus(id) {
+  return request({
+    url: '/newstaff/schoolplan/batchStatus/' + id,
+    method: 'get'
+  })
+}

ui/src/api/training/newstaff/transferplan.js

@@ -50,4 +50,12 @@ export function exportTransferplan(query) {
     method: 'get',
     params: query
   })
-}
+}
+
+// 批量转岗培训
+export function batchStatus(id) {
+  return request({
+    url: '/newstaff/transferplan/batchStatus/' + id,
+    method: 'get'
+  })
+}

ui/src/views/components/meeting/actionlist.vue

@@ -59,7 +59,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['plant:actionlist:add']"
+          v-hasPermi="['plant:meeting:add']"
         >{{ $t('新增') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -69,7 +69,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['plant:actionlist:edit']"
+          v-hasPermi="['plant:meeting:edit']"
         >{{ $t('修改') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -79,7 +79,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['plant:actionlist:remove']"
+          v-hasPermi="['plant:meeting:remove']"
         >{{ $t('删除') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -117,14 +117,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['plant:actionlist:edit']"
+            v-hasPermi="['plant:meeting:edit']"
           >{{ $t('修改') }}</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['plant:actionlist:remove']"
+            v-hasPermi="['plant:meeting:remove']"
           >{{ $t('删除') }}</el-button>
         </template>
       </el-table-column>

ui/src/views/components/meeting/ehsopenitem.vue

@@ -50,7 +50,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['plant:ehsopenitem:add']"
+          v-hasPermi="['plant:meeting:add']"
         >{{ $t('新增') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -60,7 +60,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['plant:ehsopenitem:edit']"
+          v-hasPermi="['plant:meeting:edit']"
         >{{ $t('修改') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -70,7 +70,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['plant:ehsopenitem:remove']"
+          v-hasPermi="['plant:meeting:remove']"
         >{{ $t('删除') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -104,14 +104,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['plant:ehsopenitem:edit']"
+            v-hasPermi="['plant:meeting:edit']"
           >{{ $t('修改') }}</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['plant:ehsopenitem:remove']"
+            v-hasPermi="['plant:meeting:remove']"
           >{{ $t('删除') }}</el-button>
         </template>
       </el-table-column>

ui/src/views/components/meeting/interlock.vue

@@ -14,7 +14,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['plant:interlock:add']"
+          v-hasPermi="['plant:meeting:add']"
         >{{ $t('新增') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -24,7 +24,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['plant:interlock:edit']"
+          v-hasPermi="['plant:meeting:edit']"
         >{{ $t('修改') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -34,7 +34,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['plant:interlock:remove']"
+          v-hasPermi="['plant:meeting:remove']"
         >{{ $t('删除') }}</el-button>
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -58,14 +58,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['plant:interlock:edit']"
+            v-hasPermi="['plant:meeting:edit']"
           >{{ $t('修改') }}</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['plant:interlock:remove']"
+            v-hasPermi="['plant:meeting:remove']"
           >{{ $t('删除') }}</el-button>
         </template>
       </el-table-column>

ui/src/views/components/meeting/keymaintenance.vue

@@ -50,7 +50,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['plant:keymaintenance:add']"
+          v-hasPermi="['plant:meeting:add']"
         >{{ $t('新增') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -60,7 +60,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['plant:keymaintenance:edit']"
+          v-hasPermi="['plant:meeting:edit']"
         >{{ $t('修改') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -70,7 +70,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['plant:keymaintenance:remove']"
+          v-hasPermi="['plant:meeting:remove']"
         >{{ $t('删除') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -108,14 +108,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['plant:keymaintenance:edit']"
+            v-hasPermi="['plant:meeting:edit']"
           >{{ $t('修改') }}</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['plant:keymaintenance:remove']"
+            v-hasPermi="['plant:meeting:remove']"
           >{{ $t('删除') }}</el-button>
         </template>
       </el-table-column>

ui/src/views/components/meeting/messageattention.vue

@@ -51,7 +51,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['plant:messageattention:add']"
+          v-hasPermi="['plant:meeting:add']"
         >{{ $t('新增') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -61,7 +61,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['plant:messageattention:edit']"
+          v-hasPermi="['plant:meeting:edit']"
         >{{ $t('修改') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -71,7 +71,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['plant:messageattention:remove']"
+          v-hasPermi="['plant:meeting:remove']"
         >{{ $t('删除') }}</el-button>
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -98,14 +98,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['plant:messageattention:edit']"
+            v-hasPermi="['plant:meeting:edit']"
           >{{ $t('修改') }}</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['plant:messageattention:remove']"
+            v-hasPermi="['plant:meeting:remove']"
           >{{ $t('删除') }}</el-button>
         </template>
       </el-table-column>

ui/src/views/components/meeting/opextrack.vue

@@ -32,7 +32,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['plant:opextrack:add']"
+          v-hasPermi="['plant:meeting:add']"
         >{{ $t('新增') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -42,7 +42,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['plant:opextrack:edit']"
+          v-hasPermi="['plant:meeting:edit']"
         >{{ $t('修改') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -52,7 +52,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['plant:opextrack:remove']"
+          v-hasPermi="['plant:meeting:remove']"
         >{{ $t('删除') }}</el-button>
       </el-col>
 <!--        <el-col :span="1.5">-->
@@ -96,14 +96,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['plant:opextrack:edit']"
+            v-hasPermi="['plant:meeting:edit']"
           >{{ $t('修改') }}</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['plant:opextrack:remove']"
+            v-hasPermi="['plant:meeting:remove']"
           >{{ $t('删除') }}</el-button>
         </template>
       </el-table-column>

ui/src/views/components/meeting/person.vue

@@ -22,7 +22,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['plant:person:add']"
+          v-hasPermi="['plant:meeting:add']"
         >{{ $t('新增') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -32,7 +32,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['plant:person:remove']"
+          v-hasPermi="['plant:meeting:remove']"
         >{{ $t('删除') }}</el-button>
       </el-col>
 
@@ -56,7 +56,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['plant:person:remove']"
+            v-hasPermi="['plant:meeting:remove']"
           >{{ $t('删除') }}</el-button>
         </template>
       </el-table-column>

ui/src/views/components/meeting/riskreminder.vue

@@ -32,7 +32,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['plant:riskreminder:add']"
+          v-hasPermi="['plant:meeting:add']"
         >{{ $t('新增') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -42,7 +42,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['plant:riskreminder:edit']"
+          v-hasPermi="['plant:meeting:edit']"
         >{{ $t('修改') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -52,7 +52,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['plant:riskreminder:remove']"
+          v-hasPermi="['plant:meeting:remove']"
         >{{ $t('删除') }}</el-button>
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -76,14 +76,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['plant:riskreminder:edit']"
+            v-hasPermi="['plant:meeting:edit']"
           >{{ $t('修改') }}</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['plant:riskreminder:remove']"
+            v-hasPermi="['plant:meeting:remove']"
           >{{ $t('删除') }}</el-button>
         </template>
       </el-table-column>

ui/src/views/dashboard/LineChart.vue

@@ -7,7 +7,7 @@ import echarts from 'echarts'
 
 require('echarts/theme/macarons') // echarts theme
 import resize from './mixins/resize'
-import {getLine} from "@/api/ehs/homedata";
+import {getLine} from "@/api/common/homedataCbpb";
 
 export default {
   mixins: [resize],

ui/src/views/dashboard/PanelGroup.vue

@@ -57,7 +57,7 @@
 
 <script>
 import CountTo from 'vue-count-to'
-import {countNum} from "@/api/ehs/homedata";
+import {countNum} from "@/api/common/homedataCbpb";
 
 export default {
   components: {

ui/src/views/dashboard/byx/PieChart.vue

@@ -6,7 +6,7 @@
 import echarts from 'echarts'
 require('echarts/theme/macarons') // echarts theme
 import resize from '../mixins/resize'
-import {trainCount} from "@/api/ehs/homedata";
+import {trainCount} from "@/api/common/homedataCbpb";
 
 export default {
   mixins: [resize],

ui/src/views/dashboard/byx/RaddarChart.vue

@@ -7,7 +7,7 @@ import echarts from 'echarts'
 
 require('echarts/theme/macarons') // echarts theme
 import resize from '../mixins/resize'
-import {procedureCount} from "@/api/ehs/homedata";
+import {procedureCount} from "@/api/common/homedataCbpb";
 
 const animationDuration = 3000
 

ui/src/views/dashboard/hcq/PieChart.vue

@@ -6,7 +6,7 @@
 import echarts from 'echarts'
 require('echarts/theme/macarons') // echarts theme
 import resize from '../mixins/resize'
-import {trainCount} from "@/api/ehs/homedata";
+import {trainCount} from "@/api/common/homedataCbpb";
 
 export default {
   mixins: [resize],

ui/src/views/dashboard/hcq/RaddarChart.vue

@@ -7,7 +7,7 @@ import echarts from 'echarts'
 
 require('echarts/theme/macarons') // echarts theme
 import resize from '../mixins/resize'
-import {procedureCount} from "@/api/ehs/homedata";
+import {procedureCount} from "@/api/common/homedataCbpb";
 
 const animationDuration = 3000
 

ui/src/views/plant/weekmeeting/index.vue

@@ -7,7 +7,7 @@
       icon="el-icon-edit"
       size="mini"
       @click="handleAdd"
-      v-hasPermi="['plant:keymaintenance:edit']"
+      v-hasPermi="['plant:meeting:edit']"
     >{{ $t('保存会议') }}</el-button>
     <el-button
       v-if="this.meetingId == null"
@@ -16,7 +16,7 @@
       icon="el-icon-edit"
       size="mini"
       @click="importMeeting"
-      v-hasPermi="['plant:keymaintenance:edit']"
+      v-hasPermi="['plant:meeting:edit']"
     >{{ $t('导入会议') }}</el-button>
     <h3
       v-if="this.meetingId != null"

ui/src/views/training/newstaff/firstplan/index.vue

@@ -80,6 +80,16 @@
           @click="handleDelete"
           v-hasPermi="['newstaff:firstplan:remove']"
         >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="multiple"
+          @click="handleBatchPlan"
+          v-hasPermi="['newstaff:firstplan:edit']"
+        >批量完成</el-button>
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -99,7 +109,7 @@
         </template>
       </el-table-column>
       <el-table-column label="考核情况" align="center" prop="assess" :show-overflow-tooltip="true"/>
-      <el-table-column label="培训状态" align="center" prop="planStatus" :formatter="planStatusFormat" >
+      <el-table-column label="培训状态" align="center" prop="planStatus" >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.planStatus == 1" size="small" type="success">已完成</el-tag>
           <el-tag v-else-if="scope.row.planStatus == 0" size="small" type="info">未完成</el-tag>
@@ -225,7 +235,7 @@
 </template>
 
 <script>
-import { listFirstplan, getFirstplan, delFirstplan, addFirstplan, updateFirstplan, exportFirstplan, importTemplate} from "@/api/training/newstaff/firstplan";
+import { listFirstplan,batchStatus, getFirstplan, delFirstplan, addFirstplan, updateFirstplan, exportFirstplan, importTemplate} from "@/api/training/newstaff/firstplan";
 import { treeselect } from "@/api/system/dept";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
@@ -424,6 +434,21 @@ export default {
           this.msgSuccess("删除成功");
         })
     },
+    /** 批量按钮操作 */
+    handleBatchPlan(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认批量完成?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return batchStatus(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("操作成功");
+      })
+    },
+
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;

ui/src/views/training/newstaff/planList/index.vue

@@ -4,10 +4,10 @@
       <el-tab-pane label="进组前培训" name="first">
         <list item="1" typename="firstplan" v-if="isFirst"></list>
       </el-tab-pane>
-      <el-tab-pane v-if="planType == 2" label="转岗培训" name="second">
+      <el-tab-pane v-if="planType == 2" label="师徒培训计划(转岗)" name="second">
         <list2 item="1" typename="transferplan" v-if="isSecond"></list2>
       </el-tab-pane>
-      <el-tab-pane v-else-if="planType == 1" label="校招培训" name="third">
+      <el-tab-pane v-else-if="planType == 1" label="师徒培训计划(校招)" name="third">
         <list3 item="1" typename="schoolplan" v-if="isThird"></list3>
       </el-tab-pane>
     </el-tabs>

ui/src/views/training/newstaff/schoolplan/index.vue

@@ -72,7 +72,16 @@
           v-hasPermi="['newstaff:schoolplan:remove']"
         >删除</el-button>
       </el-col>
-
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="multiple"
+          @click="handleBatchPlan"
+          v-hasPermi="['newstaff:schoolplan:edit']"
+        >批量完成</el-button>
+      </el-col>
 
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -214,7 +223,7 @@
 </template>
 
 <script>
-import { listSchoolplan, getSchoolplan, delSchoolplan, addSchoolplan, updateSchoolplan, exportSchoolplan, importTemplate} from "@/api/training/newstaff/schoolplan";
+import { listSchoolplan,batchStatus, getSchoolplan, delSchoolplan, addSchoolplan, updateSchoolplan, exportSchoolplan, importTemplate} from "@/api/training/newstaff/schoolplan";
 import { treeselect } from "@/api/system/dept";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
@@ -397,6 +406,20 @@ export default {
         }
       });
     },
+    /** 批量按钮操作 */
+    handleBatchPlan(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认批量完成?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return batchStatus(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("操作成功");
+      })
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;

ui/src/views/training/newstaff/schoolplantmpl/index.vue

@@ -54,24 +54,6 @@
           @click="handleDelete"
           v-hasPermi="['newstaff:schoolplantmpl:remove']"
         >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['newstaff:schoolplantmpl:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['newstaff:schoolplantmpl:export']"
-        >导出</el-button>
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>

ui/src/views/training/newstaff/tnNew/index.vue

@@ -106,14 +106,14 @@
     <el-table v-loading="loading" :data="tnNewList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="培训员工编号" align="center" prop="staffId" :show-overflow-tooltip="true"/>-->
-      <el-table-column label="新员工姓名" align="center" fixed="left" prop="staffName" :show-overflow-tooltip="true"/>
-      <el-table-column label="培训状态" align="center" prop="planStatus" :formatter="planStatusFormat" >
+      <el-table-column label="新员工" align="center" prop="staffName" width="100" />
+      <el-table-column label="培训状态" align="center" prop="planStatus" width="100" :formatter="planStatusFormat" >
       <template slot-scope="scope">
         <el-tag v-if="scope.row.planStatus == 1" size="small" type="success">已完成</el-tag>
         <el-tag v-else-if="scope.row.planStatus == 0" size="small" type="info">未完成</el-tag>
       </template>
       </el-table-column>
-      <el-table-column label="进度">
+      <el-table-column label="进度" align="center" width="160">
         <template slot-scope="scope">
           <el-progress :percentage="scope.row.planFinish"></el-progress>
         </template>
@@ -129,24 +129,35 @@
         </template>
       </el-table-column>
 <!--      <el-table-column label="导师员工编号" align="center" prop="mentorStaffId" :show-overflow-tooltip="true"/>-->
-      <el-table-column label="导师号" align="center" prop="mentorStaffName" :show-overflow-tooltip="true"/>
-      <el-table-column label="培训类型" align="center" prop="planType" :formatter="planTypeFormat" />
-      <el-table-column label="三级教育记录卡" align="center" prop="pipe">
+      <el-table-column label="导师" align="center" prop="mentorStaffName" width="100" />
+      <el-table-column label="培训类型" align="center" prop="planType" :formatter="planTypeFormat" width="100"/>
+      <el-table-column label="三级教育记录卡" align="center" prop="three" width="80">
         <template slot-scope="scope">
-          <el-button  icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'training-three')" circle></el-button>
+          <el-button  icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'tnNew-three')" circle></el-button>
         </template>
       </el-table-column>
-      <el-table-column label="带徒协议" align="center" prop="pipe">
+
+      <el-table-column label="上岗能力评测表" align="center" prop="firstplan-score" width="80">
+        <template slot-scope="scope">
+          <el-button  icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'tnNew-firstplan-score')" circle></el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="带徒协议" align="center" prop="agreement" width="80">
+        <template slot-scope="scope">
+          <el-button  icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'tnNew-teacher-agreement')" circle></el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="带徒目标" align="center" prop="target" width="80">
         <template slot-scope="scope">
-          <el-button  icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'training-teacher')" circle></el-button>
+          <el-button  icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'tnNew-teacher-target')" circle></el-button>
         </template>
       </el-table-column>
-      <el-table-column label="培训考评" align="center" prop="pipe">
+      <el-table-column label="培训考评" align="center" prop="tnNew-score" width="80">
         <template slot-scope="scope">
-          <el-button  icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'training-score')" circle></el-button>
+          <el-button  icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'tnNew-score')" circle></el-button>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="100"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

ui/src/views/training/newstaff/transferplan/index.vue

@@ -54,6 +54,16 @@
           @click="handleDelete"
           v-hasPermi="['newstaff:transferplan:remove']"
         >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="multiple"
+          @click="handleBatchPlan"
+          v-hasPermi="['newstaff:transferplan:edit']"
+        >批量完成</el-button>
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -195,7 +205,7 @@
 </template>
 
 <script>
-import { listTransferplan, getTransferplan, delTransferplan, addTransferplan, updateTransferplan, exportTransferplan, importTemplate} from "@/api/training/newstaff/transferplan";
+import { listTransferplan,batchStatus, getTransferplan, delTransferplan, addTransferplan, updateTransferplan, exportTransferplan, importTemplate} from "@/api/training/newstaff/transferplan";
 import { treeselect } from "@/api/system/dept";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
@@ -388,6 +398,20 @@ export default {
           this.msgSuccess("删除成功");
         })
     },
+    /** 批量按钮操作 */
+    handleBatchPlan(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认批量完成?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return batchStatus(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("操作成功");
+      })
+    },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;

ui/src/views/training/newstaff/transferplantmpl/index.vue

@@ -55,24 +55,7 @@
           v-hasPermi="['newstaff:transferplantmpl:remove']"
         >删除</el-button>
       </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['newstaff:transferplantmpl:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['newstaff:transferplantmpl:export']"
-        >导出</el-button>
-      </el-col>
+
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

ui/src/views/training/workcertificate-link/index.vue

@@ -0,0 +1,33 @@
+<template>
+
+  <cbpc-workcertificate v-if="homeType== 1"></cbpc-workcertificate>
+  <cbps-workcertificate v-else-if="homeType == 5"></cbps-workcertificate>
+  <cbpc-workcertificate v-else></cbpc-workcertificate>
+
+  <!--  <semshome v-show="homeType == 2"></semshome>-->
+</template>
+
+<script>
+  import cbpcWorkcertificate from "../workcertificate/index";
+  import cbpsWorkcertificate from "../workcertificateCbps/index";
+
+  export default {
+    data() {
+      return {
+        homeType: '',
+      };
+    },
+    components: {
+      cbpcWorkcertificate,
+      cbpsWorkcertificate
+    },
+    mounted() {
+      console.log(this.$store.state.user.homeType)
+      this.homeType = this.$store.state.user.homeType
+    },
+  };
+</script>
+
+<style lang="scss" scoped>
+
+</style>

ui/src/views/training/worklicense-link/index.vue

@@ -0,0 +1,44 @@
+<template>
+  <homepage v-if="homeType== 1"></homepage>
+  <semshome v-else-if="homeType == 2"></semshome>
+  <invoice v-else-if="homeType== 3"></invoice>
+  <byxhome v-else-if="homeType== 4"></byxhome>
+  <hcqhome v-else-if="homeType== 5"></hcqhome>
+<!--  <semshome v-show="homeType == 2"></semshome>-->
+</template>
+
+<script>
+  // import homepage from "./homepage";
+  // 原始首页
+  // import homepage from "./monitor/elec/index";
+  // 重构后首页
+  import homepage from "./monitor/bccHome/index";
+  import byxhome from "./byxhome";
+  import hcqhome from "./hcqhome";
+  import semshome from "./sems/specanalysis/index";
+  import invoice from "./invoice/bookingworkticket/index";
+  import '@/common/flexible.js';
+
+  export default {
+    data() {
+      return {
+        homeType: '',
+      };
+    },
+    components: {
+      homepage,
+      semshome,
+      invoice,
+      byxhome,
+      hcqhome
+    },
+    mounted() {
+      console.log(this.$store.state.user.homeType)
+      this.homeType = this.$store.state.user.homeType
+    },
+  };
+</script>
+
+<style lang="scss" scoped>
+
+</style>