导师带徒 修改考试成绩

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

@@ -111,45 +111,6 @@ public class TTsFirstplanController extends BaseController {
             TTsFirstplan need = tTsFirstplanService.selectTTsFirstplanById(tTsFirstplan.getId());
             if (need.getTimerNeed() != null && need.getTimerNeed().equals(timer + 1)) {
                 plan.setPlanStatus(2L);
-                tTsFirstplan.setPlanStatus(0L);
-                List<TTsFirstplan> tTsFirstplans = tTsFirstplanService.selectTTsFirstplanListByNewId(tTsFirstplan);
-                boolean flag=false;
-                if (1 == tTsNew.getPlanType()) {
-                    TTsLjplan tTsLjplan = new TTsLjplan();
-                    tTsLjplan.setNewId(tTsFirstplan.getNewId());
-                    tTsLjplan.setPlanStatus(0L);
-                    List<TTsLjplan> tTsLjplans = tTsLjplanService.selectTTsLjplanListByNewId(tTsLjplan);
-                    if (CollectionUtils.isEmpty(tTsLjplans)){
-                        flag=true;
-                    }
-                }else if (2==tTsNew.getPlanType()){
-                    TTsYsplan tTsYsplan = new TTsYsplan();
-                    tTsYsplan.setNewId(tTsFirstplan.getNewId());
-                    tTsYsplan.setPlanStatus(0L);
-                    List<TTsYsplan> tTsYsplans = tTsYsplanService.selectTTsYsplanListByNewId(tTsYsplan);
-                    if (CollectionUtils.isEmpty(tTsYsplans)){
-                        flag=true;
-                    }
-                } else if (3==tTsNew.getPlanType()) {
-                    TTsFlplan tTsFlplan = new TTsFlplan();
-                    tTsFlplan.setNewId(tTsFirstplan.getNewId());
-                    tTsFlplan.setPlanStatus(0L);
-                    List<TTsFlplan> tTsFlplans = tTsFlplanService.selectTTsFlplanListByNewId(tTsFlplan);
-                    if (CollectionUtils.isEmpty(tTsFlplans)){
-                        flag=true;
-                    }
-                } else if (4==tTsNew.getPlanType()) {
-                    TTsFtplan tTsFtplan = new TTsFtplan();
-                    tTsFtplan.setNewId(tTsFirstplan.getNewId());
-                    tTsFtplan.setPlanStatus(0L);
-                    List<TTsFtplan> tTsFtplans = tTsFtplanService.selectTTsFtplanListByNewId(tTsFtplan);
-                    if (CollectionUtils.isEmpty(tTsFtplans)){
-                        flag=true;
-                    }
-                }
-                if (CollectionUtils.isEmpty(tTsFirstplans)&&flag) {
-                    tTsApproveService.doApprove(tTsNew.getNewId(),tTsNew.getPlanType().toString(),getUserId(),getNickName());
-                }
             }
             return toAjax(tTsFirstplanService.updateTTsFirstplan(plan));
         }

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

@@ -96,16 +96,6 @@ public class TTsFlplanController extends BaseController {
             TTsFlplan need = tTsFlplanService.selectTTsFlplanById(tTsFlplan.getId());
             if (need.getTimerNeed() != null && need.getTimerNeed().equals(timer + 1)) {
                 plan.setPlanStatus(2L);
-                TTsFirstplan tTsFirstplan = new TTsFirstplan();
-                tTsFirstplan.setNewId(tTsNew.getNewId());
-                tTsFirstplan.setPlanStatus(0L);
-                TTsFlplan entity = new TTsFlplan();
-                entity.setNewId(tTsNew.getNewId());
-                entity.setPlanStatus(0L);
-                if (CollectionUtils.isEmpty(tTsFirstplanService.selectTTsFirstplanListByNewId(tTsFirstplan))&&
-                        CollectionUtils.isEmpty(tTsFlplanService.selectTTsFlplanListByNewId(entity))){
-                    tTsApproveService.doApprove(tTsNew.getNewId(), tTsNew.getPlanType().toString(),getUserId(),getNickName());
-                }
             }
             return toAjax(tTsFlplanService.updateTTsFlplan(plan));
         }
@@ -118,6 +108,45 @@ public class TTsFlplanController extends BaseController {
     @Log(title = "分离培训", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TTsFlplan tTsFlplan) {
+        if ("好".equals(tTsFlplan.getScore1())) {
+            tTsFlplan.setPlanStatus(3L);
+        }
+        if ("满意".equals(tTsFlplan.getScore1()) && "好".equals(tTsFlplan.getScore2())) {
+            tTsFlplan.setPlanStatus(3L);
+        }
+        if ("满意".equals(tTsFlplan.getScore1()) && "满意".equals(tTsFlplan.getScore2()) && "好".equals(tTsFlplan.getScore3())) {
+            tTsFlplan.setPlanStatus(3L);
+        }
+        if ("满意".equals(tTsFlplan.getScore1()) && "差".equals(tTsFlplan.getScore2()) && "好".equals(tTsFlplan.getScore2())) {
+            tTsFlplan.setPlanStatus(3L);
+        }
+        if ("差".equals(tTsFlplan.getScore1()) && "满意".equals(tTsFlplan.getScore2())) {
+            tTsFlplan.setPlanStatus(1L);
+        }
+        if ("差".equals(tTsFlplan.getScore1()) && "好".equals(tTsFlplan.getScore2())) {
+            tTsFlplan.setPlanStatus(3L);
+        }
+        if ("差".equals(tTsFlplan.getScore1()) && "差".equals(tTsFlplan.getScore2())) {
+            tTsFlplan.setPlanStatus(1L);
+        }
+        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());
+            }
+        }
         return toAjax(tTsFlplanService.updateTTsFlplan(tTsFlplan));
     }
 

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

@@ -228,7 +228,7 @@ public class TTsNewController extends BaseController {
         tTsNew.setMentorAgreementWordPath(mentorAgreementWordPath);
         tTsNew.setTargetPlanWordPath(targetPlanWordPath);
         tTsNew.setAppraisalFormWordPath(appraisalFormWordPath);
-        tTsNewService.updateTTsNew(tTsNew);
+        tTsNewService.updateTTsNew(tTsNew,getUserId(),getNickName());
     }
 
     /**
@@ -528,55 +528,7 @@ public class TTsNewController extends BaseController {
     @Log(title = "导师带徒", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TTsNew tTsNew) {
-        if (tTsNew.getPlanStatus()==1){
-            TTsFirstplan tTsFirstplan = new TTsFirstplan();
-            tTsFirstplan.setNewId(tTsNew.getNewId());
-            for (TTsFirstplan tsFirstplan : tTsFirstplanService.selectTTsFirstplanListByNewId(tTsFirstplan)) {
-                if (tsFirstplan.getPlanStatus()==null){
-                    tsFirstplan.setPlanStatus(1L);
-                    tTsFirstplanService.updateTTsFirstplan(tsFirstplan);
-                }
-            }
-            if(tTsNew.getPlanType()==1){
-                TTsLjplan entity = new TTsLjplan();
-                entity.setNewId(tTsNew.getNewId());
-                for (TTsLjplan item : tTsLjplanService.selectTTsLjplanListByNewId(entity)) {
-                    if (item.getPlanStatus()==null){
-                        item.setPlanStatus(1L);
-                        tTsLjplanService.updateTTsLjplan(item);
-                    }
-                }
-            }else if(tTsNew.getPlanType()==2){
-                TTsYsplan entity = new TTsYsplan();
-                entity.setNewId(tTsNew.getNewId());
-                for (TTsYsplan item : tTsYsplanService.selectTTsYsplanListByNewId(entity)) {
-                    if (item.getPlanStatus()==null){
-                        item.setPlanStatus(1L);
-                        tTsYsplanService.updateTTsYsplan(item);
-                    }
-                }
-            }else if(tTsNew.getPlanType()==3){
-                TTsFlplan entity = new TTsFlplan();
-                entity.setNewId(tTsNew.getNewId());
-                for (TTsFlplan item : tTsFlplanService.selectTTsFlplanListByNewId(entity)) {
-                    if (item.getPlanStatus()==null){
-                        item.setPlanStatus(1L);
-                        tTsFlplanService.updateTTsFlplan(item);
-                    }
-                }
-            }else if(tTsNew.getPlanType()==4){
-                TTsFtplan entity = new TTsFtplan();
-                entity.setNewId(tTsNew.getNewId());
-                for (TTsFtplan item : tTsFtplanService.selectTTsFtplanListByNewId(entity)) {
-                    if (item.getPlanStatus()==null){
-                        item.setPlanStatus(1L);
-                        tTsFtplanService.updateTTsFtplan(item);
-                    }
-                }
-            }
-            tsApproveService.doApprove(tTsNew.getNewId(),tTsNew.getPlanType().toString(),getUserId(),getNickName());
-        }
-        return toAjax(tTsNewService.updateTTsNew(tTsNew));
+        return toAjax(tTsNewService.updateTTsNew(tTsNew,getUserId(),getNickName()));
     }
 
     /**

master/src/main/java/com/ruoyi/project/training/bccnew/domain/TTsFirstplan.java

@@ -136,6 +136,26 @@ public class TTsFirstplan extends BaseEntity
 
     private Long examId;
 
+    private Long userId;
+
+    private String nickName;
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
     public Long getExamId() {
         return examId;
     }

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

@@ -41,7 +41,7 @@ public interface ITTsNewService
      * @param tTsNew 导师带徒
      * @return 结果
      */
-    public int updateTTsNew(TTsNew tTsNew);
+    public int updateTTsNew(TTsNew tTsNew,Long userId,String nickName);
 
     /**
      * 批量删除导师带徒

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

@@ -1,8 +1,9 @@
 package com.ruoyi.project.training.bccnew.service.impl;
 
-import com.ruoyi.project.training.bccnew.domain.TTsFirstplan;
+import com.ruoyi.project.training.bccnew.domain.*;
 import com.ruoyi.project.training.bccnew.mapper.TTsFirstplanMapper;
-import com.ruoyi.project.training.bccnew.service.ITTsFirstplanService;
+import com.ruoyi.project.training.bccnew.service.*;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,24 @@ public class TTsFirstplanServiceImpl implements ITTsFirstplanService {
     @Autowired
     private TTsFirstplanMapper tTsFirstplanMapper;
 
+    @Autowired
+    private ITTsLjplanService tTsLjplanService;
+
+    @Autowired
+    private ITTsYsplanService tTsYsplanService;
+
+    @Autowired
+    private ITTsFlplanService tTsFlplanService;
+
+    @Autowired
+    private ITTsFtplanService tTsFtplanService;
+
+    @Autowired
+    private ITTsNewService tTsNewService;
+
+    @Autowired
+    private ITTsApproveService tTsApproveService;
+
     /**
      * 查询进组培训
      *
@@ -65,6 +84,63 @@ 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 (!CollectionUtils.isEmpty(tTsFirstplans) &&
+                !CollectionUtils.isEmpty(tTsFirstplansDone) &&
+                tTsFirstplans.size() == tTsFirstplansDone.size() && flag) {
+            tTsApproveService.doApprove(tTsNew.getNewId(), tTsNew.getPlanType().toString(), tTsFirstplan.getUserId(), tTsFirstplan.getNickName());
+        }
         return tTsFirstplanMapper.updateTTsFirstplan(tTsFirstplan);
     }
 

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

@@ -2,6 +2,7 @@ package com.ruoyi.project.training.bccnew.service.impl;
 
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -52,6 +53,9 @@ public class TTsNewServiceImpl implements ITTsNewService {
     @Autowired
     private TTsFirstplanTmplMapper tTsFirstplanTmplMapper;
 
+    @Autowired
+    private ITTsApproveService tsApproveService;
+
     /**
      * 查询导师带徒
      *
@@ -197,7 +201,55 @@ public class TTsNewServiceImpl implements ITTsNewService {
      * @return 结果
      */
     @Override
-    public int updateTTsNew(TTsNew tTsNew) {
+    public int updateTTsNew(TTsNew tTsNew,Long userId,String nickName) {
+        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);
+                    tTsFirstplanMapper.updateTTsFirstplan(tsFirstplan);
+                }
+            }
+            if(tTsNew.getPlanType()==1){
+                TTsLjplan entity = new TTsLjplan();
+                entity.setNewId(tTsNew.getNewId());
+                for (TTsLjplan item : tTsLjplanMapper.selectTTsLjplanListByNewId(entity)) {
+                    if (item.getPlanStatus()==null){
+                        item.setPlanStatus(1L);
+                        tTsLjplanMapper.updateTTsLjplan(item);
+                    }
+                }
+            }else if(tTsNew.getPlanType()==2){
+                TTsYsplan entity = new TTsYsplan();
+                entity.setNewId(tTsNew.getNewId());
+                for (TTsYsplan item : tTsYsplanMapper.selectTTsYsplanListByNewId(entity)) {
+                    if (item.getPlanStatus()==null){
+                        item.setPlanStatus(1L);
+                        tTsYsplanMapper.updateTTsYsplan(item);
+                    }
+                }
+            }else if(tTsNew.getPlanType()==3){
+                TTsFlplan entity = new TTsFlplan();
+                entity.setNewId(tTsNew.getNewId());
+                for (TTsFlplan item : tTsFlplanMapper.selectTTsFlplanListByNewId(entity)) {
+                    if (item.getPlanStatus()==null){
+                        item.setPlanStatus(1L);
+                        tTsFlplanMapper.updateTTsFlplan(item);
+                    }
+                }
+            }else if(tTsNew.getPlanType()==4){
+                TTsFtplan entity = new TTsFtplan();
+                entity.setNewId(tTsNew.getNewId());
+                for (TTsFtplan item : tTsFtplanMapper.selectTTsFtplanListByNewId(entity)) {
+                    if (item.getPlanStatus()==null){
+                        item.setPlanStatus(1L);
+                        tTsFtplanMapper.updateTTsFtplan(item);
+                    }
+                }
+            }
+            tsApproveService.doApprove(tTsNew.getNewId(),tTsNew.getPlanType().toString(),userId,nickName);
+        }
         return tTsNewMapper.updateTTsNew(tTsNew);
     }
 

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

@@ -1,21 +1,25 @@
 package com.ruoyi.project.training.elearn.service.impl;
 
-import java.text.SimpleDateFormat;
-import java.util.*;
-
 import com.ruoyi.framework.job.service.JobService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.mapper.SysUserMapper;
+import com.ruoyi.project.training.bccnew.domain.TTsFirstplan;
+import com.ruoyi.project.training.bccnew.domain.TTsNew;
+import com.ruoyi.project.training.bccnew.mapper.TTsFirstplanMapper;
+import com.ruoyi.project.training.bccnew.service.ITTsFirstplanService;
+import com.ruoyi.project.training.bccnew.service.ITTsNewService;
 import com.ruoyi.project.training.elearn.domain.*;
 import com.ruoyi.project.training.elearn.mapper.*;
+import com.ruoyi.project.training.elearn.service.ITElPaperService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.project.training.elearn.service.ITElPaperService;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * 在线考试Service业务层处理
@@ -24,14 +28,13 @@ import javax.annotation.Resource;
  * @date 2024-05-29
  */
 @Service
-public class TElPaperServiceImpl implements ITElPaperService
-{
+public class TElPaperServiceImpl implements ITElPaperService {
     /**
      * 展示的选项，ABC这样
      */
     private static List<String> ABC = Arrays.asList(new String[]{
-            "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K","L","M","N","O","P","Q","R","S","T","U","V","W","X"
-            ,"Y","Z"
+            "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X"
+            , "Y", "Z"
     });
 
     @Resource
@@ -56,6 +59,13 @@ public class TElPaperServiceImpl implements ITElPaperService
     private TElUserBookMapper tElUserBookMapper;
     @Resource
     private SysUserMapper sysUserMapper;
+    @Resource
+    private ITTsFirstplanService tsFirstplanService;
+    @Resource
+    private ITTsNewService tsNewService;
+    @Autowired
+    private ITTsFirstplanService tTsFirstplanService;
+
     /**
      * 查询在线考试
      *
@@ -63,8 +73,7 @@ public class TElPaperServiceImpl implements ITElPaperService
      * @return 在线考试
      */
     @Override
-    public TElPaper selectTElPaperById(Long paperId)
-    {
+    public TElPaper selectTElPaperById(Long paperId) {
         return tElPaperMapper.selectTElPaperById(paperId);
     }
 
@@ -75,8 +84,7 @@ public class TElPaperServiceImpl implements ITElPaperService
      * @return 在线考试
      */
     @Override
-    public List<TElPaper> selectTElPaperList(TElPaper tElPaper)
-    {
+    public List<TElPaper> selectTElPaperList(TElPaper tElPaper) {
         return tElPaperMapper.selectTElPaperList(tElPaper);
     }
 
@@ -87,8 +95,7 @@ public class TElPaperServiceImpl implements ITElPaperService
      * @return 结果
      */
     @Override
-    public int insertTElPaper(TElPaper tElPaper)
-    {
+    public int insertTElPaper(TElPaper tElPaper) {
         return tElPaperMapper.insertTElPaper(tElPaper);
     }
 
@@ -99,8 +106,7 @@ public class TElPaperServiceImpl implements ITElPaperService
      * @return 结果
      */
     @Override
-    public int updateTElPaper(TElPaper tElPaper)
-    {
+    public int updateTElPaper(TElPaper tElPaper) {
         return tElPaperMapper.updateTElPaper(tElPaper);
     }
 
@@ -111,8 +117,7 @@ public class TElPaperServiceImpl implements ITElPaperService
      * @return 结果
      */
     @Override
-    public int deleteTElPaperByIds(Long[] paperIds)
-    {
+    public int deleteTElPaperByIds(Long[] paperIds) {
         return tElPaperMapper.deleteTElPaperByIds(paperIds);
     }
 
@@ -123,8 +128,7 @@ public class TElPaperServiceImpl implements ITElPaperService
      * @return 结果
      */
     @Override
-    public int deleteTElPaperById(Long paperId)
-    {
+    public int deleteTElPaperById(Long paperId) {
         return tElPaperMapper.deleteTElPaperById(paperId);
     }
 
@@ -132,7 +136,7 @@ public class TElPaperServiceImpl implements ITElPaperService
     @Transactional
     public TElPaper createPaper(TElPaper tElPaper, Long userId) {
         // 查找考试
-         TElExam exam = tElExamMapper.selectTElExamById(tElPaper.getExamId());
+        TElExam exam = tElExamMapper.selectTElExamById(tElPaper.getExamId());
 
         // 考试题目列表
         List<TElPaperQu> paperQuList = new ArrayList<>();
@@ -140,52 +144,50 @@ public class TElPaperServiceImpl implements ITElPaperService
         tElExamRepo.setExamId(tElPaper.getExamId());
         List<TElExamRepo> examRepoList = tElExamRepoMapper.selectTElExamRepoList(tElExamRepo);
         try {
-            for (TElExamRepo item: examRepoList
+            for (TElExamRepo item : examRepoList
             ) {
                 // 单选题
-                if(item.getRadioCount() > 0){
+                if (item.getRadioCount() > 0) {
                     item.setQuType(1);
                     List<TElQu> radioListAll = tElQuMapper.selectTElQuListByRepo(item);
                     Collections.shuffle(radioListAll);
-                    List<TElQu> radioList = radioListAll.subList(0,Integer.parseInt(String.valueOf(item.getRadioCount())) );
-                    for (TElQu qu: radioList
+                    List<TElQu> radioList = radioListAll.subList(0, Integer.parseInt(String.valueOf(item.getRadioCount())));
+                    for (TElQu qu : radioList
                     ) {
-                        TElPaperQu paperQu = this.processPaperQu(item,qu);
+                        TElPaperQu paperQu = this.processPaperQu(item, qu);
                         paperQuList.add(paperQu);
                     }
                 }
                 // 多选题
-                if(item.getMultiCount() > 0){
+                if (item.getMultiCount() > 0) {
                     item.setQuType(2);
                     List<TElQu> multiListAll = tElQuMapper.selectTElQuListByRepo(item);
                     Collections.shuffle(multiListAll);
-                    List<TElQu> multiList = multiListAll.subList(0,Integer.parseInt(String.valueOf(item.getMultiCount())) );
-                    for (TElQu qu: multiList
+                    List<TElQu> multiList = multiListAll.subList(0, Integer.parseInt(String.valueOf(item.getMultiCount())));
+                    for (TElQu qu : multiList
                     ) {
-                        TElPaperQu paperQu = this.processPaperQu(item,qu);
+                        TElPaperQu paperQu = this.processPaperQu(item, qu);
                         paperQuList.add(paperQu);
                     }
                 }
                 // 判断题
-                if(item.getJudgeCount() > 0){
+                if (item.getJudgeCount() > 0) {
                     item.setQuType(3);
                     List<TElQu> judgeListAll = tElQuMapper.selectTElQuListByRepo(item);
                     Collections.shuffle(judgeListAll);
-                    List<TElQu> judgeLis = judgeListAll.subList(0,Integer.parseInt(String.valueOf(item.getJudgeCount())) );
-                    for (TElQu qu: judgeLis
+                    List<TElQu> judgeLis = judgeListAll.subList(0, Integer.parseInt(String.valueOf(item.getJudgeCount())));
+                    for (TElQu qu : judgeLis
                     ) {
-                        TElPaperQu paperQu = this.processPaperQu(item,qu);
+                        TElPaperQu paperQu = this.processPaperQu(item, qu);
                         paperQuList.add(paperQu);
                     }
                 }
             }
-        }catch (IndexOutOfBoundsException e) {
-                throw new IndexOutOfBoundsException("题库无法匹配");
+        } catch (IndexOutOfBoundsException e) {
+            throw new IndexOutOfBoundsException("题库无法匹配");
         }
 
 
-
-
         //保存试卷基本信息
         TElPaper paper = new TElPaper();
         paper.setExamId(exam.getExamId());
@@ -220,8 +222,8 @@ public class TElPaperServiceImpl implements ITElPaperService
     @Transactional
     public void fillAnswer(TElPaperQu paperQu) {
         // 未作答
-        if(CollectionUtils.isEmpty(paperQu.getAnswers())
-                && StringUtils.isBlank(paperQu.getAnswer())){
+        if (CollectionUtils.isEmpty(paperQu.getAnswers())
+                && StringUtils.isBlank(paperQu.getAnswer())) {
             return;
         }
         TElPaperQuAnswer param = new TElPaperQuAnswer();
@@ -241,19 +243,19 @@ public class TElPaperServiceImpl implements ITElPaperService
                 item.setChecked(0l);
             }
             //有一个对不上就是错的
-            if (item.getIsRight()!=null && !item.getIsRight().toString().equals(item.getChecked().toString())) {
+            if (item.getIsRight() != null && !item.getIsRight().toString().equals(item.getChecked().toString())) {
                 right = 0;
             }
             tElPaperQuAnswerMapper.updateTElPaperQuAnswer(item);
         }
-            //修改为已回答
-            TElPaperQu qu = new TElPaperQu();
-            qu.setQuId(paperQu.getQuId());
-            qu.setPaperId(paperQu.getPaperId());
-            qu.setIsRight(right);
-            qu.setAnswer(paperQu.getAnswer());
-            qu.setAnswered(1l);
-            tElPaperQuMapper.updateTElPaperQuByKey(qu);
+        //修改为已回答
+        TElPaperQu qu = new TElPaperQu();
+        qu.setQuId(paperQu.getQuId());
+        qu.setPaperId(paperQu.getPaperId());
+        qu.setIsRight(right);
+        qu.setAnswer(paperQu.getAnswer());
+        qu.setAnswered(1l);
+        tElPaperQuMapper.updateTElPaperQuByKey(qu);
     }
 
     @Override
@@ -265,18 +267,18 @@ public class TElPaperServiceImpl implements ITElPaperService
         int objScore = tElPaperQuMapper.sumObjective(paperQu.getPaperId());
         paper.setObjScore((long) objScore);
         paper.setUserScore((long) objScore);
+        SysUser user = sysUserMapper.selectUserById(paper.getUserId());
 
         // 主观分，因为要阅卷，所以给0
         paper.setSubjScore(0l);
         // 待阅卷
-        if(paper.getHasSaq() == 1) {
+        if (paper.getHasSaq() == 1) {
 
-        }else {
+        } else {
             // 同步保存考试成绩
             TElUserExam record = tElUserExamMapper.selectTElUserExamByPaPer(paper);
-            long pass = objScore>=paper.getQualifyScore()?1:0;
-            SysUser user = sysUserMapper.selectUserById(paper.getUserId());
-            if(record == null){
+            long pass = objScore >= paper.getQualifyScore() ? 1 : 0;
+            if (record == null) {
                 record = new TElUserExam();
                 record.setUserId(paper.getUserId());
                 record.setExamId(paper.getExamId());
@@ -287,12 +289,12 @@ public class TElPaperServiceImpl implements ITElPaperService
                 record.setUpdatedate(new Date());
                 record.setUserName(user.getNickName());
                 tElUserExamMapper.insertTElUserExam(record);
-            }else {
+            } else {
                 // 修复低分数不加入统计问题
-                record.setTryCount(record.getTryCount()+1);
+                record.setTryCount(record.getTryCount() + 1);
                 record.setUpdatedate(new Date());
                 record.setUserName(user.getNickName());
-                if(record.getMaxScore() < objScore){
+                if (record.getMaxScore() < objScore) {
                     record.setMaxScore((long) objScore);
                     record.setPassed(pass);
                 }
@@ -305,8 +307,8 @@ public class TElPaperServiceImpl implements ITElPaperService
         //计算考试时长
         Calendar cl = Calendar.getInstance();
         cl.setTimeInMillis(System.currentTimeMillis());
-        int userTime = (int)((System.currentTimeMillis() - paper.getCreatedate().getTime()) / 1000 / 60);
-        if(userTime == 0){
+        int userTime = (int) ((System.currentTimeMillis() - paper.getCreatedate().getTime()) / 1000 / 60);
+        if (userTime == 0) {
             userTime = 1;
         }
         paper.setUserTime((long) userTime);
@@ -315,7 +317,7 @@ public class TElPaperServiceImpl implements ITElPaperService
 
         new Thread(() -> {
             //错题本
-            TElPaperQu  param = new TElPaperQu();
+            TElPaperQu param = new TElPaperQu();
             param.setPaperId(paperQu.getPaperId());
             param.setIsRight(0l);
             List<TElPaperQu> quList = tElPaperQuMapper.selectTElPaperQuList(param);
@@ -328,7 +330,7 @@ public class TElPaperServiceImpl implements ITElPaperService
                 TElQu qu = tElQuMapper.selectTElQuById(i.getQuId());
 
                 if (books.size() == 0) {
-                    TElUserBook  book = new TElUserBook();
+                    TElUserBook book = new TElUserBook();
                     book.setExamId(paper.getExamId());
                     book.setUserId(paper.getUserId());
                     book.setTitle(qu.getContent());
@@ -336,15 +338,64 @@ public class TElPaperServiceImpl implements ITElPaperService
                     book.setWrongCount(1l);
                     book.setUpdatedate(new Date());
                     tElUserBookMapper.insertTElUserBook(book);
-                }else {
-                    TElUserBook  book =books.get(0);
+                } else {
+                    TElUserBook book = books.get(0);
                     book.setUpdatedate(new Date());
-                    book.setWrongCount(book.getWrongCount()+1);
+                    book.setWrongCount(book.getWrongCount() + 1);
                     tElUserBookMapper.updateTElUserBook(book);
                 }
             }
-        },"错题本").start();
+        }, "错题本").start();
 
+        new Thread(() -> {
+            TTsNew tTsNew = new TTsNew();
+            tTsNew.setPlanStatus(0L);
+            tTsNew.setStaffId(user.getStaffId());
+            List<TTsNew> tTsNews = tsNewService.selectTTsNewList(tTsNew);
+            if (!CollectionUtils.isEmpty(tTsNews)) {
+                TTsFirstplan tTsFirstplan = new TTsFirstplan();
+                tTsFirstplan.setExamId(paper.getExamId());
+                tTsFirstplan.setNewId(tTsNews.get(0).getNewId());
+                for (TTsFirstplan tsFirstplan : tsFirstplanService.selectTTsFirstplanList(tTsFirstplan)) {
+                    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 {
+                            tsFirstplan.setScore3("好");
+                        }
+                        tsFirstplan.setPlanStatus(3L);
+                    } 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())) {
+                            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);
+                        }
+                    }
+                    tsFirstplan.setUserId(user.getUserId());
+                    tsFirstplan.setNickName(user.getNickName());
+                    tTsFirstplanService.updateTTsFirstplan(tsFirstplan);
+                    tsNewService.updateTTsNew(tsNew,user.getUserId(),user.getNickName());
+                }
+            }
+        }, "装置级培训考试成绩").start();
     }
 
     @Override
@@ -354,11 +405,11 @@ public class TElPaperServiceImpl implements ITElPaperService
         query.setPaperId(paperQu.getPaperId());
         List<TElPaperQu> quList = tElPaperQuMapper.selectTElPaperQuListByPaper(query);
         for (TElPaperQu item : quList
-             ) {
+        ) {
             TElPaperQuAnswer a = new TElPaperQuAnswer();
             a.setPaperId(paperQu.getPaperId());
             a.setQuId(item.getQuId());
-            List<TElPaperQuAnswer> list =  tElPaperQuAnswerMapper.selectTElPaperQuAnswerListByPaper(a);
+            List<TElPaperQuAnswer> list = tElPaperQuAnswerMapper.selectTElPaperQuAnswerListByPaper(a);
             item.setAnswerList(list);
         }
         paper.setQuList(quList);
@@ -367,10 +418,11 @@ public class TElPaperServiceImpl implements ITElPaperService
 
     /**
      * 保存试卷试题列表
+     *
      * @param paperId
      * @param quList
      */
-    private void savePaperQu(Long paperId, List<TElPaperQu> quList){
+    private void savePaperQu(Long paperId, List<TElPaperQu> quList) {
         List<TElPaperQu> batchQuList = new ArrayList<>();
         List<TElPaperQuAnswer> batchAnswerList = new ArrayList<>();
         long sort = 0;
@@ -380,7 +432,7 @@ public class TElPaperServiceImpl implements ITElPaperService
             item.setSort(sort);
             qury.setQuId(item.getQuId());
             //回答列表
-            List<TElQuAnswer> answerList =tElQuAnswerMapper.selectTElQuAnswerList(qury);
+            List<TElQuAnswer> answerList = tElQuAnswerMapper.selectTElQuAnswerList(qury);
             Collections.shuffle(answerList);
             if (!CollectionUtils.isEmpty(answerList)) {
 
@@ -392,7 +444,7 @@ public class TElPaperServiceImpl implements ITElPaperService
                     paperQuAnswer.setAnswerId(answer.getAnswerId());
                     paperQuAnswer.setChecked(0l);
                     paperQuAnswer.setSort(ii);
-                    paperQuAnswer.setAbc(ABC.get((int)ii));
+                    paperQuAnswer.setAbc(ABC.get((int) ii));
                     paperQuAnswer.setIsRight(answer.getIsRight());
                     ii++;
                     batchAnswerList.add(paperQuAnswer);
@@ -402,19 +454,21 @@ public class TElPaperServiceImpl implements ITElPaperService
             sort++;
         }
         //添加问题
-        for (TElPaperQu q:batchQuList
-             ) {
+        for (TElPaperQu q : batchQuList
+        ) {
             tElPaperQuMapper.insertTElPaperQu(q);
         }
 
         //批量添加问题答案
-        for (TElPaperQuAnswer answer:batchAnswerList
-             ) {
+        for (TElPaperQuAnswer answer : batchAnswerList
+        ) {
             tElPaperQuAnswerMapper.insertTElPaperQuAnswer(answer);
         }
     }
+
     /**
      * 填充试题题目信息
+     *
      * @param repo
      * @param qu
      * @return
@@ -448,10 +502,11 @@ public class TElPaperServiceImpl implements ITElPaperService
 
     /**
      * 准确的时间点到表达式
+     *
      * @param date
      * @return
      */
-    public static String dateToCron(final Date date){
+    public static String dateToCron(final Date date) {
         SimpleDateFormat fmt = new SimpleDateFormat("ss mm HH dd MM ? yyyy");
         String formatTimeStr = "";
         if (date != null) {

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

@@ -370,6 +370,17 @@ export default {
       return parseInt((this.file.data.timer / this.file.data.timerNeed * 100).toFixed(2))
     },
     openFileDialog(row) {
+      if (row.sortTmpl!=null&&parseInt(row.sortTmpl)>1){
+        for (let i=0;i<=this.firstplanList;i++) {
+          let item = this.dsdtList[i];
+          if (item.id===row.id){
+            if ( this.firstplanList[i-1].timer<this.firstplanList[i-1].timerNeed){
+              this.$alert('您必须完成上一项考试才可学习当前资料！', "注意", { dangerouslyUseHTMLString: true });
+              return;
+            }
+          }
+        }
+      }
       this.file.open = true;
       this.file.data = row
       console.log(row)

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

@@ -589,7 +589,7 @@ export default {
       this.loading = true;
       listTsnew(this.queryParams).then(response => {
         this.tnNewList = response.rows;
-        for (const item in this.tnNewList) {
+        for (const item of this.tnNewList) {
           item.planFinish=parseInt(item.planFinish)
         }
         this.total = response.total;

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

@@ -441,6 +441,17 @@ export default {
       return parseInt((this.file.data.timer / this.file.data.timerNeed * 100).toFixed(2))
     },
     openFileDialog(row) {
+      if (row.sortTmpl!=null&&parseInt(row.sortTmpl)>1){
+        for (let i=0;i<=this.dsdtList;i++) {
+          let item = this.dsdtList[i];
+          if (item.id===row.id){
+            if ( this.dsdtList[i-1].timer<this.dsdtList[i-1].timerNeed){
+              this.$alert('您必须完成上一项考试才可学习当前资料！', "注意", { dangerouslyUseHTMLString: true });
+              return;
+            }
+          }
+        }
+      }
       this.file.open = true;
       this.file.data = row
       console.log(row)