Skip to content

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

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

parents 2dc23b1f c22bebfa
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
src/main/java/org/rcisoft/business/bpersonvalue/dao/BPersonValueRepository.java
View file @ a0c94b55
...@@ -29,10 +29,10 @@ public interface BPersonValueRepository extends BaseMapper<BPersonValue> { ...@@ -29,10 +29,10 @@ public interface BPersonValueRepository extends BaseMapper<BPersonValue> {
"<if test=\"type !=null and type != '' \"> and type = #{type} </if> "+ "<if test=\"type !=null and type != '' \"> and type = #{type} </if> "+
" ORDER BY person_id " + " ORDER BY person_id " +
"<if test=\" valueSort !=null and valueSort != '' and valueSort == '0'.toString() \"> ,type asc,`value` desc </if> "+ "<if test=\" valueSort !=null and valueSort != '' and valueSort == '1'.toString() \"> ,type asc,`value` desc </if> "+
"<if test=\" valueSort !=null and valueSort != '' and valueSort == '1'.toString() \"> ,type desc,`value` asc </if> "+ "<if test=\" valueSort !=null and valueSort != '' and valueSort == '0'.toString() \"> ,type desc,`value` desc </if> "+
"<if test=\" dateSort !=null and dateSort != '' and dateSort == '0'.toString() \"> ,create_date asc</if> "+ "<if test=\" dateSort !=null and dateSort != '' and dateSort == '1'.toString() \"> ,create_date asc</if> "+
"<if test=\" dateSort !=null and dateSort != '' and dateSort == '1'.toString() \"> ,create_date desc</if> "+ "<if test=\" dateSort !=null and dateSort != '' and dateSort == '0'.toString() \"> ,create_date desc</if> "+
"</script>") "</script>")
@ResultMap(value = "BaseResultMap" ) @ResultMap(value = "BaseResultMap" )
List<BPersonValue> queryBPersonValues(PersonValueClientDto dto); List<BPersonValue> queryBPersonValues(PersonValueClientDto dto);
......
src/main/java/org/rcisoft/business/breleasevalue/dao/BReleaseValueRepository.java
View file @ a0c94b55
...@@ -32,12 +32,12 @@ public interface BReleaseValueRepository extends BaseMapper<BReleaseValue> { ...@@ -32,12 +32,12 @@ public interface BReleaseValueRepository extends BaseMapper<BReleaseValue> {
"<if test=\"trainValueStart!=null and trainValueStart != ''\"> and train_value &gt;= #{trainValueStart} </if> " + "<if test=\"trainValueStart!=null and trainValueStart != ''\"> and train_value &gt;= #{trainValueStart} </if> " +
"<if test=\"trainValueEnd!=null and trainValueEnd != ''\"> and train_value &lt;= #{trainValueEnd} </if> " + "<if test=\"trainValueEnd!=null and trainValueEnd != ''\"> and train_value &lt;= #{trainValueEnd} </if> " +
" ORDER BY corp_id " + " ORDER BY corp_id " +
"<if test=\"lessonSort!=null and lessonSort != '' and lessonSort == '0'.toString()\"> ,lesson_value asc </if> " + "<if test=\"lessonSort!=null and lessonSort != '' and lessonSort == '1'.toString()\"> ,lesson_value asc </if> " +
"<if test=\"lessonSort!=null and lessonSort != '' and lessonSort == '1'.toString()\"> ,lesson_value desc </if> " + "<if test=\"lessonSort!=null and lessonSort != '' and lessonSort == '0'.toString()\"> ,lesson_value desc </if> " +
"<if test=\"trainSort!=null and trainSort != '' and trainSort == '0'.toString()\"> ,train_value asc </if> " + "<if test=\"trainSort!=null and trainSort != '' and trainSort == '1'.toString()\"> ,train_value asc </if> " +
"<if test=\"trainSort!=null and trainSort != '' and trainSort == '1'.toString()\"> ,train_value desc </if> " + "<if test=\"trainSort!=null and trainSort != '' and trainSort == '0'.toString()\"> ,train_value desc </if> " +
"<if test=\"timeSort!=null and timeSort != '' and timeSort == '0'.toString()\"> ,update_date asc </if> " + "<if test=\"timeSort!=null and timeSort != '' and timeSort == '1'.toString()\"> ,update_date asc </if> " +
"<if test=\"timeSort!=null and timeSort != '' and timeSort == '1'.toString()\"> ,update_date desc </if> " + "<if test=\"timeSort!=null and timeSort != '' and timeSort == '0'.toString()\"> ,update_date desc </if> " +
"</script>") "</script>")
@ResultMap(value = "BaseResultMap" ) @ResultMap(value = "BaseResultMap" )
List<BReleaseValue> queryBReleaseValues(ReleaseValueResDto dto); List<BReleaseValue> queryBReleaseValues(ReleaseValueResDto dto);
...@@ -119,12 +119,12 @@ public interface BReleaseValueRepository extends BaseMapper<BReleaseValue> { ...@@ -119,12 +119,12 @@ public interface BReleaseValueRepository extends BaseMapper<BReleaseValue> {
"and bl.corp_id = #{curUser.corpId} " + "and bl.corp_id = #{curUser.corpId} " +
"and bl.lesson_type = #{dto.type} " + "and bl.lesson_type = #{dto.type} " +
"ORDER BY bl.corp_id " + "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 asc </if> " +
"<if test=\"dto.valueConsumeSort!=null and dto.valueConsumeSort != '' and dto.valueConsumeSort == '1'.toString()\"> ,bl.value_consume desc </if> " + "<if test=\"dto.valueConsumeSort!=null and dto.valueConsumeSort != '' and dto.valueConsumeSort == '0'.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 asc </if> " +
"<if test=\"dto.valueGainSort!=null and dto.valueGainSort != '' and dto.valueGainSort == '1'.toString()\"> ,bl.value_gain desc </if> " + "<if test=\"dto.valueGainSort!=null and dto.valueGainSort != '' and dto.valueGainSort == '0'.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 asc </if> " +
"<if test=\"dto.updateDateSort!=null and dto.updateDateSort != '' and dto.updateDateSort == '1'.toString()\"> ,bl.value_update_date desc </if> " + "<if test=\"dto.updateDateSort!=null and dto.updateDateSort != '' and dto.updateDateSort == '0'.toString()\"> ,bl.value_update_date desc </if> " +
"</script>") "</script>")
List<LessonValueDto> getLessonValue(@Param("curUser") CurUser curUser, @Param("dto") LessonValueSettingQueryDto dto); List<LessonValueDto> getLessonValue(@Param("curUser") CurUser curUser, @Param("dto") LessonValueSettingQueryDto dto);
...@@ -160,10 +160,10 @@ public interface BReleaseValueRepository extends BaseMapper<BReleaseValue> { ...@@ -160,10 +160,10 @@ public interface BReleaseValueRepository extends BaseMapper<BReleaseValue> {
"<if test=\"dto.gainValueEnd!=null and dto.gainValueEnd != ''\"> " + "<if test=\"dto.gainValueEnd!=null and dto.gainValueEnd != ''\"> " +
" and (select sum(value) from b_person_value where person_id = s_user.business_id and type = 0) &lt;= #{dto.gainValueEnd} </if> " + " and (select sum(value) from b_person_value where person_id = s_user.business_id and type = 0) &lt;= #{dto.gainValueEnd} </if> " +
"ORDER BY corp_id " + "ORDER BY corp_id " +
"<if test=\"dto.nowValueSort!=null and dto.nowValueSort != '' and dto.nowValueSort == '0'.toString()\"> ,CAST(`value` AS UNSIGNED) asc </if> " + "<if test=\"dto.nowValueSort!=null and dto.nowValueSort != '' and dto.nowValueSort == '1'.toString()\"> ,CAST(`value` AS UNSIGNED) asc </if> " +
"<if test=\"dto.nowValueSort!=null and dto.nowValueSort != '' and dto.nowValueSort == '1'.toString()\"> ,CAST(`value` AS UNSIGNED) desc </if> " + "<if test=\"dto.nowValueSort!=null and dto.nowValueSort != '' and dto.nowValueSort == '0'.toString()\"> ,CAST(`value` AS UNSIGNED) desc </if> " +
"<if test=\"dto.gainValueSort!=null and dto.gainValueSort != '' and dto.gainValueSort == '0'.toString()\"> ,valueGain asc </if> " + "<if test=\"dto.gainValueSort!=null and dto.gainValueSort != '' and dto.gainValueSort == '1'.toString()\"> ,valueGain asc </if> " +
"<if test=\"dto.gainValueSort!=null and dto.gainValueSort != '' and dto.gainValueSort == '1'.toString()\"> ,valueGain desc </if> " + "<if test=\"dto.gainValueSort!=null and dto.gainValueSort != '' and dto.gainValueSort == '0'.toString()\"> ,valueGain desc </if> " +
" </script>") " </script>")
// @ResultMap(value = "UserValueDtoMap") // @ResultMap(value = "UserValueDtoMap")
List<UserValueDto> getUserValue(@Param("dto") UserValueResDto dto, @Param("userList")List<String> userList); List<UserValueDto> getUserValue(@Param("dto") UserValueResDto dto, @Param("userList")List<String> userList);
......
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