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/service/impl/FinancialExpenditureServiceImpl.java

@@ -240,7 +240,9 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
             OaFormStructureDto oaFormStructureDto = JSONObject.parseObject(formStructure, OaFormStructureDto.class);
             List<OaInputDto> oaInputDtos = oaFormStructureDto.getList();
             //课程退费和乐团退费需要单独处理
-            if(pWorkOrderInfo.getProcess().equals(22) || pWorkOrderInfo.getProcess().equals(19)){
+            if(pWorkOrderInfo.getProcess().equals(34) ||
+                    pWorkOrderInfo.getProcess().equals(22) ||
+                    pWorkOrderInfo.getProcess().equals(19)){
                 List<FinancialExpenditure> financialExpenditureList = new ArrayList<>();
                 for (OaInputDto oaInputDto : oaInputDtos) {
                     if(!"子表单".equals(oaInputDto.getName())){
@@ -476,7 +478,7 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
         if(StringUtils.isEmpty(tplInfoId)){
             throw new BizException("参数校验失败");
         }
-        if(tplInfoId.equals("11") || tplInfoId.equals("8")){
+        if(tplInfoId.equals("11") || tplInfoId.equals("8") || tplInfoId.equals("20")){
             String data = paramMap.get("formData");
             if(StringUtils.isEmpty(data)){
                 return;

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

@@ -102,7 +102,7 @@ public class ImportController extends BaseController {
             bean.setName(file.getOriginalFilename());
             if(bean.isStatus()){
                 //如果是乐团退费，校验excel
-                if(processId != null && processId.equals(19)){
+                if(processId != null && (processId.equals(19) || processId.equals(34)){
                     if(!"xls".equals(fileName) && !"xlsx".equals(fileName)){
                         throw new BizException("请上传Excel文件");
                     }