经营报表oa

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CloudTeacherOrderDao.java

@@ -111,7 +111,11 @@ public interface CloudTeacherOrderDao extends BaseDAO<Long, CloudTeacherOrder> {
 
     List<Map<Integer, BigDecimal>> sumPersonIncome(@Param("month") String month);
 
-    List<Map<Integer,BigDecimal>> sumGroupCloudAmount(@Param("month") String month, @Param("firstDay") String firstDayOfMonth, @Param("lastDay") String lastDayOfMonth);
+    List<Map<Integer,BigDecimal>> sumGroupCloudAmount(@Param("month") String month,
+                                                      @Param("firstDay") String firstDayOfMonth,
+                                                      @Param("lastDay") String lastDayOfMonth);
 
-    List<Map<Integer,BigDecimal>> sumPersonalCloudAmount(@Param("month") String month, @Param("firstDay") String firstDayOfMonth, @Param("lastDay") String lastDayOfMonth);
+    List<Map<Integer,BigDecimal>> sumPersonalCloudAmount(@Param("month") String month,
+                                                         @Param("firstDay") String firstDayOfMonth,
+                                                         @Param("lastDay") String lastDayOfMonth);
 }

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

@@ -2331,8 +2331,8 @@ public class ExportServiceImpl implements ExportService {
         List<OperatingTotalIncomeDto> incomeDtos = new ArrayList<>();
         //承担课程的云教练收入
         String month = params.get("month").toString();
-        String firstDayOfMonth = DateUtil.dateToString(DateUtil.getFirstDayOfMonth(DateUtil.stringToDate(month)),DateUtil.ISO_EXPANDED_DATE_FORMAT);
-        String lastDayOfMonth = DateUtil.dateToString(DateUtil.getLastDayOfMonth(DateUtil.stringToDate(month)),DateUtil.ISO_EXPANDED_DATE_FORMAT);
+        String firstDayOfMonth = DateUtil.dateToString(DateUtil.getFirstDayOfMonth(DateUtil.stringToDate(month,DateUtil.ISO_YEAR_MONTH_FORMAT)),DateUtil.ISO_EXPANDED_DATE_FORMAT);
+        String lastDayOfMonth = DateUtil.dateToString(DateUtil.getLastDayOfMonth(DateUtil.stringToDate(month,DateUtil.ISO_YEAR_MONTH_FORMAT)),DateUtil.ISO_EXPANDED_DATE_FORMAT);
         Map<Integer, BigDecimal> groupCloudAmount = MapUtil.convertIntegerMap(cloudTeacherOrderDao.sumGroupCloudAmount(month,firstDayOfMonth,lastDayOfMonth));
         //不承担课程的云教练收入
         Map<Integer, BigDecimal> personalCloudAmount = MapUtil.convertIntegerMap(cloudTeacherOrderDao.sumPersonalCloudAmount(month,firstDayOfMonth,lastDayOfMonth));

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

@@ -267,27 +267,36 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
                 ExpenditureTypeEnum expenditureTypeEnum = ExpenditureTypeEnum.REFUND;
                 FeeProjectEnum feeProjectEnum = FeeProjectEnum.REFUND;
                 BigDecimal totalAmount = BigDecimal.ZERO;
+
                 for (OaInputDto oaInputDto : oaInputDtos) {
                     String submitForm = oaInputDto.getModel();
                     Object submitValue = formData.get(submitForm);
-                    if(Objects.isNull(submitValue)){
+                    if (Objects.isNull(submitValue) || StringUtils.isEmpty(submitValue.toString())) {
                         continue;
                     }
-                    if (StringUtils.equals("分部",oaInputDto.getName())) {
+                    if (StringUtils.equals("分部", oaInputDto.getName())) {
                         organId = Integer.parseInt(submitValue.toString());
                     }
-                    if (StringUtils.equals("情况说明",oaInputDto.getName())) {
+                    if (StringUtils.equals("情况说明", oaInputDto.getName())) {
                         note = submitValue.toString();
                     }
-                    if (StringUtils.equals("金额",oaInputDto.getName())) {
+                    if (oaInputDto.getName().contains("金额")) {
                         totalAmount = new BigDecimal(submitValue.toString());
                     }
-                    if (StringUtils.equals("支出类型",oaInputDto.getName())) {
+                    if (StringUtils.equals("支出类型", oaInputDto.getName())) {
                         expenditureTypeEnum = ExpenditureTypeEnum.valueOfDesc(submitValue.toString());
                     }
-                    if (StringUtils.equals("费用类别",oaInputDto.getName()) || StringUtils.equals("费用类型",oaInputDto.getName())) {
+                    if (StringUtils.equals("费用类别", oaInputDto.getName()) || StringUtils.equals("费用类型", oaInputDto.getName())) {
                         feeProjectEnum = FeeProjectEnum.valueOfDesc(submitValue.toString());
                     }
+                }
+
+                for (OaInputDto oaInputDto : oaInputDtos) {
+                    String submitForm = oaInputDto.getModel();
+                    Object submitValue = formData.get(submitForm);
+                    if(Objects.isNull(submitValue)){
+                        continue;
+                    }
                     if(!StringUtils.equals("子表单",oaInputDto.getName()) && !StringUtils.equals("分摊明细",oaInputDto.getName())){
                         continue;
                     }
@@ -298,10 +307,10 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
                         for (HashMap hashMap : hashMaps) {
                             List<OaColumnDto> columns = oaInputDto.getColumns();
                             if (columns != null && columns.size() > 0) {
+                                FinancialExpenditure financialExpenditure = new FinancialExpenditure();
                                 nullAmount:for (OaColumnDto column : columns) {
                                     List<OaInputDto> columnList = column.getList();
                                     if (columnList != null && columnList.size() > 0) {
-                                        FinancialExpenditure financialExpenditure = new FinancialExpenditure();
                                         for (OaInputDto inputDto : columnList) {
                                             String name = inputDto.getName();
                                             Object o = hashMap.get(inputDto.getModel());
@@ -314,21 +323,21 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
                                                 financialExpenditure.setEffectiveTime(o.toString());
                                             }
                                         }
-                                        financialExpenditure.setFeeProject(feeProjectEnum);
-                                        financialExpenditure.setType(expenditureTypeEnum);
-                                        financialExpenditure.setAprovalTime(endTime);
-                                        financialExpenditure.setPaymentTime(endTime);
-                                        financialExpenditure.setAmount(totalAmount);
-                                        financialExpenditure.setCause(note);
-                                        financialExpenditure.setBatchNo(pWorkOrderInfo.getId().toString());
-                                        financialExpenditure.setFinancialProcessNo(pWorkOrderInfo.getId().toString());
-                                        financialExpenditure.setApplyUser(realName);
-                                        financialExpenditure.setApplyUserId(pWorkOrderInfo.getCreator());
-                                        financialExpenditure.setProcessId(pWorkOrderInfo.getProcess());
-                                        financialExpenditure.setOrganId(organId);
-                                        financialExpenditureList.add(financialExpenditure);
                                     }
                                 }
+                                financialExpenditure.setFeeProject(feeProjectEnum);
+                                financialExpenditure.setType(expenditureTypeEnum);
+                                financialExpenditure.setAprovalTime(endTime);
+                                financialExpenditure.setPaymentTime(endTime);
+                                financialExpenditure.setAmount(totalAmount);
+                                financialExpenditure.setCause(note);
+                                financialExpenditure.setBatchNo(pWorkOrderInfo.getId().toString());
+                                financialExpenditure.setFinancialProcessNo(pWorkOrderInfo.getId().toString());
+                                financialExpenditure.setApplyUser(realName);
+                                financialExpenditure.setApplyUserId(pWorkOrderInfo.getCreator());
+                                financialExpenditure.setProcessId(pWorkOrderInfo.getProcess());
+                                financialExpenditure.setOrganId(organId);
+                                financialExpenditureList.add(financialExpenditure);
                             }
                         }
                     }else {