导师带徒 修改流程

master/src/main/java/com/ruoyi/project/ehs/controller/TApproveDangerController.java

@@ -1,9 +1,8 @@
 package com.ruoyi.project.ehs.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.github.pagehelper.PageInfo;
-import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.http.HttpContextUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -234,12 +233,23 @@ public class TApproveDangerController extends BaseController {
     public TableDataInfo myApprovelist(@RequestParam Map<String, Object> params) {
         ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
         //查询发起流程
-        List<HistoricProcessInstance> historicProcessInstanceList =
-                historyService.createHistoricProcessInstanceQuery()
-                        .startedBy(getUserId().toString()).orderByProcessInstanceStartTime().desc()//参与者，组任务查询
-                        .listPage(PageUtils.getStart(params), Integer.parseInt((String) params.get("pageSize")));
-        Long count = historyService.createHistoricProcessInstanceQuery()
-                .startedBy(getUserId().toString()).count();
+        List<HistoricProcessInstance> historicProcessInstanceList = null;
+        Long count;
+        if (StringUtils.isEmpty(params.getOrDefault("definitionKey", "").toString())) {
+            historicProcessInstanceList = historyService.createHistoricProcessInstanceQuery()
+                    .startedBy(getUserId().toString()).orderByProcessInstanceStartTime().desc()//参与者，组任务查询
+                    .listPage(PageUtils.getStart(params), Integer.parseInt((String) params.get("pageSize")));
+            count = historyService.createHistoricProcessInstanceQuery()
+                    .startedBy(getUserId().toString()).count();
+        } else {
+            historicProcessInstanceList = historyService.createHistoricProcessInstanceQuery()
+                    .startedBy(getUserId().toString()).orderByProcessInstanceStartTime().desc()//参与者，组任务查询
+                    .processDefinitionKeyIn(JSON.parseArray(params.get("definitionKey").toString(), String.class))
+                    .listPage(PageUtils.getStart(params), Integer.parseInt((String) params.get("pageSize")));
+            count = historyService.createHistoricProcessInstanceQuery()
+                    .processDefinitionKeyIn(JSON.parseArray(params.get("definitionKey").toString(), String.class))
+                    .startedBy(getUserId().toString()).count();
+        }
         logger.info(JSON.toJSONString(historicProcessInstanceList));
         //整合我的申请数据
         List<DevProcess> list = new ArrayList<>();
@@ -311,13 +321,13 @@ public class TApproveDangerController extends BaseController {
                         TSaiApply approve = tSaiApplyService.selectTSaiApplyById(Long.parseLong(pi.getBusinessKey()));
                         devProcess.setApproveObject(approve);
                         devProcess.setApNo(approve.getApNo());
-                    }else if (pi.getProcessDefinitionName().equals("每周安全排查报告")) {
+                    } else if (pi.getProcessDefinitionName().equals("每周安全排查报告")) {
                         TSpecWeekcheck t = tSpecWeekcheckService.selectTSpecWeekcheckById(Long.parseLong(pi.getBusinessKey()));
                         SysUser user = sysUserService.selectUserById(Long.valueOf(t.getCreaterCode()));
                         devProcess.setApNo(t.getId().toString());
                         devProcess.setApName(user.getNickName());
                         devProcess.setApproveObject(t);
-                    }else if (pi.getProcessDefinitionName().equals("导师带徒经理审批")) {
+                    } else if (pi.getProcessDefinitionName().equals("导师带徒经理审批")) {
                         TTsApprove t = tTsApproveService.selectTTsApproveById(Long.parseLong(pi.getBusinessKey()));
                         devProcess.setApNo(t.getApNo());
                         devProcess.setApproveObject(t);
@@ -339,7 +349,7 @@ public class TApproveDangerController extends BaseController {
                 logger.info("devProcess:" + devProcess);
                 list.add(devProcess);
             }
-        return getDataTable(list , count);
+        return getDataTable(list, count);
     }
 
     /**
@@ -348,14 +358,28 @@ public class TApproveDangerController extends BaseController {
     @GetMapping("/backlogList")
     public TableDataInfo backlogList(@RequestParam Map<String, Object> params) {
         ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
-        List<Task> taskList = processEngine.getTaskService()//获取任务service
-                .createTaskQuery()//创建查询对象
-                .taskCandidateOrAssigned(getUserId().toString())
-//                .taskAssignee(getUserId().toString())
-                .orderByTaskCreateTime().desc()//参与者，组任务查询
-                .listPage(PageUtils.getStart(params), Integer.parseInt((String) params.get("pageSize")));
+        List<Task> taskList;
         //分页数据
-        Long count = processEngine.getTaskService().createTaskQuery().taskCandidateUser(getUserId().toString()).count();
+        Long count;
+        if (StringUtils.isEmpty(params.getOrDefault("definitionKey", "").toString())) {
+            taskList = processEngine.getTaskService()//获取任务service
+                    .createTaskQuery()//创建查询对象
+                    .taskCandidateOrAssigned(getUserId().toString())
+                    //                .taskAssignee(getUserId().toString())
+                    .orderByTaskCreateTime().desc()//参与者，组任务查询
+                    .listPage(PageUtils.getStart(params), Integer.parseInt((String) params.get("pageSize")));
+            count = processEngine.getTaskService().createTaskQuery().taskCandidateUser(getUserId().toString()).count();
+        } else {
+            taskList = processEngine.getTaskService()//获取任务service
+                    .createTaskQuery()//创建查询对象
+                    .taskCandidateOrAssigned(getUserId().toString())
+                    .processDefinitionKeyIn(JSON.parseArray(params.get("definitionKey").toString(), String.class))
+                    //                .taskAssignee(getUserId().toString())
+                    .orderByTaskCreateTime().desc()//参与者，组任务查询
+                    .listPage(PageUtils.getStart(params), Integer.parseInt((String) params.get("pageSize")));
+            count = processEngine.getTaskService().createTaskQuery().taskCandidateUser(getUserId().toString()).
+                    processDefinitionKeyIn(JSON.parseArray(params.get("definitionKey").toString(), String.class)).count();
+        }
         List<DevTask> list = new ArrayList<>();
         if (taskList.size() > 0) {
             for (Task task : taskList) {
@@ -442,11 +466,11 @@ public class TApproveDangerController extends BaseController {
                     TSaiApply approve = tSaiApplyService.selectTSaiApplyById(Long.parseLong(pi.getBusinessKey()));
                     devTask.setApproveObject(approve);
                     devTask.setApNo(approve.getApNo());
-                }else if (pi.getProcessDefinitionName().equals("每周安全排查报告")) {
+                } else if (pi.getProcessDefinitionName().equals("每周安全排查报告")) {
                     TSpecWeekcheck t = tSpecWeekcheckService.selectTSpecWeekcheckById(Long.parseLong(pi.getBusinessKey()));
                     devTask.setApproveObject(t);
                     devTask.setApNo(t.getId().toString());
-                }else if (pi.getProcessDefinitionName().equals("导师带徒经理审批")) {
+                } else if (pi.getProcessDefinitionName().equals("导师带徒经理审批")) {
                     TTsApprove t = tTsApproveService.selectTTsApproveById(Long.parseLong(pi.getBusinessKey()));
                     devTask.setApNo(t.getApNo());
                     devTask.setApproveObject(t);
@@ -454,7 +478,7 @@ public class TApproveDangerController extends BaseController {
                 list.add(devTask);
             }
         }
-        return getDataTable(list,count);
+        return getDataTable(list, count);
     }
 
     /**
@@ -543,7 +567,7 @@ public class TApproveDangerController extends BaseController {
                     devProcess.setApNo(approve.getApNo());
                     devProcess.setApName(user.getNickName());
                     devProcess.setApproveObject(approve);
-                }  else if (pi.getProcessDefinitionName().equals("组织保护措施状态变更申请流程")) {
+                } else if (pi.getProcessDefinitionName().equals("组织保护措施状态变更申请流程")) {
                     TApplySafetychange approve = tApplySafetychangeService.selectTApplySafetychangeById(Long.parseLong(pi.getBusinessKey()));
                     SysUser user = sysUserService.selectUserById(Long.valueOf(approve.getCreaterCode()));
                     devProcess.setApNo(approve.getApNo());
@@ -555,13 +579,13 @@ public class TApproveDangerController extends BaseController {
                     devProcess.setApNo(approve.getApNo());
                     devProcess.setApName(user.getNickName());
                     devProcess.setApproveObject(approve);
-                }else if (pi.getProcessDefinitionName().equals("每周安全排查报告")) {
+                } else if (pi.getProcessDefinitionName().equals("每周安全排查报告")) {
                     TSpecWeekcheck t = tSpecWeekcheckService.selectTSpecWeekcheckById(Long.parseLong(pi.getBusinessKey()));
                     SysUser user = sysUserService.selectUserById(Long.valueOf(t.getCreaterCode()));
                     devProcess.setApNo(t.getId().toString());
                     devProcess.setApName(user.getNickName());
                     devProcess.setApproveObject(t);
-                }else if (pi.getProcessDefinitionName().equals("导师带徒经理审批")) {
+                } else if (pi.getProcessDefinitionName().equals("导师带徒经理审批")) {
                     TTsApprove t = tTsApproveService.selectTTsApproveById(Long.parseLong(pi.getBusinessKey()));
                     SysUser user = sysUserService.selectUserById(Long.valueOf(t.getCreaterCode()));
                     devProcess.setApNo(t.getId().toString());
@@ -589,7 +613,7 @@ public class TApproveDangerController extends BaseController {
                 list.add(devProcess);
             }
         }
-        return getDataTable(list,count);
+        return getDataTable(list, count);
     }
 
     /**
@@ -674,19 +698,19 @@ public class TApproveDangerController extends BaseController {
         //当前任务
         try {
             Task task = taskService.createTaskQuery().processInstanceId(pid).active().singleResult();
-            if (task!= null) {
+            if (task != null) {
                 task.getName();
                 task.getCreateTime();
                 DevTask devTask = new DevTask();
                 devTask.setTaskName(task.getName());
                 devTask.setTaskCreateTime(task.getCreateTime());
-                if (task.getAssignee()!= null) {
+                if (task.getAssignee() != null) {
                     SysUser user = sysUserService.selectUserById(Long.parseLong(task.getAssignee()));
                     devTask.setUserName(user.getNickName());
                 }
                 devTaskList.add(devTask);
             }
-        }catch (Exception e) {
+        } catch (Exception e) {
             logger.error(e.toString());
         }
         return getDataTable(devTaskList);
@@ -794,7 +818,7 @@ public class TApproveDangerController extends BaseController {
                 .finished().list();
         //高亮线路id集合
 //        List<String> highLightedFlowIds = getHighLightedFlows(bpmnModel, historicActivityInstances);
-        List<String> highLightedFlowIds = getHighLine(bpmnModel, historicActivityInstances,finished);
+        List<String> highLightedFlowIds = getHighLine(bpmnModel, historicActivityInstances, finished);
         DefaultProcessDiagramGenerator generator = new DefaultProcessDiagramGenerator();
 
 //     生成流程图
@@ -821,8 +845,6 @@ public class TApproveDangerController extends BaseController {
     }
 
 
-
-
     /**
      * 获取已经流转的线
      *
@@ -964,7 +986,7 @@ public class TApproveDangerController extends BaseController {
             List<SequenceFlow> sequenceFlowList = outgoingFlows.stream()
                     .filter(sequenceFlow -> sequenceFlow.getTargetRef().equals(historicActivityInstanceResult.getActivityId()))
                     .collect(Collectors.toList());
-            highLightedFlowIds.addAll(sequenceFlowList.stream().map(e->e.getId()).collect(Collectors.toList()));
+            highLightedFlowIds.addAll(sequenceFlowList.stream().map(e -> e.getId()).collect(Collectors.toList()));
         }
         return highLightedFlowIds;
     }

master/src/main/java/com/ruoyi/project/training/bccnew/controller/TTsFirstplanController.java

@@ -124,6 +124,8 @@ public class TTsFirstplanController extends BaseController {
     @Log(title = "进组培训", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TTsFirstplan tTsFirstplan) {
+        tTsFirstplan.setUserId(getUserId());
+        tTsFirstplan.setNickName(getNickName());
         return toAjax(tTsFirstplanService.updateTTsFirstplan(tTsFirstplan));
     }
 

master/src/main/java/com/ruoyi/project/training/bccnew/controller/TTsFlplanController.java

@@ -1,6 +1,5 @@
 package com.ruoyi.project.training.bccnew.controller;
 
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -9,14 +8,12 @@ import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
-import com.ruoyi.project.training.bccnew.domain.TTsFirstplan;
 import com.ruoyi.project.training.bccnew.domain.TTsFlplan;
 import com.ruoyi.project.training.bccnew.domain.TTsNew;
 import com.ruoyi.project.training.bccnew.service.ITTsApproveService;
 import com.ruoyi.project.training.bccnew.service.ITTsFirstplanService;
 import com.ruoyi.project.training.bccnew.service.ITTsFlplanService;
 import com.ruoyi.project.training.bccnew.service.ITTsNewService;
-import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -110,63 +107,41 @@ public class TTsFlplanController extends BaseController {
     @PutMapping
     public AjaxResult edit(@RequestBody TTsFlplan tTsFlplan) {
         if ("好".equals(tTsFlplan.getScore1())) {
-            tTsFlplan.setPlanStatus(3L);
+            tTsFlplan.setPlanStatus(5L);
         }
         if ("满意".equals(tTsFlplan.getScore1()) && "好".equals(tTsFlplan.getScore2())) {
-            tTsFlplan.setPlanStatus(3L);
+            tTsFlplan.setPlanStatus(5L);
         }
         if ("满意".equals(tTsFlplan.getScore1()) && "满意".equals(tTsFlplan.getScore2()) && "好".equals(tTsFlplan.getScore3())) {
-            tTsFlplan.setPlanStatus(3L);
+            tTsFlplan.setPlanStatus(5L);
         }
         if ("满意".equals(tTsFlplan.getScore1()) && "差".equals(tTsFlplan.getScore2()) && "好".equals(tTsFlplan.getScore2())) {
-            tTsFlplan.setPlanStatus(3L);
+            tTsFlplan.setPlanStatus(5L);
         }
         if ("差".equals(tTsFlplan.getScore1()) && "好".equals(tTsFlplan.getScore2())) {
-            tTsFlplan.setPlanStatus(3L);
+            tTsFlplan.setPlanStatus(5L);
         }
         if ("差".equals(tTsFlplan.getScore1()) && "满意".equals(tTsFlplan.getScore2())) {
-            tTsFlplan.setPlanStatus(1L);
+            tTsFlplan.setPlanStatus(4L);
         }
         if ("差".equals(tTsFlplan.getScore1()) && "差".equals(tTsFlplan.getScore2())) {
-            tTsFlplan.setPlanStatus(1L);
+            tTsFlplan.setPlanStatus(4L);
         }
-        if (tTsFlplan.getPlanStatus() == 3) {
-            TTsFirstplan tTsFirstplan = new TTsFirstplan();
-            tTsFirstplan.setNewId(tTsFlplan.getNewId());
-            List<TTsFirstplan> tTsFirstplans = tTsFirstplanService.selectTTsFirstplanListByNewId(tTsFirstplan);
-            tTsFirstplan.setPlanStatus(3L);
-            List<TTsFirstplan> tTsFirstplansDone = tTsFirstplanService.selectTTsFirstplanListByNewId(tTsFirstplan);
-            TTsFlplan entity = new TTsFlplan();
-            entity.setNewId(tTsFlplan.getNewId());
-            List<TTsFlplan> tTsFlplans = tTsFlplanService.selectTTsFlplanListByNewId(entity);
-            entity.setPlanStatus(3L);
-            List<TTsFlplan> tTsFlplansDone = tTsFlplanService.selectTTsFlplanListByNewId(entity);
-            if (!CollectionUtils.isEmpty(tTsFirstplans) && !CollectionUtils.isEmpty(tTsFirstplansDone) &&
-                    tTsFirstplans.size() == tTsFirstplansDone.size() &&
-                    !CollectionUtils.isEmpty(tTsFlplans) && !CollectionUtils.isEmpty(tTsFlplansDone) &&
-                    tTsFlplans.size() == tTsFlplansDone.size()) {
-                tTsApproveService.doApprove(tTsFlplan.getNewId(), "3", getUserId(), getNickName());
-            }
-        }else
-        if (tTsFlplan.getPlanStatus() == 1){
-            TTsFlplan entity = new TTsFlplan();
-            entity.setNewId(tTsFlplan.getNewId());
-            for (TTsFlplan item : tTsFlplanService.selectTTsFlplanListByNewId(entity)) {
-                if (item.getPlanStatus() == null){
-                    item.setPlanStatus(1L);
-                    tTsFlplanService.updateTTsFlplan(item);
-                }
-            }
-            TTsFirstplan tTsFirstplan = new TTsFirstplan();
-            tTsFirstplan.setNewId(tTsFlplan.getNewId());
-            for (TTsFirstplan item : tTsFirstplanService.selectTTsFirstplanListByNewId(tTsFirstplan)) {
-                if (item.getPlanStatus() == null){
-                    item.setPlanStatus(1L);
-                    tTsFirstplanService.updateTTsFirstplan(item);
-                }
-            }
+        tTsFlplanService.updateTTsFlplan(tTsFlplan);
+        if (tTsFlplan.getPlanStatus() == 5) {
+            TTsNew tTsNew = new TTsNew();
+            tTsNew.setPlanStatus(5L);
+            tTsNew.setPlanType(3L);
+            tTsNew.setNewId(tTsFlplan.getNewId());
+            tTsNewService.updateTTsNew(tTsNew, getUserId(), getNickName());
+        } else if (tTsFlplan.getPlanStatus() == 4) {
+            TTsNew tTsNew = new TTsNew();
+            tTsNew.setPlanStatus(4L);
+            tTsNew.setPlanType(3L);
+            tTsNew.setNewId(tTsFlplan.getNewId());
+            tTsNewService.updateTTsNew(tTsNew, getUserId(), getNickName());
         }
-        return toAjax(tTsFlplanService.updateTTsFlplan(tTsFlplan));
+        return AjaxResult.success();
     }
 
     /**

master/src/main/java/com/ruoyi/project/training/bccnew/controller/TTsFtplanController.java

@@ -8,15 +8,12 @@ import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
-import com.ruoyi.project.training.bccnew.domain.TTsFirstplan;
-import com.ruoyi.project.training.bccnew.domain.TTsFlplan;
 import com.ruoyi.project.training.bccnew.domain.TTsFtplan;
 import com.ruoyi.project.training.bccnew.domain.TTsNew;
 import com.ruoyi.project.training.bccnew.service.ITTsApproveService;
 import com.ruoyi.project.training.bccnew.service.ITTsFirstplanService;
 import com.ruoyi.project.training.bccnew.service.ITTsFtplanService;
 import com.ruoyi.project.training.bccnew.service.ITTsNewService;
-import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -96,16 +93,6 @@ public class TTsFtplanController extends BaseController {
             TTsFtplan need = tTsFtplanService.selectTTsFtplanById(tTsFtplan.getId());
             if (need.getTimerNeed() != null && need.getTimerNeed().equals(timer + 1)) {
                 plan.setPlanStatus(2L);
-                TTsFirstplan tTsFirstplan = new TTsFirstplan();
-                tTsFirstplan.setNewId(tTsNew.getNewId());
-                tTsFirstplan.setPlanStatus(0L);
-                TTsFtplan entity = new TTsFtplan();
-                entity.setNewId(tTsNew.getNewId());
-                entity.setPlanStatus(0L);
-                if (CollectionUtils.isEmpty(tTsFirstplanService.selectTTsFirstplanListByNewId(tTsFirstplan))&&
-                        CollectionUtils.isEmpty(tTsFtplanService.selectTTsFtplanListByNewId(entity))){
-                    tTsApproveService.doApprove(tTsNew.getNewId(), tTsNew.getPlanType().toString(),getUserId(),getNickName());
-                }
             }
             return toAjax(tTsFtplanService.updateTTsFtplan(plan));
         }
@@ -119,65 +106,41 @@ public class TTsFtplanController extends BaseController {
     @PutMapping
     public AjaxResult edit(@RequestBody TTsFtplan tTsFtplan) {
         if ("好".equals(tTsFtplan.getScore1())) {
-            tTsFtplan.setPlanStatus(3L);
+            tTsFtplan.setPlanStatus(5L);
         }
         if ("满意".equals(tTsFtplan.getScore1()) && "好".equals(tTsFtplan.getScore2())) {
-            tTsFtplan.setPlanStatus(3L);
+            tTsFtplan.setPlanStatus(5L);
         }
         if ("满意".equals(tTsFtplan.getScore1()) && "满意".equals(tTsFtplan.getScore2()) && "好".equals(tTsFtplan.getScore3())) {
-            tTsFtplan.setPlanStatus(3L);
+            tTsFtplan.setPlanStatus(5L);
         }
         if ("满意".equals(tTsFtplan.getScore1()) && "差".equals(tTsFtplan.getScore2()) && "好".equals(tTsFtplan.getScore2())) {
-            tTsFtplan.setPlanStatus(3L);
+            tTsFtplan.setPlanStatus(5L);
         }
         if ("差".equals(tTsFtplan.getScore1()) && "好".equals(tTsFtplan.getScore2())) {
-            tTsFtplan.setPlanStatus(3L);
+            tTsFtplan.setPlanStatus(5L);
         }
         if ("差".equals(tTsFtplan.getScore1()) && "满意".equals(tTsFtplan.getScore2())) {
-            tTsFtplan.setPlanStatus(1L);
+            tTsFtplan.setPlanStatus(4L);
         }
         if ("差".equals(tTsFtplan.getScore1()) && "差".equals(tTsFtplan.getScore2())) {
-            tTsFtplan.setPlanStatus(1L);
+            tTsFtplan.setPlanStatus(4L);
         }
-        if (tTsFtplan.getPlanStatus() == 3) {
-            TTsFirstplan tTsFirstplan = new TTsFirstplan();
-            tTsFirstplan.setNewId(tTsFtplan.getNewId());
-            List<TTsFirstplan> tTsFirstplans = tTsFirstplanService.selectTTsFirstplanListByNewId(tTsFirstplan);
-            tTsFirstplan.setPlanStatus(3L);
-            List<TTsFirstplan> tTsFirstplansDone = tTsFirstplanService.selectTTsFirstplanListByNewId(tTsFirstplan);
-            TTsFtplan entity = new TTsFtplan();
-            entity.setNewId(tTsFtplan.getNewId());
-            List<TTsFtplan> tTsFtplans = tTsFtplanService.selectTTsFtplanListByNewId(entity);
-            entity.setPlanStatus(3L);
-            List<TTsFtplan> tTsFtplansDone = tTsFtplanService.selectTTsFtplanListByNewId(entity);
-            if (!CollectionUtils.isEmpty(tTsFirstplans) && !CollectionUtils.isEmpty(tTsFirstplansDone) &&
-                    tTsFirstplans.size() == tTsFirstplansDone.size() &&
-                    !CollectionUtils.isEmpty(tTsFtplans) && !CollectionUtils.isEmpty(tTsFtplansDone) &&
-                    tTsFtplans.size() == tTsFtplansDone.size()) {
-                tTsApproveService.doApprove(tTsFtplan.getNewId(), "4", getUserId(), getNickName());
-            }
-        }else
-        if (tTsFtplan.getPlanStatus() == 1){
-            TTsFtplan entity = new TTsFtplan();
-            entity.setNewId(tTsFtplan.getNewId());
-            for (TTsFtplan item : tTsFtplanService.selectTTsFtplanListByNewId(entity)) {
-                if (item.getPlanStatus() == null){
-                    item.setPlanStatus(1L);
-                    tTsFtplanService.updateTTsFtplan(item);
-                }
-            }
-            TTsFirstplan tTsFirstplan = new TTsFirstplan();
-            tTsFirstplan.setNewId(tTsFtplan.getNewId());
-            for (TTsFirstplan item : tTsFirstplanService.selectTTsFirstplanListByNewId(tTsFirstplan)) {
-                if (item.getPlanStatus() == null){
-                    item.setPlanStatus(1L);
-                    tTsFirstplanService.updateTTsFirstplan(item);
-                }
-            }
-            tTsApproveService.doApprove(tTsFtplan.getNewId(), "4", getUserId(), getNickName());
-
+        tTsFtplanService.updateTTsFtplan(tTsFtplan);
+        if (tTsFtplan.getPlanStatus() == 5) {
+            TTsNew tTsNew = new TTsNew();
+            tTsNew.setPlanStatus(5L);
+            tTsNew.setPlanType(4L);
+            tTsNew.setNewId(tTsFtplan.getNewId());
+            tTsNewService.updateTTsNew(tTsNew, getUserId(), getNickName());
+        } else if (tTsFtplan.getPlanStatus() == 4) {
+            TTsNew tTsNew = new TTsNew();
+            tTsNew.setPlanStatus(4L);
+            tTsNew.setPlanType(4L);
+            tTsNew.setNewId(tTsFtplan.getNewId());
+            tTsNewService.updateTTsNew(tTsNew, getUserId(), getNickName());
         }
-        return toAjax(tTsFtplanService.updateTTsFtplan(tTsFtplan));
+        return toAjax(1);
     }
 
     /**

master/src/main/java/com/ruoyi/project/training/bccnew/controller/TTsLjplanController.java

@@ -8,14 +8,12 @@ import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
-import com.ruoyi.project.training.bccnew.domain.TTsFirstplan;
 import com.ruoyi.project.training.bccnew.domain.TTsLjplan;
 import com.ruoyi.project.training.bccnew.domain.TTsNew;
 import com.ruoyi.project.training.bccnew.service.ITTsApproveService;
 import com.ruoyi.project.training.bccnew.service.ITTsFirstplanService;
 import com.ruoyi.project.training.bccnew.service.ITTsLjplanService;
 import com.ruoyi.project.training.bccnew.service.ITTsNewService;
-import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -29,8 +27,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/bccnew/ljplandsdt")
-public class TTsLjplanController extends BaseController
-{
+public class TTsLjplanController extends BaseController {
     @Autowired
     private ITTsLjplanService tTsLjplanService;
     @Autowired
@@ -48,8 +45,7 @@ public class TTsLjplanController extends BaseController
      * 查询裂解培训列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(TTsLjplan tTsLjplan)
-    {
+    public TableDataInfo list(TTsLjplan tTsLjplan) {
         startPage();
         List<TTsLjplan> list = tTsLjplanService.selectTTsLjplanList(tTsLjplan);
         return getDataTable(list);
@@ -60,8 +56,7 @@ public class TTsLjplanController extends BaseController
      */
     @Log(title = "裂解培训", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TTsLjplan tTsLjplan)
-    {
+    public AjaxResult export(TTsLjplan tTsLjplan) {
         List<TTsLjplan> list = tTsLjplanService.selectTTsLjplanList(tTsLjplan);
         ExcelUtil<TTsLjplan> util = new ExcelUtil<TTsLjplan>(TTsLjplan.class);
         return util.exportExcel(list, "ljplandsdt");
@@ -71,8 +66,7 @@ public class TTsLjplanController extends BaseController
      * 获取裂解培训详细信息
      */
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tTsLjplanService.selectTTsLjplanById(id));
     }
 
@@ -81,8 +75,7 @@ public class TTsLjplanController extends BaseController
      */
     @Log(title = "裂解培训", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TTsLjplan tTsLjplan)
-    {
+    public AjaxResult add(@RequestBody TTsLjplan tTsLjplan) {
         return toAjax(tTsLjplanService.insertTTsLjplan(tTsLjplan));
     }
 
@@ -91,28 +84,18 @@ public class TTsLjplanController extends BaseController
      */
     @Log(title = "裂解培训", businessType = BusinessType.UPDATE)
     @PutMapping("/updateLjLearnTime")
-    public AjaxResult updateLjLearnTime(@RequestBody TTsLjplan tTsLjplan){
+    public AjaxResult updateLjLearnTime(@RequestBody TTsLjplan tTsLjplan) {
         Long userId = getUserId();
         TTsNew tTsNew = tTsNewService.selectTTsNewById(tTsLjplan.getNewId());
         SysUser sysUser = sysUserService.selectUserByStaffId(tTsNew.getStaffId());
-        if(userId.equals(sysUser.getUserId())){
+        if (userId.equals(sysUser.getUserId())) {
             TTsLjplan plan = new TTsLjplan();
             plan.setId(tTsLjplan.getId());
-            long timer = tTsLjplan.getTimer()==null?0:tTsLjplan.getTimer();
-            plan.setTimer(timer+1);
+            long timer = tTsLjplan.getTimer() == null ? 0 : tTsLjplan.getTimer();
+            plan.setTimer(timer + 1);
             TTsLjplan need = tTsLjplanService.selectTTsLjplanById(tTsLjplan.getId());
-            if (need.getTimerNeed()!=null&&need.getTimerNeed().equals(timer+1)){
+            if (need.getTimerNeed() != null && need.getTimerNeed().equals(timer + 1)) {
                 plan.setPlanStatus(2L);
-                TTsFirstplan tTsFirstplan = new TTsFirstplan();
-                tTsFirstplan.setNewId(tTsNew.getNewId());
-                tTsFirstplan.setPlanStatus(0L);
-                TTsLjplan entity = new TTsLjplan();
-                entity.setNewId(tTsNew.getNewId());
-                entity.setPlanStatus(0L);
-                if (CollectionUtils.isEmpty(tTsFirstplanService.selectTTsFirstplanListByNewId(tTsFirstplan))&&
-                        CollectionUtils.isEmpty(tTsLjplanService.selectTTsLjplanListByNewId(entity))){
-                    tTsApproveService.doApprove(tTsNew.getNewId(), tTsNew.getPlanType().toString(),getUserId(),getNickName());
-                }
             }
             return toAjax(tTsLjplanService.updateTTsLjplan(plan));
         }
@@ -125,75 +108,52 @@ public class TTsLjplanController extends BaseController
      */
     @Log(title = "裂解培训", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TTsLjplan tTsLjplan)
-    {
+    public AjaxResult edit(@RequestBody TTsLjplan tTsLjplan) {
         if ("好".equals(tTsLjplan.getScore1())) {
-            tTsLjplan.setPlanStatus(3L);
+            tTsLjplan.setPlanStatus(5L);
         }
         if ("满意".equals(tTsLjplan.getScore1()) && "好".equals(tTsLjplan.getScore2())) {
-            tTsLjplan.setPlanStatus(3L);
+            tTsLjplan.setPlanStatus(5L);
         }
         if ("满意".equals(tTsLjplan.getScore1()) && "满意".equals(tTsLjplan.getScore2()) && "好".equals(tTsLjplan.getScore3())) {
-            tTsLjplan.setPlanStatus(3L);
+            tTsLjplan.setPlanStatus(5L);
         }
         if ("满意".equals(tTsLjplan.getScore1()) && "差".equals(tTsLjplan.getScore2()) && "好".equals(tTsLjplan.getScore2())) {
-            tTsLjplan.setPlanStatus(3L);
+            tTsLjplan.setPlanStatus(5L);
         }
         if ("差".equals(tTsLjplan.getScore1()) && "好".equals(tTsLjplan.getScore2())) {
-            tTsLjplan.setPlanStatus(3L);
+            tTsLjplan.setPlanStatus(5L);
         }
         if ("差".equals(tTsLjplan.getScore1()) && "满意".equals(tTsLjplan.getScore2())) {
-            tTsLjplan.setPlanStatus(1L);
+            tTsLjplan.setPlanStatus(4L);
         }
         if ("差".equals(tTsLjplan.getScore1()) && "差".equals(tTsLjplan.getScore2())) {
-            tTsLjplan.setPlanStatus(1L);
+            tTsLjplan.setPlanStatus(4L);
         }
-        if (tTsLjplan.getPlanStatus() == 3) {
-            TTsFirstplan tTsFirstplan = new TTsFirstplan();
-            tTsFirstplan.setNewId(tTsLjplan.getNewId());
-            List<TTsFirstplan> tTsFirstplans = tTsFirstplanService.selectTTsFirstplanListByNewId(tTsFirstplan);
-            tTsFirstplan.setPlanStatus(3L);
-            List<TTsFirstplan> tTsFirstplansDone = tTsFirstplanService.selectTTsFirstplanListByNewId(tTsFirstplan);
-            TTsLjplan entity = new TTsLjplan();
-            entity.setNewId(tTsLjplan.getNewId());
-            List<TTsLjplan> tTsLjplans = tTsLjplanService.selectTTsLjplanListByNewId(entity);
-            entity.setPlanStatus(3L);
-            List<TTsLjplan> tTsLjplansDone = tTsLjplanService.selectTTsLjplanListByNewId(entity);
-            if (!CollectionUtils.isEmpty(tTsFirstplans) && !CollectionUtils.isEmpty(tTsFirstplansDone) &&
-                    tTsFirstplans.size() == tTsFirstplansDone.size() &&
-                    !CollectionUtils.isEmpty(tTsLjplans) && !CollectionUtils.isEmpty(tTsLjplansDone) &&
-                    tTsLjplans.size() == tTsLjplansDone.size()) {
-                tTsApproveService.doApprove(tTsLjplan.getNewId(), "1", getUserId(), getNickName());
-            }
-        }else
-        if (tTsLjplan.getPlanStatus() == 1){
-            TTsLjplan entity = new TTsLjplan();
-            entity.setNewId(tTsLjplan.getNewId());
-            for (TTsLjplan item : tTsLjplanService.selectTTsLjplanListByNewId(entity)) {
-                if (item.getPlanStatus() == null){
-                    item.setPlanStatus(1L);
-                    tTsLjplanService.updateTTsLjplan(item);
-                }
-            }
-            TTsFirstplan tTsFirstplan = new TTsFirstplan();
-            tTsFirstplan.setNewId(tTsLjplan.getNewId());
-            for (TTsFirstplan item : tTsFirstplanService.selectTTsFirstplanListByNewId(tTsFirstplan)) {
-                if (item.getPlanStatus() == null){
-                    item.setPlanStatus(1L);
-                    tTsFirstplanService.updateTTsFirstplan(item);
-                }
-            }
+        tTsLjplanService.updateTTsLjplan(tTsLjplan);
+        if (tTsLjplan.getPlanStatus() == 5) {
+            TTsNew tTsNew = new TTsNew();
+            tTsNew.setPlanStatus(5L);
+            tTsNew.setNewId(tTsLjplan.getNewId());
+            tTsNew.setPlanType(1L);
+            tTsNewService.updateTTsNew(tTsNew, getUserId(), getNickName());
+
+        } else if (tTsLjplan.getPlanStatus() == 4) {
+            TTsNew tTsNew = new TTsNew();
+            tTsNew.setPlanStatus(4L);
+            tTsNew.setNewId(tTsLjplan.getNewId());
+            tTsNew.setPlanType(1L);
+            tTsNewService.updateTTsNew(tTsNew, getUserId(), getNickName());
         }
-        return toAjax(tTsLjplanService.updateTTsLjplan(tTsLjplan));
+        return toAjax(1);
     }
 
     /**
      * 删除裂解培训
      */
     @Log(title = "裂解培训", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tTsLjplanService.deleteTTsLjplanByIds(ids));
     }
 }

master/src/main/java/com/ruoyi/project/training/bccnew/controller/TTsYsplanController.java

@@ -8,15 +8,12 @@ import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
-import com.ruoyi.project.training.bccnew.domain.TTsFirstplan;
-import com.ruoyi.project.training.bccnew.domain.TTsYsplan;
 import com.ruoyi.project.training.bccnew.domain.TTsNew;
 import com.ruoyi.project.training.bccnew.domain.TTsYsplan;
 import com.ruoyi.project.training.bccnew.service.ITTsApproveService;
 import com.ruoyi.project.training.bccnew.service.ITTsFirstplanService;
 import com.ruoyi.project.training.bccnew.service.ITTsNewService;
 import com.ruoyi.project.training.bccnew.service.ITTsYsplanService;
-import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -97,16 +94,6 @@ public class TTsYsplanController extends BaseController {
             TTsYsplan need = tTsYsplanService.selectTTsYsplanById(tTsYsplan.getId());
             if (need.getTimerNeed() != null && need.getTimerNeed().equals(timer + 1)) {
                 plan.setPlanStatus(2L);
-                TTsFirstplan tTsFirstplan = new TTsFirstplan();
-                tTsFirstplan.setNewId(tTsNew.getNewId());
-                tTsFirstplan.setPlanStatus(0L);
-                TTsYsplan entity = new TTsYsplan();
-                entity.setNewId(tTsNew.getNewId());
-                entity.setPlanStatus(0L);
-                if (CollectionUtils.isEmpty(tTsFirstplanService.selectTTsFirstplanListByNewId(tTsFirstplan))&&
-                        CollectionUtils.isEmpty(tTsYsplanService.selectTTsYsplanListByNewId(entity))){
-                    tTsApproveService.doApprove(tTsNew.getNewId(), tTsNew.getPlanType().toString(),getUserId(),getNickName());
-                }
             }
             return toAjax(tTsYsplanService.updateTTsYsplan(plan));
         }
@@ -120,63 +107,42 @@ public class TTsYsplanController extends BaseController {
     @PutMapping
     public AjaxResult edit(@RequestBody TTsYsplan tTsYsplan) {
         if ("好".equals(tTsYsplan.getScore1())) {
-            tTsYsplan.setPlanStatus(3L);
+            tTsYsplan.setPlanStatus(5L);
         }
         if ("满意".equals(tTsYsplan.getScore1()) && "好".equals(tTsYsplan.getScore2())) {
-            tTsYsplan.setPlanStatus(3L);
+            tTsYsplan.setPlanStatus(5L);
         }
         if ("满意".equals(tTsYsplan.getScore1()) && "满意".equals(tTsYsplan.getScore2()) && "好".equals(tTsYsplan.getScore3())) {
-            tTsYsplan.setPlanStatus(3L);
+            tTsYsplan.setPlanStatus(5L);
         }
         if ("满意".equals(tTsYsplan.getScore1()) && "差".equals(tTsYsplan.getScore2()) && "好".equals(tTsYsplan.getScore2())) {
-            tTsYsplan.setPlanStatus(3L);
+            tTsYsplan.setPlanStatus(5L);
         }
         if ("差".equals(tTsYsplan.getScore1()) && "好".equals(tTsYsplan.getScore2())) {
-            tTsYsplan.setPlanStatus(3L);
+            tTsYsplan.setPlanStatus(5L);
         }
         if ("差".equals(tTsYsplan.getScore1()) && "满意".equals(tTsYsplan.getScore2())) {
-            tTsYsplan.setPlanStatus(1L);
+            tTsYsplan.setPlanStatus(4L);
         }
         if ("差".equals(tTsYsplan.getScore1()) && "差".equals(tTsYsplan.getScore2())) {
-            tTsYsplan.setPlanStatus(1L);
+            tTsYsplan.setPlanStatus(4L);
         }
-        if (tTsYsplan.getPlanStatus() == 3) {
-            TTsFirstplan tTsFirstplan = new TTsFirstplan();
-            tTsFirstplan.setNewId(tTsYsplan.getNewId());
-            List<TTsFirstplan> tTsFirstplans = tTsFirstplanService.selectTTsFirstplanListByNewId(tTsFirstplan);
-            tTsFirstplan.setPlanStatus(3L);
-            List<TTsFirstplan> tTsFirstplansDone = tTsFirstplanService.selectTTsFirstplanListByNewId(tTsFirstplan);
-            TTsYsplan entity = new TTsYsplan();
-            entity.setNewId(tTsYsplan.getNewId());
-            List<TTsYsplan> tTsYsplans = tTsYsplanService.selectTTsYsplanListByNewId(entity);
-            entity.setPlanStatus(3L);
-            List<TTsYsplan> tTsYsplansDone = tTsYsplanService.selectTTsYsplanListByNewId(entity);
-            if (!CollectionUtils.isEmpty(tTsFirstplans) && !CollectionUtils.isEmpty(tTsFirstplansDone) &&
-                    tTsFirstplans.size() == tTsFirstplansDone.size() &&
-                    !CollectionUtils.isEmpty(tTsYsplans) && !CollectionUtils.isEmpty(tTsYsplansDone) &&
-                    tTsYsplans.size() == tTsYsplansDone.size()) {
-                tTsApproveService.doApprove(tTsYsplan.getNewId(), "2", getUserId(), getNickName());
-            }
-        }else
-        if (tTsYsplan.getPlanStatus() == 1){
-            TTsYsplan entity = new TTsYsplan();
-            entity.setNewId(tTsYsplan.getNewId());
-            for (TTsYsplan item : tTsYsplanService.selectTTsYsplanListByNewId(entity)) {
-                if (item.getPlanStatus() == null){
-                    item.setPlanStatus(1L);
-                    tTsYsplanService.updateTTsYsplan(item);
-                }
-            }
-            TTsFirstplan tTsFirstplan = new TTsFirstplan();
-            tTsFirstplan.setNewId(tTsYsplan.getNewId());
-            for (TTsFirstplan item : tTsFirstplanService.selectTTsFirstplanListByNewId(tTsFirstplan)) {
-                if (item.getPlanStatus() == null){
-                    item.setPlanStatus(1L);
-                    tTsFirstplanService.updateTTsFirstplan(item);
-                }
-            }
+        tTsYsplanService.updateTTsYsplan(tTsYsplan);
+        if (tTsYsplan.getPlanStatus() == 5) {
+            TTsNew tTsNew = new TTsNew();
+            tTsNew.setPlanStatus(5L);
+            tTsNew.setNewId(tTsYsplan.getNewId());
+            tTsNew.setPlanType(2L);
+            tTsNewService.updateTTsNew(tTsNew, getUserId(), getNickName());
+
+        } else if (tTsYsplan.getPlanStatus() == 4) {
+            TTsNew tTsNew = new TTsNew();
+            tTsNew.setPlanStatus(5L);
+            tTsNew.setNewId(tTsYsplan.getNewId());
+            tTsNew.setPlanType(2L);
+            tTsNewService.updateTTsNew(tTsNew, getUserId(), getNickName());
         }
-        return toAjax(tTsYsplanService.updateTTsYsplan(tTsYsplan));
+        return toAjax(1);
     }
 
     /**

master/src/main/java/com/ruoyi/project/training/bccnew/service/impl/TTsApproveServiceImpl.java

@@ -1,24 +1,17 @@
 package com.ruoyi.project.training.bccnew.service.impl;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.project.approve.damain.DevTask;
-import com.ruoyi.project.listener.apply.valve.EndFailListener;
-import com.ruoyi.project.listener.apply.valve.EndSuccessListener;
-import com.ruoyi.project.listener.apply.valve.FlowListener;
-import com.ruoyi.project.listener.apply.valve.NextTaskListener;
 import com.ruoyi.project.plant.domain.TStaffmgr;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.mapper.SysUserMapper;
+import com.ruoyi.project.training.bccnew.domain.TTsApprove;
 import com.ruoyi.project.training.bccnew.domain.TTsNew;
 import com.ruoyi.project.training.bccnew.mapper.*;
+import com.ruoyi.project.training.bccnew.service.ITTsApproveService;
+import com.ruoyi.project.training.bccnew.service.ITTsNewService;
 import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.RuntimeService;
@@ -28,10 +21,11 @@ import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.project.training.bccnew.domain.TTsApprove;
-import com.ruoyi.project.training.bccnew.service.ITTsApproveService;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 导师带徒审批Service业务层处理
@@ -40,13 +34,12 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @date 2024-06-25
  */
 @Service
-public class TTsApproveServiceImpl implements ITTsApproveService
-{
+public class TTsApproveServiceImpl implements ITTsApproveService {
     @Autowired
     private TTsApproveMapper tTsApproveMapper;
 
     @Autowired
-    private TTsFirstplanMapper tTsFirstplanMapper ;
+    private TTsFirstplanMapper tTsFirstplanMapper;
 
     @Autowired
     private TTsLjplanMapper tTsLjplanMapper;
@@ -61,7 +54,7 @@ public class TTsApproveServiceImpl implements ITTsApproveService
     private TTsFtplanMapper tTsFtplanMapper;
 
     @Autowired
-    private TTsNewMapper tTsNewMapper;
+    private ITTsNewService tTsNewService;
 
     @Autowired
     private SysUserMapper userMapper;
@@ -73,7 +66,6 @@ public class TTsApproveServiceImpl implements ITTsApproveService
     private TaskService taskService;
 
 
-
     /**
      * 查询导师带徒审批
      *
@@ -81,18 +73,17 @@ public class TTsApproveServiceImpl implements ITTsApproveService
      * @return 导师带徒审批
      */
     @Override
-    public TTsApprove selectTTsApproveById(Long id)
-    {
+    public TTsApprove selectTTsApproveById(Long id) {
         return tTsApproveMapper.selectTTsApproveById(id);
     }
 
     @Override
-    public AjaxResult doApprove(Long id, String planType,Long userId,String userName) {
+    public AjaxResult doApprove(Long id, String planType, Long userId, String userName) {
         TTsApprove tTsApprove = new TTsApprove();
         tTsApprove.setPlanType(planType);
         tTsApprove.setTrainingId(id);
         tTsApproveMapper.insertTTsApprove(tTsApprove);
-        TTsNew tTsNew = tTsNewMapper.selectTTsNewById(id);
+        TTsNew tTsNew = tTsNewService.selectTTsNewById(id);
         SysUser sysUser = userMapper.selectUserByStaffId(tTsNew.getStaffId());
         // 开始申请流程
         tTsApprove.setApNo(DateUtils.dateTimeNow() + userId);
@@ -126,7 +117,7 @@ public class TTsApproveServiceImpl implements ITTsApproveService
     }
 
     @Override
-    public AjaxResult handle(DevTask devTask,String username,String userId) {
+    public AjaxResult handle(DevTask devTask, String username, String userId) {
         TTsApprove tTsApprove = devTask.gettTsApprove();
         //使用任务服务完成任务(提交任务)
         String taskId = devTask.getTaskId();
@@ -140,7 +131,7 @@ public class TTsApproveServiceImpl implements ITTsApproveService
         if ("1".equals(devTask.getCondition())) {
             devTask.setComment("通过");
         } else if ("0".equals(devTask.getCondition())) {
-            devTask.setComment("拒绝" );
+            devTask.setComment("拒绝");
         }
         // 处理流程节点
         Map<String, Object> param = new HashMap<>();
@@ -154,7 +145,10 @@ public class TTsApproveServiceImpl implements ITTsApproveService
             tTsApprove.setApproverName(username);
             tTsApprove.setApprover(userId);
             tTsApprove.setApproveTime(new Date());
-            tTsNew.setPlanStatus(3L);
+            if (tTsNew.getPlanStatus() == 4)
+                tTsNew.setPlanStatus(1L);
+            if (tTsNew.getPlanStatus() == 5)
+                tTsNew.setPlanStatus(3L);
             param.put("condition", devTask.getCondition());
         }
         ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
@@ -164,7 +158,7 @@ public class TTsApproveServiceImpl implements ITTsApproveService
                 .claim(taskId, userId);
         taskService.addComment(taskId, processInstancesId, devTask.getComment());
         taskService.complete(taskId, param);
-        tTsNewMapper.updateTTsNew(tTsNew);
+        tTsNewService.updateTTsNew(tTsNew,null,null);
         return AjaxResult.success();
     }
 
@@ -176,8 +170,7 @@ public class TTsApproveServiceImpl implements ITTsApproveService
      * @return 导师带徒审批
      */
     @Override
-    public List<TTsApprove> selectTTsApproveList(TTsApprove tTsApprove)
-    {
+    public List<TTsApprove> selectTTsApproveList(TTsApprove tTsApprove) {
         return tTsApproveMapper.selectTTsApproveList(tTsApprove);
     }
 
@@ -188,8 +181,7 @@ public class TTsApproveServiceImpl implements ITTsApproveService
      * @return 结果
      */
     @Override
-    public int insertTTsApprove(TTsApprove tTsApprove)
-    {
+    public int insertTTsApprove(TTsApprove tTsApprove) {
         return tTsApproveMapper.insertTTsApprove(tTsApprove);
     }
 
@@ -200,8 +192,7 @@ public class TTsApproveServiceImpl implements ITTsApproveService
      * @return 结果
      */
     @Override
-    public int updateTTsApprove(TTsApprove tTsApprove)
-    {
+    public int updateTTsApprove(TTsApprove tTsApprove) {
         return tTsApproveMapper.updateTTsApprove(tTsApprove);
     }
 
@@ -212,8 +203,7 @@ public class TTsApproveServiceImpl implements ITTsApproveService
      * @return 结果
      */
     @Override
-    public int deleteTTsApproveByIds(Long[] ids)
-    {
+    public int deleteTTsApproveByIds(Long[] ids) {
         return tTsApproveMapper.deleteTTsApproveByIds(ids);
     }
 
@@ -224,8 +214,7 @@ public class TTsApproveServiceImpl implements ITTsApproveService
      * @return 结果
      */
     @Override
-    public int deleteTTsApproveById(Long id)
-    {
+    public int deleteTTsApproveById(Long id) {
         return tTsApproveMapper.deleteTTsApproveById(id);
     }
 }

master/src/main/java/com/ruoyi/project/training/bccnew/service/impl/TTsFirstplanServiceImpl.java

@@ -84,64 +84,41 @@ public class TTsFirstplanServiceImpl implements ITTsFirstplanService {
      */
     @Override
     public int updateTTsFirstplan(TTsFirstplan tTsFirstplan) {
-        TTsFirstplan plan = new TTsFirstplan();
-        plan.setNewId(tTsFirstplan.getNewId());
-        List<TTsFirstplan> tTsFirstplans = tTsFirstplanMapper.selectTTsFirstplanListByNewId(plan);
-        plan.setPlanStatus(3L);
-        List<TTsFirstplan> tTsFirstplansDone = tTsFirstplanMapper.selectTTsFirstplanListByNewId(plan);
-        boolean flag = false;
-        TTsNew tTsNew = tTsNewService.selectTTsNewById(tTsFirstplan.getNewId());
-        if (1 == tTsNew.getPlanType()) {
-            TTsLjplan tTsLjplan = new TTsLjplan();
-            tTsLjplan.setNewId(tTsFirstplan.getNewId());
-            List<TTsLjplan> tTsLjplans = tTsLjplanService.selectTTsLjplanListByNewId(tTsLjplan);
-            tTsLjplan.setPlanStatus(3L);
-            List<TTsLjplan> tTsLjplansDone = tTsLjplanService.selectTTsLjplanListByNewId(tTsLjplan);
-            if (!CollectionUtils.isEmpty(tTsLjplans)
-                    && !CollectionUtils.isEmpty(tTsLjplansDone)
-                    && tTsLjplansDone.size() == tTsLjplans.size()) {
-                flag = true;
-            }
-        } else if (2 == tTsNew.getPlanType()) {
-            TTsYsplan tTsYsplan = new TTsYsplan();
-            tTsYsplan.setNewId(tTsFirstplan.getNewId());
-            List<TTsYsplan> tTsYsplans = tTsYsplanService.selectTTsYsplanListByNewId(tTsYsplan);
-            tTsYsplan.setPlanStatus(3L);
-            List<TTsYsplan> tTsYsplansDone = tTsYsplanService.selectTTsYsplanListByNewId(tTsYsplan);
-            if (!CollectionUtils.isEmpty(tTsYsplans)
-                    && !CollectionUtils.isEmpty(tTsYsplansDone)
-                    && tTsYsplansDone.size() == tTsYsplans.size()) {
-                flag = true;
-            }
-        } else if (3 == tTsNew.getPlanType()) {
-            TTsFlplan tTsFlplan = new TTsFlplan();
-            tTsFlplan.setNewId(tTsFirstplan.getNewId());
-            List<TTsFlplan> tTsFlplans = tTsFlplanService.selectTTsFlplanListByNewId(tTsFlplan);
-            tTsFlplan.setPlanStatus(3L);
-            List<TTsFlplan> tTsFlplansDone = tTsFlplanService.selectTTsFlplanListByNewId(tTsFlplan);
-            if (!CollectionUtils.isEmpty(tTsFlplans)
-                    && !CollectionUtils.isEmpty(tTsFlplansDone)
-                    && tTsFlplansDone.size() == tTsFlplans.size()) {
-                flag = true;
-            }
-        } else if (4 == tTsNew.getPlanType()) {
-            TTsFtplan tTsFtplan = new TTsFtplan();
-            tTsFtplan.setNewId(tTsFirstplan.getNewId());
-            List<TTsFtplan> tTsFtplans = tTsFtplanService.selectTTsFtplanListByNewId(tTsFtplan);
-            tTsFtplan.setPlanStatus(3L);
-            List<TTsFtplan> tTsFtplansDone = tTsFtplanService.selectTTsFtplanListByNewId(tTsFtplan);
-            if (!CollectionUtils.isEmpty(tTsFtplans)
-                    && !CollectionUtils.isEmpty(tTsFtplansDone)
-                    && tTsFtplansDone.size() == tTsFtplans.size()) {
-                flag = true;
-            }
+        if ("好".equals(tTsFirstplan.getScore1())) {
+            tTsFirstplan.setPlanStatus(5L);
         }
-        if (!CollectionUtils.isEmpty(tTsFirstplans) &&
-                !CollectionUtils.isEmpty(tTsFirstplansDone) &&
-                tTsFirstplans.size() == tTsFirstplansDone.size() && flag) {
-            tTsApproveService.doApprove(tTsNew.getNewId(), tTsNew.getPlanType().toString(), tTsFirstplan.getUserId(), tTsFirstplan.getNickName());
+        if ("满意".equals(tTsFirstplan.getScore1()) && "好".equals(tTsFirstplan.getScore2())) {
+            tTsFirstplan.setPlanStatus(5L);
         }
-        return tTsFirstplanMapper.updateTTsFirstplan(tTsFirstplan);
+        if ("满意".equals(tTsFirstplan.getScore1()) && "满意".equals(tTsFirstplan.getScore2()) && "好".equals(tTsFirstplan.getScore3())) {
+            tTsFirstplan.setPlanStatus(5L);
+        }
+        if ("满意".equals(tTsFirstplan.getScore1()) && "差".equals(tTsFirstplan.getScore2()) && "好".equals(tTsFirstplan.getScore2())) {
+            tTsFirstplan.setPlanStatus(5L);
+        }
+        if ("差".equals(tTsFirstplan.getScore1()) && "好".equals(tTsFirstplan.getScore2())) {
+            tTsFirstplan.setPlanStatus(5L);
+        }
+        if ("差".equals(tTsFirstplan.getScore1()) && "满意".equals(tTsFirstplan.getScore2())) {
+            tTsFirstplan.setPlanStatus(4L);
+        }
+        if ("差".equals(tTsFirstplan.getScore1()) && "差".equals(tTsFirstplan.getScore2())) {
+            tTsFirstplan.setPlanStatus(4L);
+        }
+        tTsFirstplanMapper.updateTTsFirstplan(tTsFirstplan);
+        if (tTsFirstplan.getPlanStatus() == 5) {
+            TTsNew tTsNew = new TTsNew();
+            tTsNew.setPlanStatus(5L);
+            tTsNew.setNewId(tTsFirstplan.getNewId());
+            tTsNewService.updateTTsNew(tTsNew, tTsFirstplan.getUserId(),tTsFirstplan.getNickName());
+        }
+        else if (tTsFirstplan.getPlanStatus() == 4) {
+            TTsNew tTsNew = new TTsNew();
+            tTsNew.setPlanStatus(4L);
+            tTsNew.setNewId(tTsFirstplan.getNewId());
+            tTsNewService.updateTTsNew(tTsNew, tTsFirstplan.getUserId(), tTsFirstplan.getNickName());
+        }
+        return 1;
     }
 
     /**

master/src/main/java/com/ruoyi/project/training/bccnew/service/impl/TTsNewServiceImpl.java

@@ -4,6 +4,7 @@ import com.ruoyi.project.training.bccnew.domain.*;
 import com.ruoyi.project.training.bccnew.mapper.*;
 import com.ruoyi.project.training.bccnew.service.ITTsApproveService;
 import com.ruoyi.project.training.bccnew.service.ITTsNewService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -48,7 +49,7 @@ public class TTsNewServiceImpl implements ITTsNewService {
     private TTsFtplanMapper tTsFtplanMapper;
 
     @Autowired
-    private TTsFirstplanMapper tTsFirstplanMapper ;
+    private TTsFirstplanMapper tTsFirstplanMapper;
 
     @Autowired
     private TTsFirstplanTmplMapper tTsFirstplanTmplMapper;
@@ -201,56 +202,193 @@ public class TTsNewServiceImpl implements ITTsNewService {
      * @return 结果
      */
     @Override
-    public int updateTTsNew(TTsNew tTsNew,Long userId,String nickName) {
-        if (tTsNew.getPlanStatus()==1){
+    public int updateTTsNew(TTsNew tTsNew, Long userId, String nickName) {
+        TTsNew tsNew = tTsNewMapper.selectTTsNewById(tTsNew.getNewId());
+        if (tTsNew.getPlanStatus() == 1) {
             TTsFirstplan tTsFirstplan = new TTsFirstplan();
             tTsFirstplan.setNewId(tTsNew.getNewId());
             for (TTsFirstplan tsFirstplan : tTsFirstplanMapper.selectTTsFirstplanListByNewId(tTsFirstplan)) {
-                if (tsFirstplan.getPlanStatus()==null){
-                    tsFirstplan.setPlanStatus(1L);
+                tsFirstplan.setPlanStatus(1L);
+                tTsFirstplanMapper.updateTTsFirstplan(tsFirstplan);
+            }
+            if (tsNew.getPlanType() == 1) {
+                TTsLjplan entity = new TTsLjplan();
+                entity.setNewId(tTsNew.getNewId());
+                for (TTsLjplan item : tTsLjplanMapper.selectTTsLjplanListByNewId(entity)) {
+                    item.setPlanStatus(1L);
+                    tTsLjplanMapper.updateTTsLjplan(item);
+                }
+            } else if (tsNew.getPlanType() == 2) {
+                TTsYsplan entity = new TTsYsplan();
+                entity.setNewId(tTsNew.getNewId());
+                for (TTsYsplan item : tTsYsplanMapper.selectTTsYsplanListByNewId(entity)) {
+                    item.setPlanStatus(1L);
+                    tTsYsplanMapper.updateTTsYsplan(item);
+                }
+            } else if (tsNew.getPlanType() == 3) {
+                TTsFlplan entity = new TTsFlplan();
+                entity.setNewId(tTsNew.getNewId());
+                for (TTsFlplan item : tTsFlplanMapper.selectTTsFlplanListByNewId(entity)) {
+                    item.setPlanStatus(1L);
+                    tTsFlplanMapper.updateTTsFlplan(item);
+                }
+            } else if (tsNew.getPlanType() == 4) {
+                TTsFtplan entity = new TTsFtplan();
+                entity.setNewId(tTsNew.getNewId());
+                for (TTsFtplan item : tTsFtplanMapper.selectTTsFtplanListByNewId(entity)) {
+                    item.setPlanStatus(1L);
+                    tTsFtplanMapper.updateTTsFtplan(item);
+                }
+            }
+            tTsNewMapper.updateTTsNew(tTsNew);
+        }
+        if (tTsNew.getPlanStatus() == 3) {
+            TTsFirstplan tTsFirstplan = new TTsFirstplan();
+            tTsFirstplan.setNewId(tTsNew.getNewId());
+            for (TTsFirstplan tsFirstplan : tTsFirstplanMapper.selectTTsFirstplanListByNewId(tTsFirstplan)) {
+                tsFirstplan.setPlanStatus(3L);
+                tTsFirstplanMapper.updateTTsFirstplan(tsFirstplan);
+            }
+            if (tsNew.getPlanType() == 1) {
+                TTsLjplan entity = new TTsLjplan();
+                entity.setNewId(tTsNew.getNewId());
+                for (TTsLjplan item : tTsLjplanMapper.selectTTsLjplanListByNewId(entity)) {
+                    item.setPlanStatus(3L);
+                    tTsLjplanMapper.updateTTsLjplan(item);
+                }
+            } else if (tsNew.getPlanType() == 2) {
+                TTsYsplan entity = new TTsYsplan();
+                entity.setNewId(tTsNew.getNewId());
+                for (TTsYsplan item : tTsYsplanMapper.selectTTsYsplanListByNewId(entity)) {
+                    item.setPlanStatus(3L);
+                    tTsYsplanMapper.updateTTsYsplan(item);
+                }
+            } else if (tsNew.getPlanType() == 3) {
+                TTsFlplan entity = new TTsFlplan();
+                entity.setNewId(tTsNew.getNewId());
+                for (TTsFlplan item : tTsFlplanMapper.selectTTsFlplanListByNewId(entity)) {
+                    item.setPlanStatus(3L);
+                    tTsFlplanMapper.updateTTsFlplan(item);
+                }
+            } else if (tsNew.getPlanType() == 4) {
+                TTsFtplan entity = new TTsFtplan();
+                entity.setNewId(tTsNew.getNewId());
+                for (TTsFtplan item : tTsFtplanMapper.selectTTsFtplanListByNewId(entity)) {
+                    item.setPlanStatus(3L);
+                    tTsFtplanMapper.updateTTsFtplan(item);
+                }
+            }
+            tTsNewMapper.updateTTsNew(tTsNew);
+        }
+        if (tTsNew.getPlanStatus() == 4) {
+            TTsFirstplan tTsFirstplan = new TTsFirstplan();
+            tTsFirstplan.setNewId(tTsNew.getNewId());
+            for (TTsFirstplan tsFirstplan : tTsFirstplanMapper.selectTTsFirstplanListByNewId(tTsFirstplan)) {
+                if (tsFirstplan.getPlanStatus() == null) {
+                    tsFirstplan.setPlanStatus(4L);
                     tTsFirstplanMapper.updateTTsFirstplan(tsFirstplan);
                 }
             }
-            if(tTsNew.getPlanType()==1){
+            if (tsNew.getPlanType() == 1) {
                 TTsLjplan entity = new TTsLjplan();
                 entity.setNewId(tTsNew.getNewId());
                 for (TTsLjplan item : tTsLjplanMapper.selectTTsLjplanListByNewId(entity)) {
-                    if (item.getPlanStatus()==null){
-                        item.setPlanStatus(1L);
+                    if (item.getPlanStatus() == null) {
+                        item.setPlanStatus(4L);
                         tTsLjplanMapper.updateTTsLjplan(item);
                     }
                 }
-            }else if(tTsNew.getPlanType()==2){
+            } else if (tsNew.getPlanType() == 2) {
                 TTsYsplan entity = new TTsYsplan();
                 entity.setNewId(tTsNew.getNewId());
                 for (TTsYsplan item : tTsYsplanMapper.selectTTsYsplanListByNewId(entity)) {
-                    if (item.getPlanStatus()==null){
-                        item.setPlanStatus(1L);
+                    if (item.getPlanStatus() == null) {
+                        item.setPlanStatus(4L);
                         tTsYsplanMapper.updateTTsYsplan(item);
                     }
                 }
-            }else if(tTsNew.getPlanType()==3){
+            } else if (tsNew.getPlanType() == 3) {
                 TTsFlplan entity = new TTsFlplan();
                 entity.setNewId(tTsNew.getNewId());
                 for (TTsFlplan item : tTsFlplanMapper.selectTTsFlplanListByNewId(entity)) {
-                    if (item.getPlanStatus()==null){
-                        item.setPlanStatus(1L);
+                    if (item.getPlanStatus() == null) {
+                        item.setPlanStatus(4L);
                         tTsFlplanMapper.updateTTsFlplan(item);
                     }
                 }
-            }else if(tTsNew.getPlanType()==4){
+            } else if (tsNew.getPlanType() == 4) {
                 TTsFtplan entity = new TTsFtplan();
                 entity.setNewId(tTsNew.getNewId());
                 for (TTsFtplan item : tTsFtplanMapper.selectTTsFtplanListByNewId(entity)) {
-                    if (item.getPlanStatus()==null){
-                        item.setPlanStatus(1L);
+                    if (item.getPlanStatus() == null) {
+                        item.setPlanStatus(4L);
                         tTsFtplanMapper.updateTTsFtplan(item);
                     }
                 }
             }
-            tsApproveService.doApprove(tTsNew.getNewId(),tTsNew.getPlanType().toString(),userId,nickName);
+            tTsNewMapper.updateTTsNew(tTsNew);
+            tsApproveService.doApprove(tTsNew.getNewId(), tsNew.getPlanType().toString(), userId, nickName);
         }
-        return tTsNewMapper.updateTTsNew(tTsNew);
+        if (tTsNew.getPlanStatus() == 5) {
+            TTsFirstplan plan = new TTsFirstplan();
+            plan.setNewId(tTsNew.getNewId());
+            List<TTsFirstplan> tTsFirstplans = tTsFirstplanMapper.selectTTsFirstplanListByNewId(plan);
+            plan.setPlanStatus(5L);
+            List<TTsFirstplan> tTsFirstplansDone = tTsFirstplanMapper.selectTTsFirstplanListByNewId(plan);
+            boolean flag = false;
+            if (1 == tsNew.getPlanType()) {
+                TTsLjplan tTsLjplan = new TTsLjplan();
+                tTsLjplan.setNewId(tTsNew.getNewId());
+                List<TTsLjplan> tTsLjplans = tTsLjplanMapper.selectTTsLjplanListByNewId(tTsLjplan);
+                tTsLjplan.setPlanStatus(5L);
+                List<TTsLjplan> tTsLjplansDone = tTsLjplanMapper.selectTTsLjplanListByNewId(tTsLjplan);
+                if (!CollectionUtils.isEmpty(tTsLjplans)
+                        && !CollectionUtils.isEmpty(tTsLjplansDone)
+                        && tTsLjplansDone.size() == tTsLjplans.size()) {
+                    flag = true;
+                }
+            } else if (2 == tsNew.getPlanType()) {
+                TTsYsplan tTsYsplan = new TTsYsplan();
+                tTsYsplan.setNewId(tTsNew.getNewId());
+                List<TTsYsplan> tTsYsplans = tTsYsplanMapper.selectTTsYsplanListByNewId(tTsYsplan);
+                tTsYsplan.setPlanStatus(5L);
+                List<TTsYsplan> tTsYsplansDone = tTsYsplanMapper.selectTTsYsplanListByNewId(tTsYsplan);
+                if (!CollectionUtils.isEmpty(tTsYsplans)
+                        && !CollectionUtils.isEmpty(tTsYsplansDone)
+                        && tTsYsplansDone.size() == tTsYsplans.size()) {
+                    flag = true;
+                }
+            } else if (3 == tsNew.getPlanType()) {
+                TTsFlplan tTsFlplan = new TTsFlplan();
+                tTsFlplan.setNewId(tTsNew.getNewId());
+                List<TTsFlplan> tTsFlplans = tTsFlplanMapper.selectTTsFlplanListByNewId(tTsFlplan);
+                tTsFlplan.setPlanStatus(5L);
+                List<TTsFlplan> tTsFlplansDone = tTsFlplanMapper.selectTTsFlplanListByNewId(tTsFlplan);
+                if (!CollectionUtils.isEmpty(tTsFlplans)
+                        && !CollectionUtils.isEmpty(tTsFlplansDone)
+                        && tTsFlplansDone.size() == tTsFlplans.size()) {
+                    flag = true;
+                }
+            } else if (4 == tsNew.getPlanType()) {
+                TTsFtplan tTsFtplan = new TTsFtplan();
+                tTsFtplan.setNewId(tTsNew.getNewId());
+                List<TTsFtplan> tTsFtplans = tTsFtplanMapper.selectTTsFtplanListByNewId(tTsFtplan);
+                tTsFtplan.setPlanStatus(5L);
+                List<TTsFtplan> tTsFtplansDone = tTsFtplanMapper.selectTTsFtplanListByNewId(tTsFtplan);
+                if (!CollectionUtils.isEmpty(tTsFtplans)
+                        && !CollectionUtils.isEmpty(tTsFtplansDone)
+                        && tTsFtplansDone.size() == tTsFtplans.size()) {
+                    flag = true;
+                }
+            }
+            if (!CollectionUtils.isEmpty(tTsFirstplans) &&
+                    !CollectionUtils.isEmpty(tTsFirstplansDone) &&
+                    tTsFirstplans.size() == tTsFirstplansDone.size() && flag) {
+                tTsNewMapper.updateTTsNew(tTsNew);
+                tsApproveService.doApprove(tTsNew.getNewId(), tsNew.getPlanType().toString(), userId, nickName);
+            }
+        }
+        return 1;
     }
 
     /**

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

@@ -357,27 +357,22 @@ public class TElPaperServiceImpl implements ITElPaperService {
                 tTsFirstplan.setExamId(paper.getExamId());
                 tTsFirstplan.setNewId(tTsNews.get(0).getNewId());
                 for (TTsFirstplan tsFirstplan : tsFirstplanService.selectTTsFirstplanList(tTsFirstplan)) {
-                    TTsNew tsNew = new TTsNew();
-                    tsNew.setNewId(tsFirstplan.getNewId());
                     if (paper.getUserScore() >= 80) {
-                        tsFirstplan.setAssess("好");
                         if (StringUtils.isEmpty(tsFirstplan.getScore1())) {
                             tsFirstplan.setScore1("好");
                         } else if (StringUtils.isEmpty(tsFirstplan.getScore2())) {
                             tsFirstplan.setScore2("好");
-                        } else {
+                        } else  if (!"差".equals(tsFirstplan.getScore1())) {
                             tsFirstplan.setScore3("好");
                         }
-                        tsFirstplan.setPlanStatus(3L);
+                        tsFirstplan.setPlanStatus(5L);
                     } else if (paper.getUserScore() >= 60) {
-                        tsFirstplan.setAssess("满意");
                         if (StringUtils.isEmpty(tsFirstplan.getScore1())) {
                             tsFirstplan.setScore1("满意");
                         } else if (tsFirstplan.getScore1().equals("满意") && StringUtils.isEmpty(tsFirstplan.getScore2())) {
                             tsFirstplan.setScore2("满意");
                         } else if (tsFirstplan.getScore1().equals("差") && StringUtils.isEmpty(tsFirstplan.getScore2())) {
                             tsFirstplan.setScore2("满意");
-                            tsNew.setPlanStatus(1L);
                         }
                     } else {
                         if (StringUtils.isEmpty(tsFirstplan.getScore1())) {
@@ -386,13 +381,11 @@ public class TElPaperServiceImpl implements ITElPaperService {
                             tsFirstplan.setScore2("差");
                         } else if (tsFirstplan.getScore1().equals("差") && StringUtils.isEmpty(tsFirstplan.getScore2())) {
                             tsFirstplan.setScore2("差");
-                            tsNew.setPlanStatus(1L);
                         }
                     }
                     tsFirstplan.setUserId(user.getUserId());
                     tsFirstplan.setNickName(user.getNickName());
                     tTsFirstplanService.updateTTsFirstplan(tsFirstplan);
-                    tsNewService.updateTTsNew(tsNew,user.getUserId(),user.getNickName());
                 }
             }
         }, "装置级培训考试成绩").start();

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

@@ -78,13 +78,33 @@
       <el-table-column label="讲师签名" align="center" prop="trainerConfirm" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="考试评估方式" align="center" prop="examType" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="评估结果" align="center" prop="assess" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="讲师签名" align="center" prop="studentConfirm" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="学员签名" align="center" prop="studentConfirm" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="培训状态" align="center" prop="planStatus" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.planStatus == 2" size="small" type="warning">待考试</el-tag>
           <el-tag v-if="scope.row.planStatus == 3" size="small" type="success">已完成</el-tag>
           <el-tag v-if="scope.row.planStatus == 1" size="small" type="danger">已中止</el-tag>
           <el-tag v-else-if="scope.row.planStatus == 0" size="small" type="info">未完成</el-tag>
+          <el-tag v-else-if="scope.row.planStatus == 4" size="small" type="danger">已中止待审批</el-tag>
+          <el-tag v-else-if="scope.row.planStatus == 5" size="small" type="success">已完成待审批</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="第一次成绩" align="center" prop="score1" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="附件" align="center" :show-overflow-tooltip="true" width="80">
+        <template slot-scope="scope">
+          <el-button  icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'tsNew-zhuangzhi1')" circle></el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="第二次成绩" align="center" prop="score2" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="附件" align="center"  :show-overflow-tooltip="true" width="80">
+        <template slot-scope="scope">
+          <el-button  icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'tsNew-zhuangzhi2')" circle></el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="第三次成绩" align="center" prop="score3" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="附件" align="center"  :show-overflow-tooltip="true" width="80">
+        <template slot-scope="scope">
+          <el-button  icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'tsNew-zhuangzhi3')" circle></el-button>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="180"/>
@@ -194,6 +214,15 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="第一次成绩" prop="score1">
+          <el-input v-model="form.score1" placeholder="请输入第一次成绩"/>
+        </el-form-item>
+        <el-form-item label="第二次成绩" prop="score2">
+          <el-input v-model="form.score2" placeholder="请输入第二次成绩"/>
+        </el-form-item>
+        <el-form-item label="第三次成绩" prop="score3">
+          <el-input v-model="form.score3" placeholder="请输入第三次成绩"/>
+        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注"/>
         </el-form-item>
@@ -286,6 +315,83 @@
       </div>
     </el-dialog>
 
+
+    <!-- 报告附件对话框 -->
+    <el-dialog  :close-on-click-modal="false" v-dialogDrag :title="doc.title" :visible.sync="doc.open" width="1000px" append-to-body >
+      <el-upload
+        ref="doc"
+        :limit="50"
+        :headers="doc.headers"
+        :action="doc.url + '?pType=' + doc.pType + '&pId=' + doc.pId"
+        :disabled="doc.isUploading"
+        :on-progress="handleFileDocProgress"
+        :on-success="handleFileDocSuccess"
+        :auto-upload="true"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">
+          {{ $t('将文件拖到此处，或') }}
+          <em>{{ $t('点击上传') }}</em>
+        </div>
+      </el-upload>
+      <el-table :data="doc.commonfileList" border>
+        <el-table-column :label="$t('文件名')" align="center" prop="fileName" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <a  class="link-type"  @click="handleDownload(scope.row)">
+              <span>{{ scope.row.fileName }}</span>
+            </a>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('大小(Kb)')" align="center" prop="fileSize" :show-overflow-tooltip="true" width="80" />
+        <el-table-column :label="$t('上传人')" align="center" prop="creator" :show-overflow-tooltip="true" width="120"/>
+        <el-table-column :label="$t('上传日期')" align="center" prop="createdate" :show-overflow-tooltip="true" width="120">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('操作')" align="center" width="220" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              v-if="scope.row.fileName!=null&&scope.row.fileName.endsWith('pdf')"
+              size="mini"
+              type="text"
+              icon="el-icon-view"
+              @click="handleSee(scope.row)"
+            >{{ $t('预览') }}</el-button>
+            <el-button v-hasPermi="['training:trainingrecords:file']"  type="text" size="small" v-if="scope.row.isEdit" @click="save(scope.row)">保存</el-button>
+            <el-button type="text" size="small" v-if="scope.row.isEdit" @click="cancelFile(scope.row, scope.$index)">取消</el-button>
+            <!--            <el-button v-hasPermi="['training:trainingrecords:file']" v-if="!scope.row.isEdit" @click="edit(scope.row)" icon="el-icon-edit" type="text" size="mini">编辑</el-button>-->
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-download"
+              @click="handleDownload(scope.row)"
+            >{{ $t('下载') }}</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDeleteDoc(scope.row)"
+              v-hasPermi="['training:trainingrecords:file']"
+            >{{ $t('删除') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-dialog  :close-on-click-modal="false" v-dialogDrag :title="pdf.title" :visible.sync="pdf.open" width="1300px" append-to-body>
+        <div style="margin-top: -60px;float: right;margin-right: 40px;">
+          <el-button size="mini" type="text" @click="openPdf">{{$t('新页面打开PDF')}}</el-button></div>
+        <div style="margin-top: -30px">
+          <iframe :src="pdf.pdfUrl" frameborder="0" width="100%" height="700px"></iframe>
+        </div>
+      </el-dialog>
+
+      <div slot="footer" class="dialog-footer">
+        <!--        <el-button type="primary" @click="submitFileForm">{{ $t('确 定') }}</el-button>-->
+        <el-button @click="doc.open = false">{{ $t('返 回') }}</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -305,6 +411,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listExam} from "@/api/training/elearn/exam";
+import {allFileList} from "@/api/common/commonfile";
 
 var timer = null;
 export default {
@@ -335,6 +442,32 @@ export default {
         loadedRatio: 0,
         loadingFlash: false,
       },
+      // 报告附件参数
+      doc: {
+        file: "",
+        // 是否显示弹出层（报告附件）
+        open: false,
+        // 弹出层标题（报告附件）
+        title: "附件",
+        // 是否禁用上传
+        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: 'trainingFirst'
+        },
+        pType: 'trainingFirst',
+        pId: null,
+        form: {}
+      },
       // 遮罩层
       loading: true,
       // 选中数组
@@ -422,6 +555,25 @@ export default {
     });
   },
   methods: {
+    handleSee (row){
+      // window.open(process.env.VUE_APP_BASE_API +'/pdf/web/viewer.html?file=' + process.env.VUE_APP_BASE_API + row.fileUrl);//path是文件的全路径地址
+      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
+    },
+    handleDoc(row , fileType) {
+      this.doc.pType = fileType
+      this.doc.queryParams.pType = fileType
+      this.doc.id = row.id;
+      this.doc.title = this.$t('附件') ;
+      this.doc.open = true;
+      this.doc.queryParams.pId = row.id
+      this.doc.pId = row.id
+      this.getFileList()
+      this.$nextTick(() => {
+        this.$refs.doc.clearFiles()
+      })
+    },
     handleClose() {
       window.clearInterval(timer);
       this.getList();
@@ -611,7 +763,39 @@ export default {
     // 提交上传文件
     submitFileForm() {
       this.$refs.upload.submit();
-    }
+    },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()
+    },
   }
 };
 </script>

ui/src/views/training/bccnew/firstplan/index_student.vue

@@ -42,13 +42,33 @@
       <el-table-column label="讲师签名" align="center" prop="trainerConfirm" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="考试评估方式" align="center" prop="examType" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="评估结果" align="center" prop="assess" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="讲师签名" align="center" prop="studentConfirm" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="学员签名" align="center" prop="studentConfirm" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="培训状态" align="center" prop="planStatus" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.planStatus == 2" size="small" type="warning">待考试</el-tag>
           <el-tag v-if="scope.row.planStatus == 3" size="small" type="success">已完成</el-tag>
           <el-tag v-if="scope.row.planStatus == 1" size="small" type="danger">已中止</el-tag>
           <el-tag v-else-if="scope.row.planStatus == 0" size="small" type="info">未完成</el-tag>
+          <el-tag v-else-if="scope.row.planStatus == 4" size="small" type="danger">已中止待审批</el-tag>
+          <el-tag v-else-if="scope.row.planStatus == 5" size="small" type="success">已完成待审批</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="第一次成绩" align="center" prop="score1" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="附件" align="center" :show-overflow-tooltip="true" width="80">
+        <template slot-scope="scope">
+          <el-button  icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'tsNew-zhuangzhi1')" circle></el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="第二次成绩" align="center" prop="score2" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="附件" align="center"  :show-overflow-tooltip="true" width="80">
+        <template slot-scope="scope">
+          <el-button  icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'tsNew-zhuangzhi2')" circle></el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="第三次成绩" align="center" prop="score3" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="附件" align="center"  :show-overflow-tooltip="true" width="80">
+        <template slot-scope="scope">
+          <el-button  icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'tsNew-zhuangzhi3')" circle></el-button>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="180"/>
@@ -219,6 +239,57 @@
       </div>
     </el-dialog>
 
+
+    <!-- 报告附件对话框 -->
+    <el-dialog  :close-on-click-modal="false" v-dialogDrag :title="doc.title" :visible.sync="doc.open" width="1000px" append-to-body >
+      <el-table :data="doc.commonfileList" border>
+        <el-table-column :label="$t('文件名')" align="center" prop="fileName" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <a  class="link-type"  @click="handleDownload(scope.row)">
+              <span>{{ scope.row.fileName }}</span>
+            </a>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('大小(Kb)')" align="center" prop="fileSize" :show-overflow-tooltip="true" width="80" />
+        <el-table-column :label="$t('上传人')" align="center" prop="creator" :show-overflow-tooltip="true" width="120"/>
+        <el-table-column :label="$t('上传日期')" align="center" prop="createdate" :show-overflow-tooltip="true" width="120">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('操作')" align="center" width="220" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              v-if="scope.row.fileName!=null&&scope.row.fileName.endsWith('pdf')"
+              size="mini"
+              type="text"
+              icon="el-icon-view"
+              @click="handleSee(scope.row)"
+            >{{ $t('预览') }}</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-download"
+              @click="handleDownload(scope.row)"
+            >{{ $t('下载') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-dialog  :close-on-click-modal="false" v-dialogDrag :title="pdf.title" :visible.sync="pdf.open" width="1300px" append-to-body>
+        <div style="margin-top: -60px;float: right;margin-right: 40px;">
+          <el-button size="mini" type="text" @click="openPdf">{{$t('新页面打开PDF')}}</el-button></div>
+        <div style="margin-top: -30px">
+          <iframe :src="pdf.pdfUrl" frameborder="0" width="100%" height="700px"></iframe>
+        </div>
+      </el-dialog>
+
+      <div slot="footer" class="dialog-footer">
+        <!--        <el-button type="primary" @click="submitFileForm">{{ $t('确 定') }}</el-button>-->
+        <el-button @click="doc.open = false">{{ $t('返 回') }}</el-button>
+      </div>
+    </el-dialog>
+
+
   </div>
 </template>
 
@@ -251,6 +322,32 @@ export default {
   // components: { Editor },
   data() {
     return {
+      // 报告附件参数
+      doc: {
+        file: "",
+        // 是否显示弹出层（报告附件）
+        open: false,
+        // 弹出层标题（报告附件）
+        title: "附件",
+        // 是否禁用上传
+        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: 'trainingFirst'
+        },
+        pType: 'trainingFirst',
+        pId: null,
+        form: {}
+      },
       file: {
         open: false,
         data: {}
@@ -350,6 +447,25 @@ export default {
     });
   },
   methods: {
+    handleSee (row){
+      // window.open(process.env.VUE_APP_BASE_API +'/pdf/web/viewer.html?file=' + process.env.VUE_APP_BASE_API + row.fileUrl);//path是文件的全路径地址
+      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
+    },
+    handleDoc(row , fileType) {
+      this.doc.pType = fileType
+      this.doc.queryParams.pType = fileType
+      this.doc.id = row.id;
+      this.doc.title = this.$t('附件') ;
+      this.doc.open = true;
+      this.doc.queryParams.pId = row.id
+      this.doc.pId = row.id
+      this.getFileList()
+      this.$nextTick(() => {
+        this.$refs.doc.clearFiles()
+      })
+    },
     hanldeExam(row){
       this.$router.push({ name: 'paper', params: { examId: row.examId }})
     },
@@ -554,7 +670,42 @@ export default {
     // 提交上传文件
     submitFileForm() {
       this.$refs.upload.submit();
-    }
+    },// 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },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()
+    },
   }
 };
 </script>

ui/src/views/training/bccnew/tsnew/score.vue

@@ -56,6 +56,8 @@
           <el-tag v-if="scope.row.planStatus == 3" size="small" type="success">已完成</el-tag>
           <el-tag v-if="scope.row.planStatus == 1" size="small" type="danger">已中止</el-tag>
           <el-tag v-else-if="scope.row.planStatus == 0" size="small" type="info">未完成</el-tag>
+          <el-tag v-else-if="scope.row.planStatus == 4" size="small" type="danger">已中止待审批</el-tag>
+          <el-tag v-else-if="scope.row.planStatus == 5" size="small" type="success">已完成待审批</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="第一次成绩" align="center" prop="score1" :show-overflow-tooltip="true" width="180"/>

ui/src/views/training/bccnew/tsnew/score_student.vue

@@ -27,6 +27,8 @@
           <el-tag v-if="scope.row.planStatus == 3" size="small" type="success">已完成</el-tag>
           <el-tag v-if="scope.row.planStatus == 1" size="small" type="danger">已中止</el-tag>
           <el-tag v-else-if="scope.row.planStatus == 0" size="small" type="info">未完成</el-tag>
+          <el-tag v-else-if="scope.row.planStatus == 4" size="small" type="danger">已中止待审批</el-tag>
+          <el-tag v-else-if="scope.row.planStatus == 5" size="small" type="success">已完成待审批</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="第一次成绩" align="center" prop="score1" :show-overflow-tooltip="true" width="180"/>
@@ -448,7 +450,7 @@ export default {
         let item = this.dsdtList[i];
         console.log(item.id)
         if (item.id===row.id){
-          if (this.dsdtList[i-1].planStatus!==3){
+          if (this.dsdtList[i-1].planStatus!==5){
             this.$alert('您必须完成上一项考试才可学习当前资料！', "注意", { dangerouslyUseHTMLString: true });
             return;
           }