文件记录按照时间查询

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

@@ -1,6 +1,5 @@
 package com.imed.costaccount.service.impl;
 
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -9,9 +8,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.JacksonUtil;
 import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.constants.NumberConstant;
+import com.imed.costaccount.enums.DateStyleEnum;
 import com.imed.costaccount.mapper.CostCostingGroupMapper;
 import com.imed.costaccount.mapper.CostIncomeFileMapper;
 import com.imed.costaccount.mapper.CostIncomeGroupMapper;
@@ -26,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -104,10 +106,10 @@ public class CostIncomeFileServiceImpl extends ServiceImpl<CostIncomeFileMapper,
      */
     @Override
     public PageUtils queryList(Integer current, Integer pageSize, String fileName, String dateTime, Long hospId) {
-        Integer year = null;
-        Integer month = null;
+        int year = 0;
+        int month = 0;
         if (StrUtil.isNotBlank(dateTime)) {
-            DateTime date = DateUtil.parseDate(dateTime);
+            Date date = DateUtils.StringToDate(dateTime, DateStyleEnum.YYYY_MM);
             year = DateUtil.year(date);
             month = DateUtil.month(date) + 1;
         }

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

@@ -320,13 +320,16 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
             List<Object> data = list.get(i);
             log.info("用户输入的数据是{}", data);
             // 成本项目的代码和名称
+            if (Objects.isNull(data.get(0)) || Objects.isNull(data.get(1))){
+                continue;
+            }
             String productCode = data.get(0).toString().trim();
             String productName = data.get(1).toString().trim();
             // 开单科室 执行科室的代码和名称
-            String openDepartmentName = data.get(2).toString().trim();
-            String openDepartmentCode = data.get(3).toString().trim();
-            String startDepartmentName = data.get(4).toString().trim();
-            String startDepartmentCode = data.get(5).toString().trim();
+            String openDepartmentName = data.get(2).toString();
+            String openDepartmentCode = data.get(3).toString();
+            String startDepartmentName = data.get(4).toString();
+            String startDepartmentCode = data.get(5).toString();
             if (StrUtil.isBlank(openDepartmentCode) && StrUtil.isBlank(openDepartmentName) && StrUtil.isBlank(startDepartmentCode) && StrUtil.isBlank(startDepartmentName)) {
                 continue;
             }