修改课程情况插叙筛选条件

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

@@ -380,6 +380,18 @@ 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 CAST(blp.learn_progress AS UNSIGNED) &gt;= #{param.learnProgressMin} </if> " +
+            "<if test= \" param.lessonType != null and param.lessonType != ''\">and CAST(blp.learn_progress AS UNSIGNED) &lt;= #{param.learnProgressMax} </if> " +
+            "<if test= \" param.appointStartDate != null \">and ba.update_date &gt;= #{param.appointStartDate} </if> " +
+            "<if test= \" param.appointEndDate != null \">and ba.update_date &lt;= #{param.appointEndDate} </if> " +
+            "<if test= \" param.finishStartDate != null \">and blp.finish_date &gt;= #{param.finishStartDate} </if> " +
+            "<if test= \" param.finishEndDate != null \">and blp.finish_date &lt;= #{param.finishEndDate} </if> " +
+            "<if test= \" param.applyStartDate != null \">and blp.apply_date &gt;= #{param.applyStartDate} </if> " +
+            "<if test= \" param.applyEndDate != null \">and blp.apply_date &lt;= #{param.applyEndDate} </if> " +
+            "<if test= \" param.signStartDate != null \">and blp.sign_date &gt;= #{param.signStartDate} </if> " +
+            "<if test= \" param.signEndDate != null \">and blp.sign_date &lt;= #{param.signEndDate} </if> " +
+
             "<if test= \" trainTypeSelStr != null and trainTypeSelStr != ''\">${trainTypeSelStr} </if> " +
 
             "<if test= \" param.appointDateSort !=null and param.appointDateSort !='' and param.appointDateSort =='0'.toString()\">  ORDER BY appointDate DESC  </if> "+

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

@@ -1090,7 +1090,9 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
     /**
      * 分页查询我收藏
      */
-    @Select("<script>select bl.*,su.name lecturerName, suc.name createByName from b_lesson bl " +
+    @Select("<script>select bl.*,su.name lecturerName, suc.name createByName," +
+            "  if(bl.lecturer_id = #{curUser.userId}, '1', '0') userIsLecturer " +
+            " from b_lesson bl " +
             "left join b_collect bc on bl.business_id = bc.lesson_id " +
             "left join s_user su on bl.lecturer_id = su.business_id " +
             "left join s_user suc on bl.create_by = suc.business_id " +

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

@@ -2,6 +2,9 @@ package org.rcisoft.business.blesson.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 @Data
 public class UserLessonDTO {
@@ -24,6 +27,45 @@ public class UserLessonDTO {
     @ApiModelProperty(value = "0 未开始 1签到中(进行中) 2已结束")
     private String trainType;
 
+    @ApiModelProperty(value = "学习进度最小值")
+    private String learnProgressMin;
+
+    @ApiModelProperty(value = "学习进度最大值")
+    private String learnProgressMax;
+
+    @ApiModelProperty(value = "指派开始时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date appointStartDate;
+
+    @ApiModelProperty(value = "指派结束时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date appointEndDate;
+
+    @ApiModelProperty(value = "完成开始时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date finishStartDate;
+
+    @ApiModelProperty(value = "完成结束时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date finishEndDate;
+
+    @ApiModelProperty(value = "报名筛选开始时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date applyStartDate;
+
+    @ApiModelProperty(value = "报名筛选结束时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date applyEndDate;
+
+    @ApiModelProperty(value = "签到筛选开始时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date signStartDate;
+
+    @ApiModelProperty(value = "签到筛选结束时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date signEndDate;
+
+
     @ApiModelProperty(value = "指派时间排序（0降序 1升序）",required = false)
     private String appointDateSort;
 

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

@@ -245,6 +245,10 @@ public class BLesson extends IdEntity<BLesson> {
     @Transient
     private String lecturerDeptName;
 
+    @ApiModelProperty(value = "登录人是否为讲师0 不是 1 是")
+    private String userIsLecturer;
+
+
     public void initModel(){
 //        this.setDefaultUrl(global.getDEFAULT_COURSE_LOCATION());
         UserUtil.setCurrentPersistOperation(this);

src/main/java/org/rcisoft/business/bpersonvalue/controller/BPersonValueController.java

@@ -44,7 +44,7 @@ public class BPersonValueController extends PaginationController<BPersonValue> {
     private BPersonValueService bPersonValueServiceImpl;
 
 
-    @ApiOperation(value = "1601 明细", notes = " type类型（0：获取积分 +，1：消耗积分 -）", response = BBanner.class)
+    @ApiOperation(value = "1601 明细", notes = " type类型（0：获取积分 +，1：消耗积分 -）", response = BPersonValue.class)
     @GetMapping(value = "/queryByPagination")
     @ApiImplicitParam(name = "businessId", value = "用户id", required = true, dataType = "varchar")
     public Result queryByPagination(CurUser curUser,String businessId) {
@@ -56,7 +56,7 @@ public class BPersonValueController extends PaginationController<BPersonValue> {
                 gridModel);
     }
 
-    @ApiOperation(value = "1602 添加记录", notes = " 添加记录", response = BBanner.class)
+    @ApiOperation(value = "1602 添加记录", notes = " 添加记录")
     @GetMapping(value = "/add")
     public Result add (CurUser curUser, @Valid PersonValueDto personValueDto,BindingResult bindingResult) {
         int line = bPersonValueServiceImpl.add(personValueDto,curUser.getCorpId());
@@ -66,7 +66,7 @@ public class BPersonValueController extends PaginationController<BPersonValue> {
                 personValueDto);
     }
 
-    @ApiOperation(value = "1603 用户明细带总积分", notes = " 用户明细带总积分", response = BBanner.class)
+    @ApiOperation(value = "1603 用户明细带总积分", notes = " 用户明细带总积分", response = BPersonValue.class)
     @GetMapping(value = "/queryPersonValueByPagination")
     @ApiImplicitParam(name = "businessId", value = "用户id", required = true, dataType = "varchar")
     public Result queryPersonValueByPagination(CurUser curUser,String businessId) {