修改接口

src/main/java/org/rcisoft/business/blesson/dao/BLessonPersonRepository.java

@@ -97,7 +97,8 @@ public interface BLessonPersonRepository extends BaseMapper<BLessonPerson> {
             "  bl.lesson_name LessonTitle , su.name personName, " +
             "  blp.is_appoint isAppoint , blp.is_finish isFinish ," +
             "  blp.learn_progress learnProgress ," +
-            "  ba.create_date appointDate ," +
+            "  if(blp.is_appoint = 0, blp.apply_date, ba.create_date) appointDate, " +
+//            "  ba.create_date appointDate ," +
             "  blp.finish_date finishDate , " +
             "  blp.apply_date applyDate , " +
             "  blp.sign_date signDate , " +

src/main/java/org/rcisoft/business/blesson/entity/BLessonPerson.java

@@ -154,8 +154,10 @@ public class BLessonPerson extends IdEntity<BLessonPerson> {
         this.setIsCollect("0");
         //设置不指派
         this.setIsAppoint("0");
-        //设置不指派
+
         this.setRemarks("");
+        //设置加入学习时间为当前时间
+        this.setApplyDate(new Date());
     }
     //初始化
     public void initTrainModel(){
@@ -164,7 +166,7 @@ public class BLessonPerson extends IdEntity<BLessonPerson> {
         this.setIsCollect("0");
         //设置不指派
         this.setIsAppoint("0");
-        //设置不指派
+
         this.setRemarks("");
         //设置待开始
         this.setTrainIsSign("0");

src/main/java/org/rcisoft/business/blesson/service/impl/BLessonPersonServiceImpl.java

@@ -26,10 +26,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 
 /**
@@ -211,6 +208,9 @@ public class BLessonPersonServiceImpl implements BLessonPersonService {
                 BLessonPerson bLessonPersonReal = bLessonPersonReals.get(0);
                 bLessonPersonReal.setFlag("1");
                 bLessonPersonReal.setDelFlag("0");
+                //更新报名时间
+                bLessonPersonReal.setApplyDate(new Date());
+
                 UserUtil.setCurrentMergeOperation(bLessonPersonReal);
                 line = bLessonPersonRepository.updateByPrimaryKeySelective(bLessonPersonReal);
                 return new PersistModel(line);

src/main/java/org/rcisoft/business/blesson/service/impl/BLessonServiceImpl.java

@@ -725,7 +725,7 @@ public class BLessonServiceImpl implements BLessonService {
             updateBLessonPerson.setFlag("1");
             //设置指派信息
             updateBLessonPerson.setIsAppoint("1");
-            updateBLessonPerson.setApplyDate(new Date());//指派时间同步到lesson_person的报名时间
+//            updateBLessonPerson.setApplyDate(new Date());//指派时间同步到lesson_person的报名时间
             updateBLessonPerson.setLessonId(appointLessonDTO.getLessonId());
             updateBLessonPerson.setAppointId(bAppoint.getBusinessId());
             UserUtil.setCurrentMergeOperation(updateBLessonPerson);
@@ -751,7 +751,6 @@ public class BLessonServiceImpl implements BLessonService {
             if ("0".equals(bLesson.getLessonType())){
                 bLessonPerson.initModel();
                 bLessonPerson.setIsFinish("0");
-
             }
             if ("1".equals(bLesson.getLessonType())){
                 bLessonPerson.initTrainModel();
@@ -761,7 +760,7 @@ public class BLessonServiceImpl implements BLessonService {
 
             bLessonPerson.setAppointId(bAppoint.getBusinessId());
             bLessonPerson.setIsAppoint("1");
-            bLessonPerson.setApplyDate(new Date());//指派时间同步到lesson_person的报名时间
+//            bLessonPerson.setApplyDate(new Date());//指派时间同步到lesson_person的报名时间
             bLessonPerson.setLessonId(appointLessonDTO.getLessonId());
             bLessonPerson.setPersonId(userId);
             bLessonPersonOthers.add(bLessonPerson);

src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java

@@ -231,7 +231,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
             " b_lesson_person blp left join b_lesson bl on blp.lesson_id = bl.business_id " +
             " where blp.del_flag != 1 AND blp.flag = 1 " +
             " and bl.del_flag != 1 AND bl.flag = 1 " +
-//            " and blp.is_finish = 2 " +
+            " and blp.is_finish = 1 " +
 //            " and bl.release_state = 2 " +
             " and bl.lesson_type = 0 " +
             " and bl.corp_id = #{corpId} " +