-导师带徒bugfix

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

@@ -360,10 +360,11 @@ public class TTsNewController extends BaseController {
     private Map<String, Object> getMentorAgreementWordData(TTsNew tTsNew) {
         Map<String, Object> params = new HashMap<>();
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
-        Date startDate = new Date(tTsNew.getStartdate().toString());
-        startDate.setMonth(startDate.getMonth() + 1);
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(tTsNew.getStartdate());
+        calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) + 1);
         Date endDate = tTsNew.getEnddate();
-        params.put("startDate", Texts.of(formatter.format(startDate)).create());
+        params.put("startDate", Texts.of(formatter.format(calendar.getTime())).create());
         params.put("endDate", Texts.of(formatter.format(endDate)).create());
         String mentorStaffId = tTsNew.getMentorStaffId();
         String staffId = tTsNew.getStaffId();

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

@@ -1,5 +1,6 @@
 package com.ruoyi.project.training.bccnew.service.impl;
 
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.project.document.domain.TPlantproglist;
 import com.ruoyi.project.document.mapper.TPlantproglistMapper;
 import com.ruoyi.project.plant.domain.TStaffmgr;
@@ -17,6 +18,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -208,7 +211,10 @@ public class TTsNewServiceImpl implements ITTsNewService {
             tTsFirstplanMapper.insertTTsFirstplan(tTsFirstplan);
         }
         TStaffmgr tStaffmgr = tStaffmgrMapper.selectTStaffmgrByStaffId(tTsNew.getStaffId());
-        tShiftRoster.setShiftDate(rosters.get(i+1).getShiftDate());
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(tTsNew.getStartdate());
+        calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) + 1);
+        tShiftRoster.setShiftDate(calendar.getTime());
         tShiftRoster.setDclass(tStaffmgr.getTeam());
         tShiftRoster.setNclass(tStaffmgr.getTeam());
         tShiftRoster.setVacation(null);

master/src/main/resources/mybatis/shiftmgr/TShiftRosterMapper.xml

@@ -58,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="week != null "> and week != 1 and week != 7</if>
             and d.del_flag = 0
         </where>
+        order by shift_date
     </select>
         
     <insert id="insertTShiftRoster" parameterType="TShiftRoster">