Merge remote-tracking branch 'origin/meiteng' into zql

src/main/java/org/rcisoft/business/breleasevalue/dao/BReleaseValueRepository.java

@@ -118,6 +118,13 @@ public interface BReleaseValueRepository extends BaseMapper<BReleaseValue> {
             "<if test=\"dto.trainStatus!=null and dto.trainStatus != ''\"> and ( ${dto.trainStatus} )</if> " +
             "and bl.corp_id = #{curUser.corpId}   " +
             "and bl.lesson_type = #{dto.type} " +
+            "ORDER BY bl.corp_id " +
+            "<if test=\"dto.valueConsumeSort!=null and dto.valueConsumeSort != '' and dto.valueConsumeSort == '0'.toString()\"> ,bl.value_consume asc  </if> " +
+            "<if test=\"dto.valueConsumeSort!=null and dto.valueConsumeSort != '' and dto.valueConsumeSort == '1'.toString()\"> ,bl.value_consume desc  </if> " +
+            "<if test=\"dto.valueGainSort!=null and dto.valueGainSort != '' and dto.valueGainSort == '0'.toString()\"> ,bl.value_gain asc  </if> " +
+            "<if test=\"dto.valueGainSort!=null and dto.valueGainSort != '' and dto.valueGainSort == '1'.toString()\"> ,bl.value_gain desc  </if> " +
+            "<if test=\"dto.updateDateSort!=null and dto.updateDateSort != '' and dto.updateDateSort == '0'.toString()\"> ,bl.value_update_date asc  </if> " +
+            "<if test=\"dto.updateDateSort!=null and dto.updateDateSort != '' and dto.updateDateSort == '1'.toString()\"> ,bl.value_update_date desc  </if> " +
             "</script>")
     List<LessonValueDto> getLessonValue(@Param("curUser") CurUser curUser, @Param("dto") LessonValueSettingQueryDto dto);
 

src/main/java/org/rcisoft/business/breleasevalue/dto/LessonValueSettingQueryDto.java

@@ -24,12 +24,21 @@ public class LessonValueSettingQueryDto {
     @ApiModelProperty(value = "积分获得最大值")
     public String valueGainEnd;
 
-    @ApiModelProperty(value = "状态 0未发布 2已发布 4已关闭 (培训已发布后的状态===>)5培训未开始 6培训进行中 7培训已结束 ")
+    @ApiModelProperty(value = "状态 0未发布 2已发布 4已关闭 ")
     public String status;
 
-    @ApiModelProperty(value = "培训状态 0培训未开始 1培训进行中 2培训已结束 ")
+    @ApiModelProperty(value = "培训状态 5培训未开始 6培训进行中 7培训已结束 ")
     public String trainStatus;
 
     @ApiModelProperty(value = "0 课程  1培训")
     public String type;
+
+    @ApiModelProperty(value = "学习积分消耗排序 0正序  1倒序")
+    public String valueConsumeSort;
+
+    @ApiModelProperty(value = "学习积分奖励排序 0正序  1倒序")
+    public String valueGainSort;
+
+    @ApiModelProperty(value = "更新时间排序 0正序  1倒序")
+    public String updateDateSort;
 }

src/main/java/org/rcisoft/business/breleasevalue/service/impl/BReleaseValueServiceImpl.java

@@ -109,11 +109,12 @@ public class BReleaseValueServiceImpl implements BReleaseValueService {
             String[] trainStatus = dto.getTrainStatus().split(",");
             StringBuffer sb = new StringBuffer(" 1 != 1");
             for(String str : trainStatus){
-                if("0".equals(str)){
+                //012改567
+                if("5".equals(str)){
                     sb.append("  or bl.train_start_date > now()");
-                }if("1".equals(str)){
+                }if("6".equals(str)){
                     sb.append(" or now() BETWEEN bl.train_start_date and bl.train_over_date");
-                }if("2".equals(str)){
+                }if("7".equals(str)){
                     sb.append(" or bl.train_over_date < now() ");
                 }
             }