Merge remote-tracking branch 'origin/master'

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

@@ -12,7 +12,8 @@ public enum SporadicChargeTypeEnum implements BaseEnum<Integer, SporadicChargeTy
     VISITING_FEE(7,"上门费"),
     VIP_BUY(8,"VIP课购买"),
     RECHARGE(9,"账户余额"),
-    MUSIC_UPKEEP(10,"乐保服务");
+    MUSIC_UPKEEP(10,"乐保服务"),
+    OTHER(11,"其他");
 
     private Integer code;
 

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

@@ -828,6 +828,7 @@ public class ExportController extends BaseController {
                 row.setMusicalFee(BigDecimal.ZERO);
                 row.setTeachingFee(BigDecimal.ZERO);
                 if (row.getChargeType() != null) {
+
                     if (row.getChargeType().equals(1)) {
                         row.setSporadicType("考级");
                     } else if (row.getChargeType().equals(2)) {
@@ -846,6 +847,8 @@ public class ExportController extends BaseController {
                         row.setSporadicType("账户充值");
                     } else if (row.getChargeType().equals(10)) {
                         row.setSporadicType("乐保服务");
+                    } else if (row.getChargeType().equals(11)) {
+                        row.setSporadicType("其他");
                     }
                 }
                 School userSchool = musicGroupDao.findUserSchool(row.getUserId());

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

@@ -5,6 +5,7 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
 import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.entity.SporadicChargeInfo;
+import com.ym.mec.biz.dal.enums.SporadicChargeTypeEnum;
 import com.ym.mec.biz.dal.page.SporadicChargeInfoQueryInfo;
 import com.ym.mec.biz.service.SporadicChargeInfoService;
 import com.ym.mec.common.controller.BaseController;
@@ -87,7 +88,7 @@ public class SporadicChargeInfoController extends BaseController {
 			}
 			sporadicChargeInfo.setOrganId(user.getOrganId());
 		}
-		if(sporadicChargeInfo.getChargeType().equals("6")){
+		if(sporadicChargeInfo.getChargeType().equals(SporadicChargeTypeEnum.LUCKY_BAG_ACTIVE)){
 			SporadicChargeInfo info = sporadicChargeInfoService.findByOrganIdAndType(sporadicChargeInfo.getOrganId(), sporadicChargeInfo.getChargeType().getCode());
 			if(info != null){
 				return failed("分部活动已存在，请勿重复创建");