瀏覽代碼

Merge branch 'vip_price_827' of http://git.dayaedu.com/yonge/mec into vip_price_827

yonge 4 年之前
父節點
當前提交
50f17d6b01

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupQuitDao.java

@@ -5,6 +5,8 @@ import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public interface MusicGroupQuitDao extends BaseDAO<Long, MusicGroupQuit> {
 
@@ -40,4 +42,12 @@ public interface MusicGroupQuitDao extends BaseDAO<Long, MusicGroupQuit> {
      * @return
      */
     MusicGroupQuit queryByUserIdAndMusicGroupId(@Param("userId") Integer userId, @Param("musicGroupId") String musicGroupId);
+
+    /**
+     * 学员是否有待审核的退团记录
+     * @param studentIds
+     * @param musicGroupId
+     * @return
+     */
+    List<Map<Integer, Long>> queryQuitMapByStudentId(@Param("studentIds") Set<Long> studentIds, @Param("musicGroupId") String musicGroupId);
 }

+ 11 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentAttendanceViewDto.java

@@ -50,6 +50,17 @@ public class StudentAttendanceViewDto {
 
     private Boolean beMerged;
 
+    @ApiModelProperty(value = "是否有待审核的退团申请",required = false)
+    private Integer quitFlag;
+
+    public Integer getQuitFlag() {
+        return quitFlag;
+    }
+
+    public void setQuitFlag(Integer quitFlag) {
+        this.quitFlag = quitFlag;
+    }
+
     public Integer getCurrentGradeNum() {
         return currentGradeNum;
     }

+ 7 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -152,6 +152,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Autowired
     private EmployeeDao employeeDao;
     @Autowired
+    private MusicGroupQuitDao musicGroupQuitDao;
+    @Autowired
     private MusicGroupSchoolTermStudentCourseDetailDao musicGroupSchoolTermStudentCourseDetailDao;
     @Autowired
     private MusicGroupSchoolTermCourseDetailDao musicGroupSchoolTermCourseDetailDao;
@@ -1773,8 +1775,13 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             if (schedule.getGroupType() == MUSIC) {
                 Set<Long> collect = truantStudent.stream().map(e -> e.getStudentId()).collect(Collectors.toSet());
                 Map<Integer, String> paymentStatusMap = MapUtil.convertIntegerMap(musicGroupPaymentCalenderDao.queryUserCoursePaymentStatus(collect, schedule.getMusicGroupId()));
+
+                Map<Integer, Long> quitMap = MapUtil.convertIntegerMap(musicGroupQuitDao.queryQuitMapByStudentId(collect,schedule.getMusicGroupId()));
+                //学员是否有待审核的退团申请
                 truantStudent.forEach(studentAttendanceViewDto -> {
                     studentAttendanceViewDto.setPaymentStatus(paymentStatusMap.get(studentAttendanceViewDto.getStudentId().intValue()));
+                    Long aLong = quitMap.get(studentAttendanceViewDto.getStudentId().intValue());
+                    studentAttendanceViewDto.setQuitFlag(aLong==null?0:aLong.intValue());
                 });
             }
             List<StudentAttendanceViewDto> tempIds = truantStudent.stream()

+ 9 - 0
mec-biz/src/main/resources/config/mybatis/MusicGroupQuitMapper.xml

@@ -181,4 +181,13 @@
     <select id="queryByUserIdAndMusicGroupId" resultMap="MusicGroupQuit">
         select * from music_group_quit where id_ in (select max(id_) from music_group_quit where music_group_id_ = #{musicGroupId} AND user_id_ = #{userId})
     </select>
+    <select id="queryQuitMapByStudentId" resultType="java.util.Map">
+        SELECT user_id_ 'key',COUNT(DISTINCT id_)'value' FROM music_group_quit
+        WHERE user_id_ IN
+        <foreach collection="studentIds" open="(" close=")" item="userId" separator=",">
+            #{userId}
+        </foreach>
+        AND music_group_id_ = #{musicGroupId} AND status_ = 'PROCESSING'
+        GROUP BY user_id_
+    </select>
 </mapper>