Merge remote-tracking branch 'origin/adapay_new' into adapay_new

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseHomeworkDao.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.dto.Mapper;
 import com.ym.mec.biz.dal.dto.TeacherHomeworkListDto;
+import com.ym.mec.biz.dal.dto.WebCourseHomeworkListDto;
 import com.ym.mec.biz.dal.entity.CourseHomework;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
@@ -50,4 +51,18 @@ public interface CourseHomeworkDao extends BaseDAO<Long, CourseHomework> {
 	int delByCourseScheduleId(Long courseScheduleId);
 
 	int batchDelByCourseScheduleId(@Param("courseScheduleIdList") List<Long> courseScheduleIdList);
+
+	/**
+	 * 后台作业列表
+	 * @param params
+	 * @return
+	 */
+    List<WebCourseHomeworkListDto> queryHomePage(Map<String, Object> params);
+
+	/**
+	 * 后台作业列表
+	 * @param params
+	 * @return
+	 */
+	int findHomeCount(Map<String, Object> params);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentCourseHomeworkDao.java

@@ -136,5 +136,13 @@ public interface StudentCourseHomeworkDao extends BaseDAO<Long, StudentCourseHom
                                                      @Param("studentIds") List<Integer> studentIds);
 
     List<StudentCourseHomework> queryAll(Map<String, Object> params);
+
     int countAll(Map<String, Object> params);
+
+    /**
+     * 获取作业的已回复数
+     * @param homeWorkIds
+     * @return
+     */
+    List<Map<Long, Long>> queryReplied(@Param("homeWorkIds") List<Long> homeWorkIds);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/WebCourseHomeworkListDto.java

@@ -0,0 +1,200 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.enums.GroupType;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+/**
+ * @Author Joburgess
+ * @Date 2019/9/19
+ */
+public class WebCourseHomeworkListDto {
+
+    @ApiModelProperty(value = "作业编号",required = false)
+    private Long id;
+
+    @ApiModelProperty(value = "课程时间",required = false)
+    private String classDate;
+
+    @ApiModelProperty(value = "课程开始时间",required = false)
+    private String classStartDate;
+
+    @ApiModelProperty(value = "课程结束时间",required = false)
+    private String classEndDate;
+
+    @ApiModelProperty(value = "课程编号",required = false)
+    private Long courseScheduleId;
+
+    @ApiModelProperty(value = "课程名称",required = false)
+    private String courseScheduleName;
+
+    @ApiModelProperty(value = "分部编号",required = false)
+    private Integer organId;
+
+    @ApiModelProperty(value = "分部名称",required = false)
+    private String organName;
+
+    @ApiModelProperty(value = "课程组编号",required = false)
+    private String groupId;
+
+    @ApiModelProperty(value = "课程组名称",required = false)
+    private String groupName;
+
+    @ApiModelProperty(value = "课程组类型",required = false)
+    private GroupType groupType;
+
+    @ApiModelProperty(value = "布置时间",required = false)
+    private Date createTime;
+
+    @ApiModelProperty(value = "布置老师",required = false)
+    private Integer actualTeacherId;
+
+    @ApiModelProperty(value = "布置老师名称",required = false)
+    private String actualTeacherName;
+
+    @ApiModelProperty(value = "作业完成人数",required = false)
+    private Integer completedNum = 0;
+
+    @ApiModelProperty(value = "预计完成人数",required = false)
+    private Integer expectNum;
+
+    @ApiModelProperty(value = "已回复数",required = false)
+    private Integer repliedNum = 0;
+
+    public String getClassDate() {
+        return classDate;
+    }
+
+    public void setClassDate(String classDate) {
+        this.classDate = classDate;
+    }
+
+    public String getClassStartDate() {
+        return classStartDate;
+    }
+
+    public void setClassStartDate(String classStartDate) {
+        this.classStartDate = classStartDate;
+    }
+
+    public String getClassEndDate() {
+        return classEndDate;
+    }
+
+    public void setClassEndDate(String classEndDate) {
+        this.classEndDate = classEndDate;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getCourseScheduleId() {
+        return courseScheduleId;
+    }
+
+    public void setCourseScheduleId(Long courseScheduleId) {
+        this.courseScheduleId = courseScheduleId;
+    }
+
+    public String getCourseScheduleName() {
+        return courseScheduleName;
+    }
+
+    public void setCourseScheduleName(String courseScheduleName) {
+        this.courseScheduleName = courseScheduleName;
+    }
+
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(Integer organId) {
+        this.organId = organId;
+    }
+
+    public String getOrganName() {
+        return organName;
+    }
+
+    public void setOrganName(String organName) {
+        this.organName = organName;
+    }
+
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public GroupType getGroupType() {
+        return groupType;
+    }
+
+    public void setGroupType(GroupType groupType) {
+        this.groupType = groupType;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getActualTeacherId() {
+        return actualTeacherId;
+    }
+
+    public void setActualTeacherId(Integer actualTeacherId) {
+        this.actualTeacherId = actualTeacherId;
+    }
+
+    public String getActualTeacherName() {
+        return actualTeacherName;
+    }
+
+    public void setActualTeacherName(String actualTeacherName) {
+        this.actualTeacherName = actualTeacherName;
+    }
+
+    public Integer getCompletedNum() {
+        return completedNum;
+    }
+
+    public void setCompletedNum(Integer completedNum) {
+        this.completedNum = completedNum;
+    }
+
+    public Integer getExpectNum() {
+        return expectNum;
+    }
+
+    public void setExpectNum(Integer expectNum) {
+        this.expectNum = expectNum;
+    }
+
+    public Integer getRepliedNum() {
+        return repliedNum;
+    }
+
+    public void setRepliedNum(Integer repliedNum) {
+        this.repliedNum = repliedNum;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/CourseHomeWorkTemplateQueryInfo.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
  * @Date 2019/9/18
  */
 public class CourseHomeWorkTemplateQueryInfo extends QueryInfo {
+    private String organId;
 
     @ApiModelProperty(value = "科目ID集合",required = false)
     private String[] subjectIDs;
@@ -15,9 +16,48 @@ public class CourseHomeWorkTemplateQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "课程计划ID",required = false)
     private Long courseScheduleID;
 
+    private String classStartDate;
+
+    private String classEndDate;
+
     @ApiModelProperty(value = "班级类型")
     private String classType;
 
+    @ApiModelProperty(value = "课程组类型")
+    private String groupType = "MUSIC";
+
+    public String getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(String organId) {
+        this.organId = organId;
+    }
+
+    public String getGroupType() {
+        return groupType;
+    }
+
+    public void setGroupType(String groupType) {
+        this.groupType = groupType;
+    }
+
+    public String getClassStartDate() {
+        return classStartDate;
+    }
+
+    public void setClassStartDate(String classStartDate) {
+        this.classStartDate = classStartDate;
+    }
+
+    public String getClassEndDate() {
+        return classEndDate;
+    }
+
+    public void setClassEndDate(String classEndDate) {
+        this.classEndDate = classEndDate;
+    }
+
     public String getClassType() {
         return classType;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/CourseHomeworkService.java

@@ -1,7 +1,10 @@
 package com.ym.mec.biz.service;
 
+import com.ym.mec.biz.dal.dto.WebCourseHomeworkListDto;
 import com.ym.mec.biz.dal.entity.CourseHomework;
+import com.ym.mec.biz.dal.page.CourseHomeWorkTemplateQueryInfo;
 import com.ym.mec.biz.dal.page.CourseHomeworkQueryInfo;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
 import java.util.List;
@@ -36,4 +39,11 @@ public interface CourseHomeworkService extends BaseService<Long, CourseHomework>
 	 * @return
 	 */
 	boolean delHomwworkByCourseScheduleId(List<Long> courseScheduleIdList);
-}
+
+	/**
+	 * 管理端作业列表
+	 * @param queryInfo
+	 * @return
+	 */
+	PageInfo<WebCourseHomeworkListDto> queryHomePage(CourseHomeWorkTemplateQueryInfo queryInfo);
+}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseHomeworkServiceImpl.java

@@ -5,14 +5,17 @@ import com.ym.mec.biz.dal.dao.StudentCourseHomeworkDao;
 import com.ym.mec.biz.dal.dao.StudentCourseHomeworkReplyDao;
 import com.ym.mec.biz.dal.dto.Mapper;
 import com.ym.mec.biz.dal.dto.TeacherHomeworkListDto;
+import com.ym.mec.biz.dal.dto.WebCourseHomeworkListDto;
 import com.ym.mec.biz.dal.entity.CourseHomework;
 import com.ym.mec.biz.dal.entity.StudentCourseHomework;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import com.ym.mec.biz.dal.page.CourseHomeWorkTemplateQueryInfo;
 import com.ym.mec.biz.dal.page.CourseHomeworkQueryInfo;
 import com.ym.mec.biz.service.CourseHomeworkService;
 import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
 import com.ym.mec.util.collection.MapUtil;
@@ -134,4 +137,33 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
 		studentCourseHomeworkReplyDao.delByCourseScheduleIds(courseScheduleIdList);
 		return true;
 	}
+
+	@Override
+	public PageInfo<WebCourseHomeworkListDto> queryHomePage(CourseHomeWorkTemplateQueryInfo queryInfo) {
+		PageInfo<WebCourseHomeworkListDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+		Map<String, Object> params = new HashMap<>();
+		MapUtil.populateMap(params, queryInfo);
+
+		List<WebCourseHomeworkListDto> dataList = null;
+		int count = courseHomeworkDao.findHomeCount(params);
+		if (count > 0) {
+			pageInfo.setTotal(count);
+			params.put("offset", pageInfo.getOffset());
+			dataList = courseHomeworkDao.queryHomePage(params);
+			List<Long> homeWorkIds = dataList.stream().map(e -> e.getId()).collect(Collectors.toList());
+			List<Map<Long,Long>> repliedList = studentCourseHomeworkDao.queryReplied(homeWorkIds);
+			Map<Long,Long> map = MapUtil.convertIntegerMap(repliedList);
+			dataList.forEach(e->{
+				Long aLong = map.get(e.getId());
+				if(aLong != null){
+					e.setRepliedNum(aLong.intValue());
+				}
+			});
+		}
+		if (count == 0) {
+			dataList = new ArrayList<>();
+		}
+		pageInfo.setRows(dataList);
+		return pageInfo;
+	}
 }

mec-biz/src/main/resources/config/mybatis/CourseHomeworkMapper.xml

@@ -238,7 +238,82 @@
 		where cs.del_flag_ = 0 AND cs.actual_teacher_id_ IS NOT NULL
 		AND sch.is_replied_ = 0 group by cs.actual_teacher_id_
 	</select>
-	
+
+	<resultMap id="WebCourseHomeworkListDtoMap" type="com.ym.mec.biz.dal.dto.WebCourseHomeworkListDto">
+		<result property="organName" column="organ_name_"/>
+		<result property="organId" column="organ_id_"/>
+		<result property="groupType" column="group_type_"/>
+		<result property="groupName" column="group_name_"/>
+		<result property="groupId" column="group_id_"/>
+		<result property="courseScheduleName" column="course_schedule_name_"/>
+		<result property="courseScheduleId" column="course_schedule_id_"/>
+		<result property="actualTeacherName" column="actual_teacher_name_"/>
+		<result property="actualTeacherId" column="actual_teacher_id_"/>
+		<result property="completedNum" column="completed_num_"/>
+		<result property="createTime" column="create_time_"/>
+		<result property="expectNum" column="expect_num_"/>
+		<result property="id" column="id_"/>
+		<result property="classDate" column="class_date_"/>
+		<result property="classStartDate" column="start_class_time_"/>
+		<result property="classEndDate" column="end_class_time_"/>
+	</resultMap>
+    <select id="queryHomePage" resultMap="WebCourseHomeworkListDtoMap">
+		SELECT ch.id_,cs.id_ course_schedule_id_,cs.name_ course_schedule_name_,
+		cs.class_date_,cs.start_class_time_,cs.end_class_time_,cs.organ_id_,o.name_ organ_name_,
+		mg.id_ group_id_,mg.name_ group_name_,ch.create_time_,cs.actual_teacher_id_,
+		su.real_name_ actual_teacher_name_,ch.completed_num_,ch.expect_num_,cs.group_type_
+		FROM course_homework ch
+		LEFT JOIN course_schedule cs ON cs.id_ = ch.course_schedule_id_
+		LEFT JOIN organization o ON o.id_ = cs.organ_id_
+		<if test="groupType == 'MUSIC'">
+			LEFT JOIN music_group mg ON mg.id_ = cs.music_group_id_
+		</if>
+		<if test="groupType == 'VIP'">
+			LEFT JOIN vip_group mg ON mg.id_ = cs.music_group_id_
+		</if>
+		<if test="groupType == 'PRACTICE'">
+			LEFT JOIN practice_group mg ON mg.id_ = cs.music_group_id_
+		</if>
+		LEFT JOIN sys_user su ON su.id_ = cs.actual_teacher_id_
+		<include refid="queryHomePageSql"/>
+		ORDER BY ch.create_time_ DESC,ch.id_ DESC
+		<include refid="global.limit"/>
+	</select>
+	<sql id="queryHomePageSql">
+		<where>
+			cs.group_type_ = #{groupType}
+			<if test="organId != null">
+				AND FIND_IN_SET(cs.organ_id_,#{organId})
+			</if>
+			<if test="classStartDate != null and classStartDate != ''">
+				AND cs.class_date_ >= #{classStartDate}
+			</if>
+			<if test="classEndDate != null and classEndDate != ''">
+				AND cs.class_date_ &lt;= #{classEndDate}
+			</if>
+			<if test="search != null and search != ''">
+				AND (cs.id_ = #{search} OR cs.name_ LIKE CONCAT('%',#{search},'%')
+				OR mg.name_ LIKE CONCAT('%',#{search},'%') OR mg.id_ = #{search})
+			</if>
+		</where>
+	</sql>
+	<select id="findHomeCount" resultType="java.lang.Integer">
+		SELECT COUNT(ch.id_)
+		FROM course_homework ch
+		LEFT JOIN course_schedule cs ON cs.id_ = ch.course_schedule_id_
+		LEFT JOIN organization o ON o.id_ = cs.organ_id_
+		<if test="groupType == 'MUSIC'">
+			LEFT JOIN music_group mg ON mg.id_ = cs.music_group_id_
+		</if>
+		<if test="groupType == 'VIP'">
+			LEFT JOIN vip_group mg ON mg.id_ = cs.music_group_id_
+		</if>
+		<if test="groupType == 'PRACTICE'">
+			LEFT JOIN practice_group mg ON mg.id_ = cs.music_group_id_
+		</if>
+		<include refid="queryHomePageSql"/>
+	</select>
+
 	<delete id="delByCourseScheduleId" >
 		DELETE FROM course_homework WHERE course_schedule_id_ = #{courseScheduleId} 
 	</delete>

mec-biz/src/main/resources/config/mybatis/StudentCourseHomeworkMapper.xml

@@ -379,6 +379,16 @@
                 #{studentId}
             </foreach>
     </select>
+    <select id="queryReplied" resultType="java.util.Map">
+        SELECT sch.course_homework_id_ AS 'key',COUNT(0) AS 'value'
+        FROM student_course_homework sch
+        WHERE sch.course_homework_id_ IN
+        <foreach collection="homeWorkIds" open="(" close=")" separator="," item="item">
+            #{item}
+        </foreach>
+        AND sch.is_replied_ = 1
+        GROUP BY sch.course_homework_id_
+    </select>
 
     <sql id="queryAllCondition">
         <where>

mec-web/src/main/java/com/ym/mec/web/controller/WebCourseHomeworkController.java

@@ -0,0 +1,60 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.entity.Employee;
+import com.ym.mec.biz.dal.page.CourseHomeWorkTemplateQueryInfo;
+import com.ym.mec.biz.service.CourseHomeworkService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @Author zouxuan
+ * @Date 2020/11/17
+ */
+@RequestMapping("webCurseHomework")
+@Api(tags = "课后作业")
+@RestController
+public class WebCourseHomeworkController extends BaseController {
+
+    @Autowired
+    private CourseHomeworkService courseHomeworkService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private EmployeeDao employeeDao;
+
+    @ApiOperation(value = "分页查询作业列表")
+    @GetMapping(value = "/queryHomePage")
+    public Object queryPage(CourseHomeWorkTemplateQueryInfo queryInfo){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        if (!sysUser.getIsSuperAdmin()) {
+            Employee employee = employeeDao.get(sysUser.getId());
+            if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+                queryInfo.setOrganId(employee.getOrganIdList());
+            } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
+                return failed("用户所在分部异常");
+            } else {
+                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+                if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
+                    return failed("非法请求");
+                }
+            }
+        }
+        return succeed(courseHomeworkService.queryHomePage(queryInfo));
+    }
+
+}