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

src/main/java/org/rcisoft/business/bchapter/service/impl/BChapterServiceImpl.java

@@ -541,8 +541,8 @@ public class BChapterServiceImpl implements BChapterService {
 //            throw new ServiceException(ResultServiceEnums.PARAM_NOT_NULL);
         }
         String name = bFile.getVideoUrl().substring(bFile.getVideoUrl().lastIndexOf("/") + 1);
-        String filePath = global.getBASE_UPLOAD_SERVER_LOCATION() + global.getCOURSE_LOCATION() + File.separator + bFile.getLessonId();
-        String returnBasePath = global.getRETURN_UPLOAD_SERVER_LOCATION() + global.getCOURSE_LOCATION() + File.separator + bFile.getLessonId();
+        String filePath = global.getBASE_UPLOAD_SERVER_LOCATION() + global.getUSER_DOWNLOAD() + File.separator + bFile.getCorpId() + File.separator + bFile.getUserId();
+        String returnBasePath = global.getRETURN_UPLOAD_SERVER_LOCATION() + global.getUSER_DOWNLOAD() + File.separator + bFile.getCorpId() + File.separator + bFile.getUserId();
         File file = new File(filePath);
         File fileOld = new File(filePath + File.separator + name);
         if (fileOld.exists()) {

src/main/java/org/rcisoft/business/bexternallink/controller/BExternalLinkController.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.ibatis.annotations.Param;
+import org.rcisoft.business.bbanner.entity.BBanner;
 import org.rcisoft.business.bexternallink.dto.AddOrUpdateDTO;
 import org.rcisoft.business.bexternallink.dto.FindListDTO;
 import org.rcisoft.common.controller.PaginationController;
@@ -65,7 +66,7 @@ public class BExternalLinkController extends PaginationController<BExternalLink>
                 businessId);
     }
 
-    @ApiOperation(value = "1403 查单一查询", notes = "查单一查询")
+    @ApiOperation(value = "1403 查单一查询", notes = "查单一查询", response = BExternalLink.class)
     @GetMapping("/detail")
     public Result detail(CurUser curUser, @Valid String businessId, BindingResult bindingResult) {
         return Result.builder(new PersistModel(1),
@@ -74,7 +75,7 @@ public class BExternalLinkController extends PaginationController<BExternalLink>
                 bExternalLinkServiceImpl.findById(businessId));
     }
 
-    @ApiOperation(value = "1404 分页查询外链", notes = "分页查询外链")
+    @ApiOperation(value = "1404 分页查询外链", notes = "分页查询外链", response = BExternalLink.class)
     @GetMapping(value = "/queryBExternalLinkByPagination")
     public Result listByPagination(CurUser curUser, @Valid FindListDTO findListDTO, BindingResult bindingResult) {
         bExternalLinkServiceImpl.findAllByPagination(getPaginationUtility(), findListDTO);

src/main/java/org/rcisoft/business/bexternallink/entity/BExternalLink.java

 package org.rcisoft.business.bexternallink.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
+import org.hibernate.validator.constraints.Length;
 import org.rcisoft.core.entity.IdEntity;
 import javax.persistence.*;
+import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.io.Serializable;
@@ -20,14 +23,27 @@ import java.util.List;
 @Table(name = "b_external_link")
 public class BExternalLink  extends IdEntity<BExternalLink> {
 
+    private static final long serialVersionUID = 2429179519651646832L;
+
+    @Length(min = 1,max = 64,message = "长度最小为1,最大为64")
+    @NotBlank
+    @ApiModelProperty(value = "标题")
      private String title;
 
+    @Length(min = 1,max = 64,message = "长度最小为1,最大为64")
+    @ApiModelProperty(value = "图标")
      private String logo;
 
+    @Length(min = 1,max = 64,message = "长度最小为1,最大为64")
+    @ApiModelProperty(value = "外部URL")
      private String externalUrl;
 
+    @Length(min = 1,max = 64,message = "长度最小为1,最大为64")
+    @ApiModelProperty(value = "类型（0：手机，1：跨平台,2: PC）")
      private String type;
 
+    @Length(min = 1,max = 64,message = "长度最小为1,最大为64")
+    @ApiModelProperty(value = "排序")
      private Integer sort;
 
      private String corpId;
@@ -36,6 +52,5 @@ public class BExternalLink  extends IdEntity<BExternalLink> {
           this.businessId = businessId;
      }
 
-
 }
 

src/main/java/org/rcisoft/business/bfile/entity/BFile.java

@@ -61,5 +61,9 @@ public class BFile extends IdEntity<BFile> {
     @ApiModelProperty(value = "文件时长")
     private String fileTime;
 
+    private String userId;
+
+    private String corpId;
+
 }
 

src/main/java/org/rcisoft/business/blesson/controller/BLessonController.java

@@ -544,6 +544,11 @@ public class BLessonController extends PaginationController<BLesson> {
                 bLessonService.trainPersons(param));
     }
 
+    /**
+     * @param
+     * @return
+     * @author: zhangqingle
+     */
     @ApiOperation(value = "631 报名培训", notes = "报名培训")
     @ApiImplicitParam(name = "lessonId", value = "培训课id", required = true, dataType = "varchar")
     @GetMapping(value = "/toTraining")
@@ -554,6 +559,11 @@ public class BLessonController extends PaginationController<BLesson> {
                 lessonId);
     }
 
+    /**
+     * @param
+     * @return
+     * @author: zhangqingle
+     */
     @ApiOperation(value = "632 单一查询我参加培训的信息", notes = "单一查询我参加培训的信息", response = BLesson.class)
     @ApiImplicitParam(name = "businessId", value = "培训课id", required = true, dataType = "varchar")
     @GetMapping(value = "/findOneMyTrain")
@@ -563,8 +573,13 @@ public class BLessonController extends PaginationController<BLesson> {
                 MessageConstant.MESSAGE_ALERT_ERROR,
                 bLessonService.findOneMyTrain(curUser, lessonId));
     }
- 
 
+
+    /**
+     * @param
+     * @return
+     * @author: zhangqingle
+     */
     @ApiOperation(value = "633 单一查询我主讲培训的信息", notes = "单一查询我主讲培训的信息", response = BLesson.class)
     @ApiImplicitParam(name = "lessonId", value = "培训课id", required = true, dataType = "varchar")
     @GetMapping(value = "/findOneMyTeachTrain")
@@ -576,6 +591,11 @@ public class BLessonController extends PaginationController<BLesson> {
     }
 
 
+    /**
+     * @param
+     * @return
+     * @author: zhangqingle
+     */
     @ApiOperation(value="634 查询指派人员", notes="查询指派人员",response = SysUser.class)
     @ApiImplicitParam(name = "lessonId", value = "培训/课程id", required = true, dataType = "varchar")
     @GetMapping(value = "/findAppointPerson")
@@ -586,6 +606,11 @@ public class BLessonController extends PaginationController<BLesson> {
                 bLessonService.findAppointPerson(curUser,lessonId));
     }
 
+    /**
+     * @param
+     * @return
+     * @author: zhangqingle
+     */
     @ApiOperation(value = "635 收藏课程或培训", notes = "收藏课程或培训")
     @ApiImplicitParam(name = "lessonId", value = "培训/课程id", required = true, dataType = "varchar")
     @GetMapping(value = "/collectLesson")
@@ -596,6 +621,11 @@ public class BLessonController extends PaginationController<BLesson> {
                 curUser.getUserId());
     }
 
+    /**
+     * @param
+     * @return
+     * @author: zhangqingle
+     */
     @ApiOperation(value = "636 取消收藏课程或培训", notes = "取消收藏课程或培训")
     @ApiImplicitParam(name = "lessonId", value = "培训/课程id", required = true, dataType = "varchar")
     @GetMapping(value = "/notCollectLesson")
@@ -625,6 +655,11 @@ public class BLessonController extends PaginationController<BLesson> {
                 gridModel);
     }
 
+    /**
+     * @param
+     * @return
+     * @author: zhangqingle
+     */
     @ApiOperation(value = "638 获取课程或培训的删除(关闭)状态", notes = "获取课程或培训的删除(关闭)状态")
     @ApiImplicitParam(name = "lessonId", value = "培训/课程id", required = true, dataType = "varchar")
     @GetMapping(value = "/getLessonState")
@@ -636,6 +671,11 @@ public class BLessonController extends PaginationController<BLesson> {
     }
 
 
+    /**
+     * @param
+     * @return
+     * @author: zhangqingle
+     */
     @ApiOperation(value = "639 判断可见权限 ", notes = "判断可见权限 ")
     @PostMapping(value = "/judgeVisibleAuthority")
     public Result judgeVisibleAuthority(CurUser curUser, @Valid String lessonId, BindingResult bindingResult) {
@@ -646,4 +686,20 @@ public class BLessonController extends PaginationController<BLesson> {
                 data);
     }
 
+    /**
+     * @param
+     * @return
+     * @author: zhangqingle
+     */
+    @ApiOperation(value = "640 用户管理 - 课程情况 ", notes = "用户管理 - 课程情况 ")
+    @GetMapping(value = "/userManageLessonByPagination")
+    public Result userManageLessonByPagination(CurUser curUser, @Valid UserLessonDTO userLessonDTO, BindingResult bindingResult) {
+        bLessonService.userManageLessonByPagination(getPaginationUtility(), userLessonDTO);
+        GridModel gridModel = getGridModelResponse();
+        return Result.builder(new PersistModel(1),
+                MessageConstant.MESSAGE_ALERT_SUCCESS,
+                MessageConstant.MESSAGE_ALERT_ERROR,
+                gridModel);
+    }
+
 }

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

@@ -344,6 +344,47 @@ public interface BLessonPersonRepository extends BaseMapper<BLessonPerson> {
             "and train_is_sign != 2 ",
             "</script>"})
     int updateByLessonIds(@Param("lessonIds") List<String> lessonIds);
+
+
+    // 用户管理 - 课程情况
+    @Select("<script> select blp.business_id businessId," +
+            "  bl.lesson_name LessonTitle ,  " +
+            "  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, "+
+            "  if(blp.is_appoint = 0, blp.apply_date, ba.update_date) appointDate, " +
+            "  blp.finish_date finishDate , " +
+            "  blp.apply_date applyDate , " +
+            "  blp.sign_date signDate , " +
+            "  blp.train_is_sign trainIsSign " +
+            "from b_lesson_person blp left join b_lesson bl on blp.lesson_id = bl.business_id " +
+            "left join s_user su on blp.person_id = su.business_id " +
+            "left join b_appoint ba on ba.business_id = blp.appoint_id " +
+            "and ba.del_flag != 1 and ba.flag = 1 " +
+            "where blp.del_flag != 1 and blp.flag = 1 " +
+            "and bl.del_flag != 1 and bl.flag = 1 " +
+
+            "and bl.corp_id = #{param.corpId} "+
+
+            "and blp.person_id = #{param.userId} "+
+            "<if test= \" param.isAppoint != null and param.isAppoint != ''\">and blp.is_appoint = #{param.isAppoint} </if> " +
+            "<if test=\" param.lessonTitle !=null and param.lessonTitle != ''\">and bl.lesson_name like CONCAT('%',#{param.lessonTitle},'%')</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.lessonType != null and param.lessonType != ''\">and bl.lesson_type = #{param.lessonType} </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> "+
+            "</script>")
+    List<StudentTrackingRspDTO> userManageLesson(@Param("param") UserLessonDTO userLessonDTO);
     
 
 }

src/main/java/org/rcisoft/business/blesson/dto/StudentTrackingRspDTO.java

@@ -26,6 +26,9 @@ public class StudentTrackingRspDTO {
     @ApiModelProperty(value = "部门名称")
     private String departName;
 
+    @ApiModelProperty(value = "课时")
+    private String classHour;
+
     @ApiModelProperty(value = "课程来源（是否为指派，0自选（选修） 1指派（必修））")
     private String isAppoint;
 

src/main/java/org/rcisoft/business/blesson/dto/UserLessonDTO.java

+package org.rcisoft.business.blesson.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class UserLessonDTO {
+
+    @ApiModelProperty(value = "课程标题")
+    private String lessonTitle;
+
+    @ApiModelProperty(value = "课程类型（0：课程 1：培训）")
+    private String lessonType;
+
+    @ApiModelProperty(value = "学习来源（0非必修（自选） 1必修（指派））")
+    private String isAppoint;
+
+    @ApiModelProperty(value = "学习状态（0：未开始 1：已开始 2： 已学完）")
+    private String isFinish;
+
+    @ApiModelProperty(value = "培训状态（0 待参加 1 缺勤 2 签到 ）")
+    private String trainIsSign;
+
+    @ApiModelProperty(value = "0 未开始 1签到中 2已结束")
+    private String trainType;
+
+    private String corpId;
+
+    private String userId;
+
+}

src/main/java/org/rcisoft/business/blesson/service/BLessonService.java

@@ -283,7 +283,20 @@ public interface BLessonService{
      */
     List<BLesson> queryCollectByPagination(PageUtil pageUtil, String lessonType , CurUser curUser);
 
-
+    /**
+     * 判断可见权限
+     * @param curUser
+     * @param lessonId
+     * @return
+     */
     Map<String,Object> judgeVisibleAuthority(CurUser curUser, String lessonId);
 
+    /**
+     * 用户管理-课程情况
+     * @param pageUtil
+     * @param userLessonDTO
+     * @return
+     */
+    List<StudentTrackingRspDTO>  userManageLessonByPagination(PageUtil pageUtil, UserLessonDTO userLessonDTO);
+
 }

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

@@ -163,20 +163,20 @@ public class BLessonPersonServiceImpl implements BLessonPersonService {
         //查询是否在学习
         String isFinish = bLessonPersonRepository.selectIsFinish(cancelAppointDTO);
         int result = 0;
-//        if ("0".equals(isFinish)){
-//            //未开始执行删除
-//            BLessonPerson bLessonPerson = new BLessonPerson();
-//            bLessonPerson.setBusinessId(cancelAppointDTO.getBusinessId());
-//            result = bLessonPersonRepository.logicalDelete(bLessonPerson);
-//        }else if ("1".equals(isFinish) || "2".equals(isFinish)){
+        if ("0".equals(isFinish)){
+            //未开始执行删除
+            BLessonPerson bLessonPerson = new BLessonPerson();
+            bLessonPerson.setBusinessId(cancelAppointDTO.getBusinessId());
+            result = bLessonPersonRepository.logicalDelete(bLessonPerson);
+        }else if ("1".equals(isFinish) || "2".equals(isFinish)){
             //已开始执行更新
-        BLessonPerson bLessonPerson = new BLessonPerson();
-        bLessonPerson.setBusinessId(cancelAppointDTO.getBusinessId());
-        UserUtil.setCurrentMergeOperation(bLessonPerson);
-        bLessonPerson.setIsAppoint("0");
-        bLessonPerson.setAppointId("");
-        result = bLessonPersonRepository.updateByPrimaryKeySelective(bLessonPerson);
-//        }
+            BLessonPerson bLessonPerson = new BLessonPerson();
+            bLessonPerson.setBusinessId(cancelAppointDTO.getBusinessId());
+            UserUtil.setCurrentMergeOperation(bLessonPerson);
+            bLessonPerson.setIsAppoint("0");
+            bLessonPerson.setAppointId("");
+            result = bLessonPersonRepository.updateByPrimaryKeySelective(bLessonPerson);
+        }
         //没有指派人员 删除指派表
         if (StringUtils.isEmpty(designatedIdRes)){
             bAppointRepository.deleteByPrimaryKey(bAppoint);

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

@@ -706,8 +706,8 @@ public class BLessonServiceImpl implements BLessonService {
             bAppoint.setDesignatedId(userAllString);
             UserUtil.setCurrentMergeOperation(bAppoint);
             bAppointRepository.updateByPrimaryKeySelective(bAppoint);
-//            //删除指派未开始
-//            bLessonPersonRepository.deleteNotStartByLessonId(appointLessonDTO);
+            //删除指派未开始
+            bLessonPersonRepository.deleteNotStartByLessonId(appointLessonDTO);
             //指派更新为不指派
             BLessonPerson bLessonPerson = new BLessonPerson();
             bLessonPerson.setIsAppoint("0");
@@ -1270,6 +1270,11 @@ public class BLessonServiceImpl implements BLessonService {
         return resMap;
     }
 
+    @Override
+    public List<StudentTrackingRspDTO> userManageLessonByPagination(PageUtil pageUtil, UserLessonDTO userLessonDTO) {
+        return bLessonPersonRepository.userManageLesson(userLessonDTO);
+    }
+
     //遍历标签放入List中
     List<BLessonLabel> addLabel(BLesson model) {
         //标签集合

src/main/java/org/rcisoft/common/component/Global.java

@@ -41,6 +41,10 @@ public class Global {
     @Value("${global.path.course_location}")
     private String COURSE_LOCATION;
 
+    /*课程相关文件路径*/
+    @Value("${global.path.user_download}")
+    private String USER_DOWNLOAD;
+
     /*lesson相关文件路径*/
     @Value("${global.path.lesson_location}")
     private String LESSON_LOCATION;

src/main/resources/application-dev.yml

@@ -74,6 +74,7 @@ global:
     return_upload_server_location: http://192.168.5.201:18080/eduServer/
     course_location: course
     lesson_location: lesson
+    user_download: userDownload
     sl_location: sl
     image_location: /upload
     video_location: video

src/main/resources/application-mt.yml

@@ -78,6 +78,7 @@ global:
     return_upload_server_location: http://192.168.5.201:18080/eduServer/
     course_location: course
     lesson_location: lesson
+    user_download: userDownload
     sl_location: sl
     image_location: /upload
     video_location: video

src/main/resources/application-prod.yml

@@ -71,6 +71,7 @@ global:
     return_upload_server_location: http://192.168.5.201:18080/eduServer/
     course_location: course
     lesson_location: lesson
+    user_download: userDownload
     sl_location: sl
     image_location: /upload
     video_location: video