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

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.entity.CourseSchedule;
+import com.ym.mec.biz.dal.enums.SignAttendanceStatusEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 
 import java.util.Date;
@@ -25,6 +26,10 @@ public class CourseScheduleEndDto extends CourseSchedule {
 
     private int isSignOut = 3;
 
+    private SignAttendanceStatusEnum signInStatusEnum;
+
+    private SignAttendanceStatusEnum signOutStatusEnum;
+
     private YesOrNoEnum isCallNames;
 
     private Date signInTime;
@@ -33,6 +38,22 @@ public class CourseScheduleEndDto extends CourseSchedule {
 
     private String studentId;
 
+    public SignAttendanceStatusEnum getSignInStatusEnum() {
+        return signInStatusEnum;
+    }
+
+    public void setSignInStatusEnum(SignAttendanceStatusEnum signInStatusEnum) {
+        this.signInStatusEnum = signInStatusEnum;
+    }
+
+    public SignAttendanceStatusEnum getSignOutStatusEnum() {
+        return signOutStatusEnum;
+    }
+
+    public void setSignOutStatusEnum(SignAttendanceStatusEnum signOutStatusEnum) {
+        this.signOutStatusEnum = signOutStatusEnum;
+    }
+
     public String getStudentId() {
         return studentId;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/SignAttendanceStatusEnum.java

@@ -0,0 +1,34 @@
+package com.ym.mec.biz.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+public enum SignAttendanceStatusEnum implements BaseEnum<Integer, SignAttendanceStatusEnum> {
+    NORMAL(1,"正常"),
+    UNUSUAL(0,"异常"),
+    NO(3,"未签到");
+
+    private Integer code;
+    private String msg;
+
+    SignAttendanceStatusEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    @Override
+    public Integer getCode() {
+        return this.code;
+    }
+}

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

@@ -26,16 +26,16 @@ public class PracticeGroupQueryInfo extends QueryInfo {
 
     private Boolean hasEducationalTeacherId;
 
-    private Boolean firstOrRenew;
+    private Integer type;
 
     private boolean isExport = false;
 
-    public Boolean getFirstOrRenew() {
-        return firstOrRenew;
+    public Integer getType() {
+        return type;
     }
 
-    public void setFirstOrRenew(Boolean firstOrRenew) {
-        this.firstOrRenew = firstOrRenew;
+    public void setType(Integer type) {
+        this.type = type;
     }
 
     public Boolean getHasEducationalTeacherId() {

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

@@ -3650,6 +3650,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                     TeacherAttendance teacherAttendance=courseTeacherAttendances.get(0);
                     result.setIsSignIn(Objects.isNull(teacherAttendance.getSignInStatus())?3:teacherAttendance.getSignInStatus().getCode());
                     result.setIsSignOut(Objects.isNull(teacherAttendance.getSignOutStatus())?3:teacherAttendance.getSignOutStatus().getCode());
+					result.setSignInStatusEnum(result.getIsSignIn() == 1?SignAttendanceStatusEnum.NORMAL:result.getIsSignIn() == 0?SignAttendanceStatusEnum.UNUSUAL:SignAttendanceStatusEnum.NO);
+					result.setSignOutStatusEnum(result.getIsSignOut() == 1?SignAttendanceStatusEnum.NORMAL:result.getIsSignOut() == 0?SignAttendanceStatusEnum.UNUSUAL:SignAttendanceStatusEnum.NO);
                     result.setSignInTime(teacherAttendance.getSignInTime());
                     result.setSignOutTime(teacherAttendance.getSignOutTime());
                     result.setRemark(teacherAttendance.getRemark());

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

@@ -247,12 +247,15 @@
             <if test="educationalTeacherId!=null">
                 AND pg.educational_teacher_id_=#{educationalTeacherId}
             </if>
-            <if test="firstOrRenew != null and firstOrRenew == true">
+            <if test="type != null and firstOrRenew == 1">
                 AND pg.be_renew_group_id_ IS NULL
             </if>
-            <if test="firstOrRenew != null and firstOrRenew == false">
+            <if test="type != null and firstOrRenew == 0">
                 AND pg.be_renew_group_id_ IS NOT NULL
             </if>
+            <if test="type != null and firstOrRenew == 2">
+                AND pg.buy_months_ IS NULL
+            </if>
         </where>
     </sql>
 

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

@@ -289,11 +289,12 @@ public class ExportController extends BaseController {
         }
         List<CourseScheduleEndDto> rows = scheduleService.endFindCourseSchedules(queryInfo).getRows();
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部名称", "课程编号", "开始时间", "结束时间", "班级名称", "班级声部", "课程名称", "课程类型", "教学模式",
-                    "教学点", "课程状态", "是否点名", "指导老师", "学员编号", "签到时间", "签退时间", "签到备注"}, new String[]{
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部名称", "课程编号", "开始时间", "结束时间",
+                    "班级名称", "班级声部", "课程名称", "课程类型", "教学模式",
+                    "教学点", "课程状态", "是否点名", "指导老师", "学员编号", "签到时间", "签退时间", "签到状态", "签退状态", "签到备注"}, new String[]{
                     "organName", "id", "startClassTime", "endClassTime", "classGroupName", "subjectName", "name",
                     "groupType.desc", "teachMode.msg", "schoolName", "status.msg", "isCallNames.msg", "teacherName", "studentId", "signInTime",
-                    "signOutTime", "remark"}, rows);
+                    "signOutTime","signInStatusEnum.msg","signOutStatusEnum.msg", "remark"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
             response.flushBuffer();