Merge remote-tracking branch 'origin/master'

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

@@ -32,24 +32,24 @@ public interface EmployeeDao extends BaseDAO<Integer, Employee> {
      * @param userID
      * @param password
      */
-    void updatePassword(@Param("userID") Long userID, @Param("password") String password);
+    void updatePassword(@Param("userID") Integer userID, @Param("password") String password);
 
     /**
      * @Author: Joburgess
      * @Date: 2019/9/17
      * 修改用户账户锁定状态
      */
-    int updateUserLockStatus(@Param("userID") Long userID);
+    int updateUserLockStatus(@Param("userID") Integer userID);
 
 
-    void updateUserLock(@Param("userID") Long userID, @Param("status") int status);
+    void updateUserLock(@Param("userID") Integer userID, @Param("status") int status);
 
     /**
      * @Author: Joburgess
      * @Date: 2019/9/25
      * 修改用户离职日期
      */
-    int updateUserDemissionDate(@Param("userID") Long userID);
+    int updateUserDemissionDate(@Param("userID") Integer userID);
     /**
      * 根据手机号查询对象
      * @param phone

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupPaymentCalenderDetail.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
@@ -38,6 +39,9 @@ public class MusicGroupPaymentCalenderDetail {
 
 	/**1是0否  */
 	private Integer open;
+
+	/**1是0否  */
+	private YesOrNoEnum openFlag;
 	
 	/**  */
 	private java.util.Date payTime;
@@ -47,6 +51,12 @@ public class MusicGroupPaymentCalenderDetail {
 
 	/**  */
 	private java.util.Date deadlinePaymentDate;
+
+	/**  */
+	private java.util.Date startPaymentDateMgpc;
+
+	/**  */
+	private java.util.Date deadlinePaymentDateMgpc;
 	
 	/**  */
 	private java.util.Date updateTime;
@@ -54,8 +64,32 @@ public class MusicGroupPaymentCalenderDetail {
 	/**  */
 	private java.util.Date createTime;
 
+	public Date getStartPaymentDateMgpc() {
+		return startPaymentDateMgpc;
+	}
+
+	public void setStartPaymentDateMgpc(Date startPaymentDateMgpc) {
+		this.startPaymentDateMgpc = startPaymentDateMgpc;
+	}
+
+	public Date getDeadlinePaymentDateMgpc() {
+		return deadlinePaymentDateMgpc;
+	}
+
+	public void setDeadlinePaymentDateMgpc(Date deadlinePaymentDateMgpc) {
+		this.deadlinePaymentDateMgpc = deadlinePaymentDateMgpc;
+	}
+
 	private SysUser sysUser = new SysUser();
 
+	public YesOrNoEnum getOpenFlag() {
+		return openFlag;
+	}
+
+	public void setOpenFlag(YesOrNoEnum openFlag) {
+		this.openFlag = openFlag;
+	}
+
 	private StudentRegistration studentRegistration = new StudentRegistration();
 
 	public String getMusicGroupId() {

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupStudentFee.java

@@ -14,7 +14,7 @@ public class MusicGroupStudentFee {
 
 	public enum PaymentStatus implements BaseEnum<String, PaymentStatus> {
 
-		PAID_COMPLETED("完成缴费"), NON_PAYMENT("未缴费"), PROCESSING("缴费中");
+		PAID_COMPLETED("已缴费"), NON_PAYMENT("未缴费"), PROCESSING("缴费中");
 
 		private String desc;
 

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

@@ -10,10 +10,10 @@ public enum GroupStatusEnum implements BaseEnum<String, GroupStatusEnum> {
 
     NOT_START("NOT_START","未开始"),
     APPLYING("APPLYING","报名中"),
-    NORMAL("NORMAL", "正常"),
+    NORMAL("NORMAL", "进行中"),
     LOCK("LOCK", "锁定"),
     FINISH("FINISH", "结束"),
-    CANCEL("CANCEL", "取消");
+    CANCEL("CANCEL", "关闭");
 
     private String code;
 

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

@@ -3,16 +3,35 @@ package com.ym.mec.biz.dal.enums;
 import com.ym.mec.common.enums.BaseEnum;
 
 public enum PracticeGroupType implements BaseEnum<String, PracticeGroupType> {
-	/** 免费 */
-	FREE,
-	/** 收费 */
-	CHARGE,
-	/** 试听 */
-	TRIAL;
+
+	FREE("FREE","免费"),
+	CHARGE("CHARGE","收费"),
+	TRIAL("TRIAL","试听");
+
+	private String code;
+
+	private String msg;
+
+	PracticeGroupType(String code, String msg) {
+		this.code = code;
+		this.msg = msg;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
 
 	@Override
 	public String getCode() {
-		return this.name();
+		return this.code;
 	}
 
 }

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

@@ -24,7 +24,7 @@ public interface EmployeeService extends BaseService<Integer, Employee> {
      * @Date: 2019/9/17
      * 员工操作
      */
-    void employeeOperate(Long employeeId, EmployeeOperateEnum operate);
+    void employeeOperate(Integer employeeId, EmployeeOperateEnum operate);
 
     /**
      * 新增员工

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

@@ -3769,6 +3769,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 //					result.setIsCallNames(YesOrNoEnum.NO);
 //				}
 				result.setSettlementTime(coursesSettlementTimeMap.get(result.getId()));
+				result.setIsSettlement(Objects.isNull(result.getSettlementTime())?0:1);
 			}
         }
         pageInfo.setRows(results);

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

@@ -142,15 +142,15 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 	}
 
 	@Override
-	public void employeeOperate(Long employeeId, EmployeeOperateEnum operate) {
-		Employee employee = employeeDao.get(employeeId.intValue());
+	public void employeeOperate(Integer employeeId, EmployeeOperateEnum operate) {
+		Employee employee = employeeDao.get(employeeId);
 		switch (operate){
 			case RESET_PASSWORD:
 				employeeDao.updatePassword(employeeId,new BCryptPasswordEncoder().encode(ParamEnum.INIT_PASSWORD.getCode().toString()));
 				break;
 			case LOCK_UNLOCK:
-				SysUser sysUser = sysUserFeignService.queryUserById(employee.getUserId());
-				if(employee.getDemissionDate() != null && sysUser.getLockFlag() == 1){
+				SysUser sysUser = sysUserFeignService.queryUserById(employeeId);
+				if(employee != null && employee.getDemissionDate() != null && sysUser.getLockFlag() == 1){
 					throw new BizException("操作失败：离职员工不允许解冻");
 				}
 				employeeDao.updateUserLockStatus(employeeId);

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

@@ -8,6 +8,7 @@ import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.service.MusicGroupPaymentCalenderDetailService;
 import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.SysMessageService;

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

@@ -2174,7 +2174,6 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                     idNameMap = educationalUsers.stream().filter(e -> Objects.nonNull(e.getUserId()) && Objects.nonNull(e.getUserName())).collect(Collectors.toMap(SimpleUserDto::getUserId, user -> user.getUserName()));
                 }
 
-
                 for (PracticeGroupDto e : dataList) {
                     e.setSubjectName(subjectNames.get(e.getSubjectId().intValue()));
                     e.setOrganName(organNames.get(e.getOrganId()));

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

@@ -16,6 +16,7 @@ import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.util.collection.MapUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import com.ym.mec.biz.dal.enums.DealStatusEnum;

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

@@ -2287,6 +2287,7 @@
         cs.class_group_id_,
         cs.status_,
         cs.name_,
+        cs.class_date_,
         CONCAT(cs.class_date_,' ',cs.start_class_time_) course_start_time_,
         CONCAT(cs.class_date_,' ',cs.end_class_time_) course_end_time_,
         cs.actual_teacher_id_,

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

@@ -16,9 +16,12 @@
 		<result column="pay_time_" property="payTime" />
 		<result column="start_payment_date_" property="startPaymentDate" />
 		<result column="deadline_payment_date_" property="deadlinePaymentDate" />
+		<result column="start_payment_date_mgpc_" property="startPaymentDateMgpc" />
+		<result column="deadline_payment_date_mgpc_" property="deadlinePaymentDateMgpc" />
 		<result column="update_time_" property="updateTime" />
 		<result column="create_time_" property="createTime" />
-		<result column="open_" property="open" />
+		<result column="open_" property="open"/>
+		<result column="open_" property="openFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<association property="sysUser" javaType="com.ym.mec.auth.api.entity.SysUser">
 			<result column="username_" property="username" />
 			<result column="phone_" property="phone" />
@@ -45,20 +48,20 @@
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group_payment_calender_detail
 		(id_,music_group_payment_calender_id_,user_id_,expect_amount_,actual_amount_,payment_status_,
-		user_status_,pay_time_,update_time_,create_time_,open_,start_payment_date_,deadline_payment_date_)
+		user_status_,pay_time_,update_time_,create_time_,start_payment_date_,deadline_payment_date_)
 		VALUES(#{id},#{musicGroupPaymentCalenderId},#{userId},#{expectAmount},#{actualAmount},#{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		#{userStatus},#{payTime},#{updateTime},#{createTime},#{open},#{startPaymentDate},#{deadlinePaymentDate})
+		#{userStatus},#{payTime},#{updateTime},#{createTime},#{startPaymentDate},#{deadlinePaymentDate})
 	</insert>
 
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail">
         INSERT INTO music_group_payment_calender_detail
 		(id_,music_group_payment_calender_id_,user_id_,expect_amount_,actual_amount_,
-		payment_status_,user_status_,pay_time_,update_time_,create_time_,open_,start_payment_date_,deadline_payment_date_)
+		payment_status_,user_status_,pay_time_,update_time_,create_time_,start_payment_date_,deadline_payment_date_)
 		VALUES
 		<foreach collection="list" item="item" separator=",">
             (#{item.id},#{item.musicGroupPaymentCalenderId},#{item.userId},#{item.expectAmount},
             #{item.actualAmount},#{item.paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.userStatus},#{item.payTime},
-            #{item.updateTime},#{item.createTime},#{item.open},#{item.startPaymentDate},#{item.deadlinePaymentDate})
+            #{item.updateTime},#{item.createTime},#{item.startPaymentDate},#{item.deadlinePaymentDate})
         </foreach>
     </insert>
 
@@ -169,9 +172,10 @@
 	</delete>
 
     <!-- 分页查询 -->
-	<select id="queryPage" resultMap="MusicGroupPaymentCalenderDetail"
-		parameterType="map">
-		SELECT mgpcd.*,su.username_,su.phone_,st.name_ subject_names_,sr.music_group_status_
+	<select id="queryPage" resultMap="MusicGroupPaymentCalenderDetail" parameterType="map">
+		SELECT mgpcd.*,su.username_,su.phone_,st.name_ subject_names_,sr.music_group_status_,
+		CASE WHEN mgpcd.start_payment_date_ IS NULL THEN mgpc.start_payment_date_ ELSE mgpcd.start_payment_date_ END start_payment_date_mgpc_,
+		CASE WHEN mgpcd.deadline_payment_date_ IS NULL THEN mgpc.deadline_payment_date_ ELSE mgpcd.deadline_payment_date_ END deadline_payment_date_mgpc_
 		FROM music_group_payment_calender_detail mgpcd
 		LEFT JOIN sys_user su ON su.id_ = mgpcd.user_id_
 		LEFT JOIN student_registration sr ON sr.user_id_ = mgpcd.user_id_

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

@@ -282,9 +282,6 @@
             <if test="type != null and type == 0">
                 AND pg.be_renew_group_id_ IS NOT NULL AND pg.type_='CHARGE'
             </if>
-            <if test="type != null and type == 2">
-                AND pg.type_='FREE'
-            </if>
             <if test="practiceGroupType != null">
                 AND pg.type_=#{practiceGroupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>

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

@@ -50,11 +50,6 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.TeacherAttendance" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
         INSERT INTO teacher_attendance
         (id_,group_type_,teacher_id_,music_group_id_,class_group_id_,course_schedule_id_,sign_in_time_,sign_in_status_,remark_,create_time_,sign_out_time_,
         sign_out_status_,current_class_times_,sign_in_longitude_latitude_,sign_out_longitude_latitude_)

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

@@ -69,7 +69,7 @@ public class EmployeeController extends BaseController {
     @ApiOperation(value = "员工操作")
     @PostMapping("/employeeOperate")
     @PreAuthorize("@pcs.hasPermissions('employee/employeeOperate')")
-    public Object employeeOperate(Long employeeId, EmployeeOperateEnum operate){
+    public Object employeeOperate(Integer employeeId, EmployeeOperateEnum operate){
         employeeService.employeeOperate(employeeId,operate);
         return succeed();
     }

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

@@ -86,7 +86,6 @@ public class ExportController extends BaseController {
     private TeacherCourseRewardService teacherCourseRewardService;
     @Autowired
     private DegreeRegistrationService degreeRegistrationService;
-
     @Autowired
     private CooperationOrganService cooperationOrganService;
     @Autowired
@@ -96,24 +95,23 @@ public class ExportController extends BaseController {
     @Autowired
     private StudentDao studentDao;
     @Autowired
-    private MusicGroupPaymentCalenderService musicGroupPaymentCalenderService;
-
+    private MusicGroupPaymentCalenderDetailService musicGroupPaymentCalenderDetailService;
     @Autowired
     private TeacherService teacherService;
 
-    @ApiOperation(value = "乐团管理--修改--缴费设置导出")
-    @PostMapping("export/musicGroupPaymentCalender")
-    @PreAuthorize("@pcs.hasPermissions('export/musicGroupPaymentCalender')")
-    public void exportTeacherAttendances(HttpServletResponse response, MusicCalenderQueryInfo queryInfo) throws IOException {
+    @ApiOperation(value = "乐团管理--修改--缴费设置--缴费记录导出")
+    @PostMapping("export/musicGroupPaymentCalenderDetail")
+    @PreAuthorize("@pcs.hasPermissions('export/musicGroupPaymentCalenderDetail')")
+    public void exportTeacherAttendances(HttpServletResponse response, MusicCalenderDetailQueryInfo queryInfo) throws IOException {
         queryInfo.setPage(1);
         queryInfo.setRows(49999);
-        List<MusicGroupPaymentCalender> rows = musicGroupPaymentCalenderService.queryDetailPage(queryInfo).getRows();
+        List<MusicGroupPaymentCalenderDetail> rows = musicGroupPaymentCalenderDetailService.queryPage(queryInfo).getRows();
         OutputStream outputStream = response.getOutputStream();
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"缴费开始日期", "缴费结束日期", "预计缴费人数", "实际缴费人数", "状态", "缴费状态",
-                    "备注"}, new String[]{
-                    "startPaymentDate", "deadlinePaymentDate", "expectNum", "actualNum", "type.msg", "paymentStatus.desc",
-                    "memo"}, rows);
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"学员编号", "学员姓名", "学员声部", "学员状态", "手机号", "预计缴费金额",
+                    "缴费开始日期","缴费截止日期","是否开启缴费","缴费状态","支付时间"}, new String[]{
+                    "userId", "sysUser.username", "studentRegistration.subjectName", "studentRegistration.musicGroupStatus.msg", "sysUser.phone", "expectAmount",
+                    "startPaymentDateMgpc", "deadlinePaymentDateMgpc", "openFlag.msg", "paymentStatus.desc", "payTime"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
             response.flushBuffer();
@@ -488,10 +486,10 @@ public class ExportController extends BaseController {
             });
         }
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "网管课编号", "课程名称", "指导老师", "教务老师", "班级人数", "先上课单价", "线下课单价",
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{ "课程组编号","课程组名称", "课程组类型","分部", "教务老师", "指导老师", "班级人数",
                     "当前课次", "总课次", "剩余课次", "开课时间", "结束时间", "课程组状态", "是否续费", "备注"}, new String[]{
-                    "organName", "id", "name", "teacherName", "educationalTeacherName", "studentNum", "onlineClassesUnitPrice",
-                    "offlineClassesUnitPrice", "currentClassTimes", "totalClassTimes", "subClassTimes", "coursesStartDate", "coursesExpireDate",
+                    "id","name","type.msg","organName", "educationalTeacherName", "teacherName", "studentNum","currentClassTimes",
+                    "totalClassTimes", "subClassTimes", "coursesStartDate", "coursesExpireDate",
                     "groupStatus.desc","payStatus","memo"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");