Merge branch 'master' of huangrui/CostAccount into dev

src/main/java/com/imed/costaccount/service/impl/CostDepartmentProfitServiceImpl.java

@@ -1,19 +1,20 @@
 package com.imed.costaccount.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.imed.costaccount.common.enums.DateStyleEnum;
 import com.imed.costaccount.common.exception.CostException;
 import com.imed.costaccount.common.util.BeanUtil;
 import com.imed.costaccount.common.util.DateUtils;
 import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.common.util.UserContext;
 import com.imed.costaccount.constants.NumberConstant;
-import com.imed.costaccount.common.enums.DateStyleEnum;
 import com.imed.costaccount.mapper.CostDepartmentProfitMapper;
 import com.imed.costaccount.model.*;
 import com.imed.costaccount.model.vo.AllocationQueryReportVO;
@@ -97,13 +98,9 @@ public class CostDepartmentProfitServiceImpl extends ServiceImpl<CostDepartmentP
      */
     @Override
     public void setDepartmentProfit(String date, Long hospId) {
-        int year = 0;
-        int month = 0;
-        if (StrUtil.isNotBlank(date)) {
-            Date dateTime = DateUtils.StringToDate(date, DateStyleEnum.YYYY_MM_DD);
-            year = DateUtil.year(dateTime);
-            month = DateUtil.month(dateTime) + 1;
-        }
+        DateTime parse = DateUtil.parse(date);
+        int year = DateUtil.year(parse);
+        int month = DateUtil.month(parse) + 1;
         // 先查询指定条件的报表数据  查询损益表的数据
         List<ReportForm> reportFormList = reportFormService.list(new QueryWrapper<ReportForm>().lambda()
                 .eq(ReportForm::getHospId, hospId)