Commit ae9dbe77 authored by luzhuang's avatar luzhuang

bug修改

parent 12ed22d4
......@@ -465,7 +465,6 @@ public class BLessonController extends PaginationController<BLesson> {
List<String> inDepartPerson = cotactApiRequestClient.getSubUserIdsByDeptIds(appointLessonDTO.getCorpId(),deptSet);
//指派课程
AppointResDTO data = bLessonService.appointLessonToPerson(appointLessonDTO , inDepartPerson);
LessonSyncUtil.removeSynLessonDTO(appointLessonDTO.getLessonId());
//发送通知
......
......@@ -37,7 +37,7 @@ public interface BReleaseValueRepository extends BaseMapper<BReleaseValue> {
"<if test=\"lessonSort!=null and lessonSort != '' and lessonSort == '1'.toString()\"> ,CAST(lesson_value AS UNSIGNED) asc </if> " +
"<if test=\"lessonSort!=null and lessonSort != '' and lessonSort == '0'.toString()\"> ,CAST(lesson_value AS UNSIGNED) desc </if> " +
"<if test=\"trainSort!=null and trainSort != '' and trainSort == '1'.toString()\"> ,CAST(train_value AS UNSIGNED) asc </if> " +
"<if test=\"trainSort!=null and trainSort != '' and trainSort == '0'.toString()\"> ,train_value desc </if> " +
"<if test=\"trainSort!=null and trainSort != '' and trainSort == '0'.toString()\"> ,CAST(train_value AS UNSIGNED) desc </if> " +
"<if test=\"timeSort!=null and timeSort != '' and timeSort == '1'.toString()\"> ,update_date asc </if> " +
"<if test=\"timeSort!=null and timeSort != '' and timeSort == '0'.toString()\"> ,update_date desc </if> " +
"<if test=\"(lessonSort==null or lessonSort=='') and (trainSort==null or trainSort=='') and (timeSort==null or trainSort=='') \"> ,create_date asc </if> " +
......@@ -157,17 +157,17 @@ public interface BReleaseValueRepository extends BaseMapper<BReleaseValue> {
" and business_id in <foreach item='item' index='index' collection='userList' open='(' separator=',' close=')'> #{item} </foreach>" +
"</if>" +
"<if test=\"dto.name!=null and dto.name != ''\"> and name like concat('%',#{dto.name},'%') </if> " +
"<if test=\"dto.nowValueStart!=null and dto.nowValueStart != ''\"> and value &gt;= #{dto.nowValueStart} </if> " +
"<if test=\"dto.nowValueEnd!=null and dto.nowValueEnd != ''\"> and value &lt;= #{dto.nowValueEnd} </if> " +
"<if test=\"dto.nowValueStart!=null and dto.nowValueStart != ''\"> and CAST(`value` AS UNSIGNED) &gt;= #{dto.nowValueStart} </if> " +
"<if test=\"dto.nowValueEnd!=null and dto.nowValueEnd != ''\"> and CAST(`value` AS UNSIGNED) &lt;= #{dto.nowValueEnd} </if> " +
"<if test=\"dto.gainValueStart!=null and dto.gainValueStart != ''\">" +
" and (select sum(value) from b_person_value where person_id = s_user.business_id and type = 0) &gt;= #{dto.gainValueStart} </if> " +
" and IFNULL((select sum(value) from b_person_value where person_id = s_user.business_id and type = 0),0) &gt;= #{dto.gainValueStart} </if> " +
"<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 IFNULL((select sum(value) from b_person_value where person_id = s_user.business_id and type = 0),0) &lt;= #{dto.gainValueEnd} </if> " +
"ORDER BY corp_id " +
"<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 == '0'.toString()\"> ,CAST(`value` AS UNSIGNED) desc </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 == '0'.toString()\"> ,valueGain desc </if> " +
"<if test=\"dto.gainValueSort!=null and dto.gainValueSort != '' and dto.gainValueSort == '1'.toString()\"> ,CAST(`valueGain` AS UNSIGNED) asc </if> " +
"<if test=\"dto.gainValueSort!=null and dto.gainValueSort != '' and dto.gainValueSort == '0'.toString()\"> ,CAST(`valueGain` AS UNSIGNED) desc </if> " +
" </script>")
// @ResultMap(value = "UserValueDtoMap")
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