导师带徒 修改培训内容

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

@@ -400,7 +400,7 @@ public class TTsNewController extends BaseController {
             for (TTsLjplan plan : tTsLjplans) {
                 i++;
                 String dateStr = getPlanDate(1, plan.getId());//获取整个内容的周期
-                planList[i] = Rows.create(plan.getDetailPlan(),dateStr, plan.getTopic(), "学习结束考核，且考试成绩达到80分以上");
+                planList[i] = Rows.create(plan.getDetailPlan(), dateStr, plan.getTopic(), "学习结束考核，且考试成绩达到80分以上");
             }
         } else if (planType == 2L) {
             post = "压缩";
@@ -484,6 +484,9 @@ public class TTsNewController extends BaseController {
             planList.add(Rows.create("", "", "", "", "Trainee 学徒", "Tutor 导师", "Proceed to next topic or not 是否转至下一主题"));
             for (TTsLjplan plan : tTsLjplans) {//如果有多次成绩，则将每次成绩都展示
                 String dateStr = getPlanDate(1, plan.getId());//获取整个内容的周期
+                if (StringUtils.isNotEmpty(dateStr) && dateStr.contains("~")) {
+                    dateStr = dateStr.substring(dateStr.lastIndexOf("~") + 2);
+                }
                 if (StringUtils.isNotEmpty(plan.getScore1())) {
                     planList.add(Rows.create(plan.getDetailPlan(), plan.getTopic(), dateStr, plan.getScore1(), apprentice.getNickName(), mentor.getNickName(), plan.getScore1().equals("好") ? "是" : "否"));
                 } else {
@@ -506,6 +509,9 @@ public class TTsNewController extends BaseController {
 
             for (TTsYsplan plan : tTsYsplans) {
                 String dateStr = getPlanDate(2, plan.getId());
+                if (StringUtils.isNotEmpty(dateStr) && dateStr.contains("~")) {
+                    dateStr = dateStr.substring(dateStr.lastIndexOf("~") + 2);
+                }
                 if (StringUtils.isNotEmpty(plan.getScore1())) {
                     planList.add(Rows.create(plan.getDetailPlan(), plan.getTopic(), dateStr, plan.getScore1(), apprentice.getNickName(), mentor.getNickName(), plan.getScore1().equals("好") ? "是" : "否"));
                 } else {
@@ -527,6 +533,9 @@ public class TTsNewController extends BaseController {
             planList.add(Rows.create("", "", "", "", "Trainee 学徒", "Tutor 导师", "Proceed to next topic or not 是否转至下一主题"));
             for (TTsFlplan plan : tTsFlplans) {
                 String dateStr = getPlanDate(3, plan.getId());
+                if (StringUtils.isNotEmpty(dateStr) && dateStr.contains("~")) {
+                    dateStr = dateStr.substring(dateStr.lastIndexOf("~") + 2);
+                }
                 if (StringUtils.isNotEmpty(plan.getScore1())) {
                     planList.add(Rows.create(plan.getDetailPlan(), plan.getTopic(), dateStr, plan.getScore1(), apprentice.getNickName(), mentor.getNickName(), plan.getScore1().equals("好") ? "是" : "否"));
                 } else {
@@ -548,6 +557,9 @@ public class TTsNewController extends BaseController {
             planList.add(Rows.create("", "", "", "", "Trainee 学徒", "Tutor 导师", "Proceed to next topic or not 是否转至下一主题"));
             for (TTsFtplan plan : tTsFtplans) {
                 String dateStr = getPlanDate(4, plan.getId());
+                if (StringUtils.isNotEmpty(dateStr) && dateStr.contains("~")) {
+                    dateStr = dateStr.substring(dateStr.lastIndexOf("~") + 2);
+                }
                 if (StringUtils.isNotEmpty(plan.getScore1())) {
                     planList.add(Rows.create(plan.getDetailPlan(), plan.getTopic(), dateStr, plan.getScore1(), apprentice.getNickName(), mentor.getNickName(), plan.getScore1().equals("好") ? "是" : "否"));
                 } else {
@@ -574,7 +586,7 @@ public class TTsNewController extends BaseController {
     }
 
     private String getPlanDate(int planType, Long id) {
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
         StringBuilder sb = new StringBuilder();
         if (planType == 1) {
             TTsLjplanContent item = new TTsLjplanContent();