修改报名时间 外链排序问题

src/main/java/org/rcisoft/business/bexternallink/dao/BExternalLinkRepository.java

@@ -65,8 +65,8 @@ public interface BExternalLinkRepository extends BaseMapper<BExternalLink> {
 
     //重新排序
     @Update("<script> <foreach collection=\"orderMap.entrySet()\" index=\"key\" item=\"value\" separator=\";\"> " +
-            "update b_banner " +
-            "set banner_sort = #{value} " +
+            "update b_external_link " +
+            "set sort = #{value} " +
             " WHERE business_id = #{key} " +
             "</foreach></script>")
     int updateExternalLinkOrder(@Param("orderMap") Map<String,Object> orderMap);

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

@@ -181,12 +181,17 @@ public interface BLessonPersonRepository extends BaseMapper<BLessonPerson> {
     @Update("<script> update b_lesson_person blp left join b_appoint ba" +
             " on blp.appoint_id = ba.business_id " +
             " and ba.del_flag != 1 and ba.flag = 1 " +
-            " set blp.flag = '0' " +
+            "  <set>"+
+            "       <if test=\"param.isAppoint != null and param.isAppoint != ''\">blp.is_appoint=#{param.isAppoint},</if>" +
+            "       <if test=\"param.appointId != null and param.appointId != ''\">blp.appoint_id=#{param.appointId},</if>" +
+            "       blp.flag = '0' ," +
+            "       blp.apply_date = #{param.applyDate} " +
+            "  </set>"+
             " where 1=1 " +
             " and blp.is_finish = '0' " +
-            " and ba.lesson_id = #{lessonId} " +
+            " and ba.lesson_id = #{param.lessonId} " +
             "</script>")
-    int deleteNotStartByLessonId(AppointLessonDTO param);
+    int deleteNotStartByLessonId(@Param("param") BLessonPerson param);
 
     /**
      * 已学习的取消指派
@@ -272,12 +277,12 @@ public interface BLessonPersonRepository extends BaseMapper<BLessonPerson> {
             " business_id,create_by,create_date,update_by,update_date, " +
             " del_flag,flag,remarks,person_id,lesson_id, " +
             " learn_progress,is_finish,is_collect, " +
-            " is_appoint) " +
+            " is_appoint, apply_date) " +
             " values " +
             "  (#{param.businessId}, #{param.createBy},#{param.createDate},#{param.updateBy},#{param.updateDate}, " +
             "  #{param.delFlag}, #{param.flag},#{param.remarks},#{param.personId},#{param.lessonId}, " +
             "  #{param.learnProgress}, #{param.isFinish},#{param.isCollect}," +
-            "  #{param.isAppoint}) " +
+            "  #{param.isAppoint}, #{param.applyDate}) " +
             "</script>")
     int insertBLessonPerson(@Param("param") BLessonPerson param);
 
@@ -375,11 +380,10 @@ public interface BLessonPersonRepository extends BaseMapper<BLessonPerson> {
             "<if test= \" param.isFinish != null and param.isFinish != ''\">and blp.is_finish = #{param.isFinish} </if> " +
             "<if test= \" param.trainIsSign != null and param.trainIsSign != ''\">and blp.train_is_sign = #{param.trainIsSign} </if> " +
             "<if test= \" param.lessonType != null and param.lessonType != ''\">and bl.lesson_type = #{param.lessonType} </if> " +
-            "<if test= \" param.lessonType != null and param.lessonType != ''\">and bl.lesson_type = #{param.lessonType} </if> " +
             "<if test= \" trainTypeSelStr != null and trainTypeSelStr != ''\">${trainTypeSelStr} </if> " +
 
-            "<if test= \" param.appointDateSort !=null and param.appointDateSort !='' and param.appointDateSort =='0'.toString()\">  ORDER BY ba.create_date DESC  </if> "+
-            "<if test= \" param.appointDateSort !=null and param.appointDateSort !='' and param.appointDateSort =='1'.toString()\">  ORDER BY ba.create_date ASC </if> "+
+            "<if test= \" param.appointDateSort !=null and param.appointDateSort !='' and param.appointDateSort =='0'.toString()\">  ORDER BY appointDate DESC  </if> "+
+            "<if test= \" param.appointDateSort !=null and param.appointDateSort !='' and param.appointDateSort =='1'.toString()\">  ORDER BY appointDate ASC </if> "+
             "<if test= \" param.finishDateSort !=null and param.finishDateSort !='' and param.finishDateSort =='0'.toString()\">  ORDER BY blp.finish_date DESC  </if> "+
             "<if test= \" param.finishDateSort !=null and param.finishDateSort !='' and param.finishDateSort =='1'.toString()\">  ORDER BY blp.finish_date ASC </if> "+
             "<if test= \" param.applyDateSort !=null and param.applyDateSort !='' and param.applyDateSort =='0'.toString()\">  ORDER BY appointDate DESC  </if> "+

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

@@ -167,7 +167,12 @@ public class BLessonPersonServiceImpl implements BLessonPersonService {
             //未开始执行删除
             BLessonPerson bLessonPerson = new BLessonPerson();
             bLessonPerson.setBusinessId(cancelAppointDTO.getBusinessId());
-            result = bLessonPersonRepository.logicalDelete(bLessonPerson);
+            bLessonPerson.setDelFlag("1");
+            //将加入学习时间置空
+            bLessonPerson.setApplyDate(null);
+            bLessonPerson.setAppointId("");
+            bLessonPerson.setIsAppoint("0");
+            result = bLessonPersonRepository.updateByPrimaryKeySelective(bLessonPerson);
         }else if ("1".equals(isFinish) || "2".equals(isFinish)){
             //已开始执行更新
             BLessonPerson bLessonPerson = new BLessonPerson();

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

@@ -707,7 +707,12 @@ public class BLessonServiceImpl implements BLessonService {
             UserUtil.setCurrentMergeOperation(bAppoint);
             bAppointRepository.updateByPrimaryKeySelective(bAppoint);
             //删除指派未开始
-            bLessonPersonRepository.deleteNotStartByLessonId(appointLessonDTO);
+            BLessonPerson delBlessonPerson = new BLessonPerson();
+            delBlessonPerson.setAppointId("");
+            delBlessonPerson.setIsAppoint("0");
+            delBlessonPerson.setApplyDate(null);
+            delBlessonPerson.setLessonId(appointLessonDTO.getLessonId());
+            bLessonPersonRepository.deleteNotStartByLessonId(delBlessonPerson);
             //指派更新为不指派
             BLessonPerson bLessonPerson = new BLessonPerson();
             bLessonPerson.setIsAppoint("0");

src/main/java/org/rcisoft/sys/user/controller/SysUserController.java

@@ -206,4 +206,14 @@ public class SysUserController extends PaginationController<SysUser> {
                 userServiceImpl.test(dto));
     }
 
+    @ApiOperation(value = "711 根具Id查询名字",notes = "根具Id查询名字")
+    @GetMapping("/getNameById")
+    public Result getNameById(CurUser curUser,@Valid String id,BindingResult br) {
+        return Result.builder(new PersistModel(1),
+                MessageConstant.MESSAGE_ALERT_SUCCESS,
+                MessageConstant.MESSAGE_ALERT_ERROR,
+                userServiceImpl.getNameById(id));
+    }
+
+
 }

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

@@ -223,6 +223,10 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
             "</script>")
     MyInfoDTO queryMyInfo(CurUser curUser);
 
+    @Select("<script>select `name` name ,head_pic headPic, `value` value from s_user where business_id = #{id}" +
+            "</script>")
+    MyInfoDTO getNameById(String id);
+
     @Select(" select r.r_privilege " +
             " from tm_admin_role r " +
             " left join s_r_user_role ur on ur.role_id = r.r_id " +

src/main/java/org/rcisoft/sys/user/service/SysUserService.java

@@ -61,4 +61,6 @@ public interface SysUserService {
     List<MTUserInfoRspDTO> getName(CurUser curUser);
 
     List<SysUser> test(QuerySysUserDTO dto);
+
+    MyInfoDTO getNameById(String id);
 }

src/main/java/org/rcisoft/sys/user/service/impl/SysUserServiceImpl.java

@@ -474,4 +474,9 @@ public class SysUserServiceImpl implements SysUserService {
     public List<SysUser> test(QuerySysUserDTO dto) {
         return this.qusers(dto);
     }
+
+    @Override
+    public MyInfoDTO getNameById(String id) {
+        return sysUserMapper.getNameById(id);
+    }
 }