培训积分筛选

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

@@ -117,8 +117,8 @@ public interface BReleaseValueRepository extends BaseMapper<BReleaseValue> {
             "<if test=\"dto.valueGainEnd!=null and dto.valueGainEnd != ''\"> and CAST(bl.value_gain AS UNSIGNED) &lt;= #{dto.valueGainEnd}  </if> " +
             "<if test=\"dto.lessonName!=null and dto.lessonName != ''\"> and bl.lesson_name like concat('%',#{dto.lessonName},'%')  </if> " +
             "<if test=\"dto.lecturerName!=null and dto.lecturerName != ''\"> and su.`name` like concat('%',#{dto.lecturerName},'%')  </if> " +
-            "<if test=\"dto.status!=null and dto.status != ''\"> and bl.release_state in(${dto.status}) </if> " +
-            "<if test=\"dto.trainStatus!=null and dto.trainStatus != ''\"> and ( ${dto.trainStatus} )</if> " +
+//            "<if test=\"dto.status!=null and dto.status != ''\"> and bl.release_state in(${dto.status}) </if> " +
+            "<if test=\"dto.trainStatus!=null and dto.trainStatus != ''\"> ${dto.trainStatus} </if> " +
             "and bl.corp_id = #{curUser.corpId}   " +
             "and bl.lesson_type = #{dto.type} " +
             "ORDER BY bl.corp_id " +

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

@@ -166,6 +166,16 @@ public class BReleaseValueServiceImpl implements BReleaseValueService {
             dto.setTrainStatus(null);
         }
 
+        if(StringUtils.isEmpty(dto.getStatus())&&StringUtils.isEmpty(dto.getTrainStatus())){
+            dto.setTrainStatus(null);
+        }else if(StringUtils.isEmpty(dto.getStatus())&&StringUtils.isNotEmpty(dto.getTrainStatus())){
+            dto.setTrainStatus("and ("+dto.getTrainStatus()+")");
+        }else if(StringUtils.isNotEmpty(dto.getStatus())&&StringUtils.isEmpty(dto.getTrainStatus())){
+            dto.setTrainStatus("and bl.release_state in("+dto.getStatus()+")");
+        }else if(StringUtils.isNotEmpty(dto.getStatus())&&StringUtils.isNotEmpty(dto.getTrainStatus())){
+            dto.setTrainStatus("and (bl.release_state in("+dto.getStatus()+") or ("+dto.getTrainStatus()+ "))");
+        }
+
 
         List<LessonValueDto> list = bReleaseValueRepository.getLessonValue(curUser,dto);
         for(LessonValueDto valueDto :list){