Merge branch 'oa_2022-03-29' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -44,7 +44,7 @@ public class FinancialExpenditure extends BaseEntity {
 	private FeeProjectEnum feeProject = FeeProjectEnum.REFUND;
 	/**  */
 	@ApiModelProperty(value = "费用",required = false)
-	private BigDecimal amount;
+	private BigDecimal amount = BigDecimal.ZERO;
 	/**  */
 	@ApiModelProperty(value = "费用明细",required = false)
 	private String itemDetail;

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

@@ -216,11 +216,10 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
     /**
      * 检测oa退团参数
      *
-     * @param musicGroupId
-     * @param userId
+     * @param financialExpenditure
      * @return
      */
-    void checkDirectQuitMusicGroupOa(String musicGroupId, Integer userId);
+    void checkDirectQuitMusicGroupOa(FinancialExpenditure financialExpenditure);
 
     /**
      * 续费

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service.impl;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.ym.mec.biz.dal.dao.CooperationOrganDao;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
 import com.ym.mec.biz.dal.dao.FinancialExpenditureDao;
 import com.ym.mec.biz.dal.dao.OrganizationDao;
@@ -63,6 +64,8 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
     @Autowired
     private MusicGroupService musicGroupService;
     @Autowired
+    private CooperationOrganDao cooperationOrganDao;
+    @Autowired
     private FinancialExpenditureService financialExpenditureService;
 
     @Override
@@ -549,7 +552,7 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
                 }
             }else {
                 for (FinancialExpenditure financialExpenditure : financialExpenditureList) {
-                    musicGroupService.checkDirectQuitMusicGroupOa(financialExpenditure.getMusicGroupId(), financialExpenditure.getStudentId());
+                    musicGroupService.checkDirectQuitMusicGroupOa(financialExpenditure);
                 }
             }
         }
@@ -605,7 +608,7 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
         }
         if(CollectionUtils.isNotEmpty(financialExpenditureList)){
             for (FinancialExpenditure financialExpenditure : financialExpenditureList) {
-                musicGroupService.checkDirectQuitMusicGroupOa(financialExpenditure.getMusicGroupId(), financialExpenditure.getStudentId());
+                musicGroupService.checkDirectQuitMusicGroupOa(financialExpenditure);
             }
         }
         return financialExpenditureList;

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

@@ -2878,7 +2878,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     }
 
     @Override
-    public void checkDirectQuitMusicGroupOa(String musicGroupId, Integer userId) {
+    public void checkDirectQuitMusicGroupOa(FinancialExpenditure financialExpenditure) {
+        Integer userId = financialExpenditure.getStudentId();
+        String musicGroupId = financialExpenditure.getMusicGroupId();
         SysUser user = teacherDao.getUser(userId);
         if (user == null) {
             throw new BizException("学员 {} 信息不存在", userId);
@@ -2891,6 +2893,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (musicGroup == null) {
             throw new BizException("乐团 {} 不存在", musicGroupId);
         }
+        financialExpenditure.setCooperationOrganId(musicGroup.getCooperationOrganId());
         if (musicGroup.getStatus() == MusicGroupStatusEnum.CANCELED || musicGroup.getStatus() == MusicGroupStatusEnum.PAUSE) {
             throw new BizException("退团失败，乐团 {} {} 状态[已取消]或[已暂停]", musicGroupId, musicGroup.getName());
         }

mec-web/src/main/java/com/ym/mec/web/config/ResourceServerConfig.java

@@ -39,7 +39,8 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                         "/oaContracts/*", "/eduStudent/organStudentOverView", "/activity/countCloudTeacherActive",
                         "/activity/organDoubleEleven2021Statis", "/activity/doubleEleven2021Statis", "/questionnaireTopic/getDetail", "/questionnaireUserResult/add",
                         "/tenantInfo/info/*", "/tenantInfo/checkInfo/*", "/tenantInfo/pay/*","/tenantInfo/testCheck", "/tenantInfo/getContract/*",
-                        "/tenantPreJoin/add","/imLiveBroadcastRoom/queryRoomInfo","/imLiveBroadcastRoom/test,/eduOrganization/queryAllOrgan,/eduOrganization/getOrganCooperation"
+                        "/tenantPreJoin/add","/imLiveBroadcastRoom/queryRoomInfo","/imLiveBroadcastRoom/test",
+                        "/eduOrganization/queryAllOrgan","/eduOrganization/getOrganCooperation","/import/oaUploadFile"
                 )
                 .permitAll().anyRequest().authenticated().and().httpBasic();
     }