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

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

@@ -141,6 +141,9 @@ public class CourseHomeworkWrapper {
         @ApiModelProperty(value = "作业类型 来源（HOMEWORK,EXTRACURRICULAR,EXTRA）",required = true)
         private ELessonTrainingType type;
 
+        @ApiModelProperty("是否可布置")
+        private Boolean assignFlag;
+
         private String studentIdList;
 
         @ApiModelProperty("练习内容")

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

@@ -816,11 +816,16 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
                 }
             }
             for (CourseHomeworkWrapper.CourseHomeworkList courseHomeworkList : courseHomeworkLists) {
-
+                courseHomeworkList.setAssignFlag(false);
                 // 如果是未布置的 设置时间
                 if(courseHomeworkList.getHomeWorkStatus().equals(EHomeWorkStatus.UNASSIGNED)){
+                    courseHomeworkList.setAssignFlag(true);
                     courseHomeworkList.setAssignTime(queryInfo.getStartTime());
                     courseHomeworkList.setStudentIdList(groupIds.get(courseHomeworkList.getMusicGroupId()));
+                    // 如果结束时间小于当前时间  设置为已过期
+                    if(queryInfo.getEndTime().before(new Date())){
+                        courseHomeworkList.setAssignFlag(false);
+                    }
                 }
 
                 // 乐团信息

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

@@ -1796,7 +1796,7 @@ public class ExportController extends BaseController {
             String[] header = {"姓名", "性别", "用户编号", "证件号码", "所属城市", "学校", "报考专业", "报考信息", "证书", "联系电话", "备注", "缴费状态", "订单编号", "交易流水号", "报名时间"};
             String[] body = {"name", "gender", "userId", "idcard",  "organName",  "school", "type.code =='GRADE'?'专业考级':'乐理考级'",
                     "type.code =='GRADE'?subjectName+'/'+level+'/'+money +'元':level+'/'+money +'元'",
-                    "theoryCert", "mobile", "memo", "status == 2?'已缴费':status == 3?'已退费':'未缴费'", "orderNo", "transNo", "createTime"};
+                    "theoryCert", "mobile", "memo", "status == 2?'已支付':status == 3?'已退费':'未支付'", "orderNo", "transNo", "createTime"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, pageList.getRows());
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");