Skip to content

E
education
Commit cd546623 authored by zhangqingle's avatar zhangqingle
Browse files
Options

修改列表页人数问题，添加外链接口

parent 5249de53
Show whitespace changes
Inline Side-by-side
Showing with 52 additions and 16 deletions
src/main/java/org/rcisoft/business/bchapter/service/impl/BChapterServiceImpl.java
View file @ cd546623
......@@ -536,7 +536,7 @@ public class BChapterServiceImpl implements BChapterService {
@Override
public String getDownLoadUrl(BFile bFile) {
if (StringUtils.isEmpty(bFile.getVideoUrl()) || StringUtils.isEmpty(bFile.getLessonId())){
if (StringUtils.isEmpty(bFile.getVideoUrl())){
return null;
// throw new ServiceException(ResultServiceEnums.PARAM_NOT_NULL);
}
......
src/main/java/org/rcisoft/business/blesson/dao/BLessonPersonRepository.java
View file @ cd546623
......@@ -125,8 +125,8 @@ public interface BLessonPersonRepository extends BaseMapper<BLessonPerson> {
"<if test= \" param.personName != null and param.personName != ''\">and su.name like CONCAT('%',#{param.personName},'%') </if> " +
"<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.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 blp.create_date DESC </if> "+
......@@ -352,8 +352,9 @@ public interface BLessonPersonRepository extends BaseMapper<BLessonPerson> {
" bl.class_hour classHour , " +
" blp.is_appoint isAppoint , " +
" blp.is_finish isFinish , " +
" blp.learn_progress learnProgress ," +
" case when now() &lt; bl.train_start_date then 0 when now() BETWEEN bl.train_start_date and bl.train_over_date then 1 when now() &gt; bl.train_over_date then 2 end as trainState, "+
" blp.learn_progress learnProgress , " +
" case when now() &lt; SUBDATE(bl.train_start_date,interval bl.train_sign_time MINUTE) then 0 when now() BETWEEN SUBDATE(bl.train_start_date,interval bl.train_sign_time MINUTE) and bl.train_over_date then 1 when now() &gt; bl.train_over_date then 2 end as trainState, " +
// " case when now() &lt; bl.train_start_date then 0 when now() BETWEEN bl.train_start_date and bl.train_over_date then 1 when now() &gt; bl.train_over_date then 2 end as trainState, "+
" if(blp.is_appoint = 0, blp.apply_date, ba.update_date) appointDate, " +
" blp.finish_date finishDate , " +
" blp.apply_date applyDate , " +
......@@ -374,17 +375,21 @@ 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.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 blp.create_date DESC </if> "+
// "<if test= \" param.applyDateSort !=null and param.applyDateSort !='' and param.applyDateSort =='1'.toString()\"> ORDER BY blp.create_date ASC </if> "+
// "<if test= \" param.signDateSort !=null and param.signDateSort !='' and param.signDateSort =='0'.toString()\"> ORDER BY blp.sign_date DESC </if> "+
// "<if test= \" param.signDateSort !=null and param.signDateSort !='' and param.signDateSort =='1'.toString()\"> ORDER BY blp.sign_date ASC </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.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> "+
"<if test= \" param.applyDateSort !=null and param.applyDateSort !='' and param.applyDateSort =='1'.toString()\"> ORDER BY appointDate ASC </if> "+
"<if test= \" param.signDateSort !=null and param.signDateSort !='' and param.signDateSort =='0'.toString()\"> ORDER BY blp.sign_date DESC </if> "+
"<if test= \" param.signDateSort !=null and param.signDateSort !='' and param.signDateSort =='1'.toString()\"> ORDER BY blp.sign_date ASC </if> "+
"<if test= \" param.learnProgressSort !=null and param.learnProgressSort !='' and param.learnProgressSort =='0'.toString()\"> ORDER BY CAST(learnProgress AS UNSIGNED) DESC </if> "+
"<if test= \" param.learnProgressSort !=null and param.learnProgressSort !='' and param.learnProgressSort =='1'.toString()\"> ORDER BY CAST(learnProgress AS UNSIGNED) ASC </if> "+
"</script>")
List<StudentTrackingRspDTO> userManageLesson(@Param("param") UserLessonDTO userLessonDTO);
List<StudentTrackingRspDTO> userManageLesson(@Param("param") UserLessonDTO userLessonDTO, @Param("trainTypeSelStr")String trainTypeSelStr);
}
src/main/java/org/rcisoft/business/blesson/dto/StudentTrackingRspDTO.java
View file @ cd546623
......@@ -61,5 +61,8 @@ public class StudentTrackingRspDTO {
@Transient
private String trainIsSign;
@ApiModelProperty(value = "0 未开始 1签到中 2已结束")
private String trainType;
}
src/main/java/org/rcisoft/business/blesson/dto/UserLessonDTO.java
View file @ cd546623
......@@ -24,6 +24,21 @@ public class UserLessonDTO {
@ApiModelProperty(value = "0 未开始 1签到中 2已结束")
private String trainType;
@ApiModelProperty(value = "指派时间排序（0降序 1升序）",required = false)
private String appointDateSort;
@ApiModelProperty(value = "完成时间排序（0降序 1升序）",required = false)
private String finishDateSort;
@ApiModelProperty(value = "报名时间排序（0降序 1升序）",required = false)
private String applyDateSort;
@ApiModelProperty(value = "签到时间排序（0降序 1升序）",required = false)
private String signDateSort;
@ApiModelProperty(value = "学习进度时间排序（0降序 1升序）",required = false)
private String learnProgressSort;
private String corpId;
private String userId;
......
src/main/java/org/rcisoft/business/blesson/service/impl/BLessonServiceImpl.java
View file @ cd546623
......@@ -825,7 +825,9 @@ public class BLessonServiceImpl implements BLessonService {
BLesson bLesson = bLessonRepository.selectInfoById(lessonId,curUser);
if (bLesson != null){
Date now = new Date();
if (now.before( bLesson.getTrainStartDate())){
Long time = Long.parseLong(bLesson.getTrainSignTime()) * 60 * 1000;
Date signStart = new Date(bLesson.getTrainStartDate().getTime() - time);
if (now.before(signStart)){
iLessonCountDTO.setTrainType("0");
}else if ( bLesson.getTrainOverDate().before(now) ){
iLessonCountDTO.setTrainType("2");
......@@ -1272,7 +1274,18 @@ public class BLessonServiceImpl implements BLessonService {
@Override
public List<StudentTrackingRspDTO> userManageLessonByPagination(PageUtil pageUtil, UserLessonDTO userLessonDTO) {
return bLessonPersonRepository.userManageLesson(userLessonDTO);
String trainTypeSelStr = "";
if ("0".equals(userLessonDTO.getTrainType())){
trainTypeSelStr = "and now() < SUBDATE(bl.train_start_date,interval bl.train_sign_time MINUTE)";
}
if ("1".equals(userLessonDTO.getTrainType())){
trainTypeSelStr = "and now() BETWEEN SUBDATE(bl.train_start_date,interval bl.train_sign_time MINUTE) and bl.train_over_date";
}
if ("2".equals(userLessonDTO.getTrainType())){
trainTypeSelStr = "and now() > bl.train_over_date";
}
return bLessonPersonRepository.userManageLesson(userLessonDTO,trainTypeSelStr);
}
//遍历标签放入List中
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment