Merge remote-tracking branch 'origin/master'

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.SporadicChargeTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
@@ -16,7 +17,7 @@ public class SporadicChargeInfo {
 	private String title;
 
 	@ApiModelProperty(value = "收费类型", required = true)
-	private String chargeType;
+	private SporadicChargeTypeEnum chargeType;
 
 	private Integer organId;
 
@@ -113,11 +114,11 @@ public class SporadicChargeInfo {
 		this.title = title;
 	}
 
-	public String getChargeType() {
+	public SporadicChargeTypeEnum getChargeType() {
 		return chargeType;
 	}
 
-	public void setChargeType(String chargeType) {
+	public void setChargeType(SporadicChargeTypeEnum chargeType) {
 		this.chargeType = chargeType;
 	}
 

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

@@ -0,0 +1,38 @@
+package com.ym.mec.biz.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+public enum SporadicChargeTypeEnum implements BaseEnum<Integer, SporadicChargeTypeEnum> {
+    LEVEL(1,"考级"),
+    SUBJECT_CHARGE(2,"声部更改"),
+    MUSIC_CHARGE(3,"乐器更换"),
+    PARTS_SELL(4,"配件销售"),
+    SERVICE_FEE(5,"维修费"),
+    LUCKY_BAG_ACTIVE(6,"福袋活动"),
+    VISITING_FEE(7,"上门费");
+
+    private Integer code;
+
+    private String msg;
+
+    SporadicChargeTypeEnum(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/service/SporadicChargeInfoService.java

@@ -19,7 +19,7 @@ public interface SporadicChargeInfoService extends BaseService<Integer, Sporadic
      * @param queryInfo
      * @return
      */
-    PageInfo queryDetailPage(SporadicChargeInfoQueryInfo queryInfo);
+    PageInfo<SporadicChargeInfo> queryDetailPage(SporadicChargeInfoQueryInfo queryInfo);
 
     /**
      * 单查询

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

@@ -134,7 +134,7 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
     }
 
     @Override
-    public PageInfo queryDetailPage(SporadicChargeInfoQueryInfo queryInfo) {
+    public PageInfo<SporadicChargeInfo> queryDetailPage(SporadicChargeInfoQueryInfo queryInfo) {
         PageInfo<SporadicChargeInfo> pageInfo = queryPage(queryInfo);
         List<SporadicChargeInfo> rows = pageInfo.getRows();
         if (rows != null && rows.size() > 0) {

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

@@ -6,7 +6,7 @@
 	<resultMap type="com.ym.mec.biz.dal.entity.SporadicChargeInfo" id="SporadicChargeInfo">
 		<result column="id_" property="id" />
 		<result column="title_" property="title" />
-		<result column="charge_type_" property="chargeType"/>
+		<result column="charge_type_" property="chargeType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="organ_id_" property="organId"/>
 		<result column="amount_" property="amount" />
 		<result column="discount_amount_" property="discountAmount" />
@@ -45,7 +45,7 @@
 				title_ = #{title},
 			</if>
 			<if test="chargeType != null">
-				charge_type_ = #{chargeType},
+				charge_type_ = #{chargeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 			</if>
 			<if test="organId != null">
 				organ_id_ = #{organId},
@@ -93,7 +93,7 @@
 				AND FIND_IN_SET(sci.organ_id_,#{organId})
 			</if>
 			<if test="chargeType != null">
-				AND sci.charge_type_ = #{chargeType}
+				AND sci.charge_type_ = #{chargeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			</if>
 			<if test="type == 'personal'">
 				AND sci.user_id_ IS NOT NULL

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

@@ -273,10 +273,10 @@
         <result column="attachments_" property="url"/>
         <result column="is_replied_" property="isReplied"/>
         <result column="is_view_" property="isView"/>
-        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="createTime"/>
     </resultMap>
     <select id="findStudentCourseHomeworks" resultMap="StudentCourseHomeworkDtoMap">
-        SELECT sch.attachments_,sch.is_replied_,sch.is_view_,sch.create_time_,su.username_,su.phone_,s.name_ subject_name_
+        SELECT sch.attachments_,sch.is_replied_,sch.is_view_,sch.update_time_,su.username_,su.phone_,s.name_ subject_name_
         FROM course_schedule_student_payment cssp
         LEFT JOIN student_course_homework sch ON sch.course_schedule_id_ = cssp.course_schedule_id_ AND cssp.user_id_ = sch.user_id_ AND sch.status_ = 1
         LEFT JOIN sys_user su ON cssp.user_id_ = su.id_

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

@@ -256,22 +256,22 @@
             (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
             AND CONCAT(cs.class_date_," ",cs.start_class_time_) < NOW()
             <if test="studentId!=null">
-                and cssp.user_id_ = #{studentId}
+                AND cssp.user_id_ = #{studentId}
             </if>
             <if test="classGroupType!=null">
-                and cg.type_ = #{classGroupType}
+                AND cg.type_ = #{classGroupType}
             </if>
             <if test="attendanceStatus != null and attendanceStatus != 'TRUANT'">
-                and sa.status_ = #{attendanceStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+                AND sa.status_ = #{attendanceStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
             <if test="attendanceStatus != null and attendanceStatus == 'TRUANT'">
-                and (sa.status_ = #{attendanceStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} OR sa.status_ IS NULL)
+                AND (sa.status_ = #{attendanceStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} OR sa.status_ IS NULL)
             </if>
             <if test="classGroupName!=null">
-                and cg.name_ like CONCAT("%",#{classGroupName},"%")
+                AND (cg.name_ LIKE CONCAT("%",#{classGroupName},"%") OR cs.name_ LIKE CONCAT("%",#{classGroupName},"%"))
             </if>
             <if test="teacherName!=null">
-                and su.real_name_ like CONCAT("%",#{teacherName},"%")
+                AND su.real_name_ LIKE CONCAT("%",#{teacherName},"%")
             </if>
         </where>
     </sql>

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

@@ -11,7 +11,6 @@ import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
-import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
@@ -65,6 +64,8 @@ public class ExportController extends BaseController {
     private VipGroupService vipGroupService;
     @Autowired
     private CourseScheduleService scheduleService;
+    @Autowired
+    private SporadicChargeInfoService sporadicChargeInfoService;
 
 
 
@@ -112,8 +113,7 @@ public class ExportController extends BaseController {
         }
     }
 
-
-    @ApiOperation(value = "终极课表获取")
+    @ApiOperation(value = "终课表列表导出")
     @GetMapping("export/superFindCourseSchedules")
     @PreAuthorize("@pcs.hasPermissions('export/superFindCourseSchedules')")
     public void superFindCourseSchedules(EndCourseScheduleQueryInfo queryInfo,HttpServletResponse response){
@@ -152,6 +152,43 @@ public class ExportController extends BaseController {
         }
     }
 
+
+    @ApiOperation(value = "导出零星收费列表")
+    @GetMapping("export/sporadicChargeInfo")
+    @PreAuthorize("@pcs.hasPermissions('export/sporadicChargeInfo')")
+    public void queryPage(SporadicChargeInfoQueryInfo queryInfo,HttpServletResponse response) {
+        queryInfo.setRows(999999999);
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            throw new BizException("用户信息获取失败");
+        }
+        if(!sysUser.getIsSuperAdmin()){
+            Employee employee = employeeDao.get(sysUser.getId());
+            if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+                queryInfo.setOrganId(employee.getOrganIdList());
+            }else if(StringUtils.isEmpty(employee.getOrganIdList())){
+                throw new BizException("用户所在分部异常");
+            }else {
+                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+                if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+                    throw new BizException("非法请求");
+                }
+            }
+        }
+        List<SporadicChargeInfo> rows = sporadicChargeInfoService.queryDetailPage(queryInfo).getRows();
+        try {
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "收费类型", "标题", "金额", "时间", "学生姓名","创建人"}, new String[]{
+                    "organName", "chargeType.msg", "title", "amount", "updateTime", "userName","operatorName"}, rows);
+            response.setContentType("application/octet-stream");
+            response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
+            response.flushBuffer();
+            workbook.write(response.getOutputStream());
+            workbook.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     @ApiOperation(value = "导出学员是否有课")
     @PostMapping("export/studentHasCourse")
     @PreAuthorize("@pcs.hasPermissions('export/studentHasCourse')")

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

@@ -87,7 +87,7 @@ public class SporadicChargeInfoController extends BaseController {
 			sporadicChargeInfo.setOrganId(user.getOrganId());
 		}
 		if(sporadicChargeInfo.getChargeType().equals("6")){
-			SporadicChargeInfo info = sporadicChargeInfoService.findByOrganIdAndType(sporadicChargeInfo.getOrganId(), Integer.parseInt(sporadicChargeInfo.getChargeType()));
+			SporadicChargeInfo info = sporadicChargeInfoService.findByOrganIdAndType(sporadicChargeInfo.getOrganId(), sporadicChargeInfo.getChargeType().getCode());
 			if(info != null){
 				return failed("分部活动已存在，请勿重复创建");
 			}