update

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.page;
 
+import com.ym.mec.biz.dal.enums.SporadicChargeTypeEnum;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -9,7 +10,7 @@ public class SporadicChargeInfoQueryInfo extends QueryInfo {
     private String organId;
 
     @ApiModelProperty(value = "收费类型",required = false)
-    private Integer chargeType;
+    private SporadicChargeTypeEnum chargeType;
 
     @ApiModelProperty(value = "类型",required = false)
     private String type;
@@ -30,11 +31,11 @@ public class SporadicChargeInfoQueryInfo extends QueryInfo {
         this.organId = organId;
     }
 
-    public Integer getChargeType() {
+    public SporadicChargeTypeEnum getChargeType() {
         return chargeType;
     }
 
-    public void setChargeType(Integer chargeType) {
+    public void setChargeType(SporadicChargeTypeEnum chargeType) {
         this.chargeType = chargeType;
     }
 }

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

@@ -34,7 +34,8 @@
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO sporadic_charge_info
 		(title_,charge_type_,organ_id_,amount_,discount_amount_,detail_,create_time_,update_time_,operator_id_,user_id_)
-		VALUES(#{title},#{chargeType},#{organId},#{amount},#{discountAmount},#{detail},now(),now(),#{operatorId},#{userId})
+		VALUES(#{title},#{chargeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+		#{organId},#{amount},#{discountAmount},#{detail},now(),now(),#{operatorId},#{userId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -93,7 +94,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-student/src/main/java/com/ym/mec/student/controller/SporadicChargeInfoController.java

@@ -2,15 +2,11 @@ package com.ym.mec.student.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.auth.api.enums.SysUserType;
 import com.ym.mec.biz.dal.dao.SysUserCashAccountDao;
 import com.ym.mec.biz.dal.dto.SporadicPayDto;
 import com.ym.mec.biz.dal.entity.SporadicChargeInfo;
-import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.entity.SysUserCashAccount;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
-import com.ym.mec.biz.dal.enums.GroupType;
-import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.biz.service.SporadicChargeInfoService;
 import com.ym.mec.biz.service.StudentPaymentOrderService;
@@ -21,12 +17,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.poi.util.Internal;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
 import java.util.Map;
 
 @RequestMapping("sporadicChargeInfo")