检验数字

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

@@ -2,6 +2,7 @@ package com.imed.costaccount.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.druid.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.imed.costaccount.common.exception.CostException;
@@ -139,7 +140,8 @@ public class CostCostingGroupServiceImpl extends ServiceImpl<CostCostingGroupMap
             this.saveBatch(costCostingGroupArrayList);
             return Result.build(200, "数据导入成功", null);
         } else {
-            return Result.build(500, "数据未成功导入", null);
+
+            return Result.build(200, "数据未成功导入", null);
         }
     }
     public static boolean isNumeric(String str){
@@ -175,7 +177,7 @@ public class CostCostingGroupServiceImpl extends ServiceImpl<CostCostingGroupMap
                 if (data.size() > j ) {
                     if (Objects.isNull(data.get(j))){
                         data.set(j, NumberConstant.ZERO);
-                    }else if (!isNumeric(data.get(j).toString()) || data.get(j).toString().contains("-")){
+                    }else if ( data.get(j).toString().contains("-") || StringUtils.isNumber(data.get(j).toString())){
                         IncomeErrorMessage incomeErrorMessage = new IncomeErrorMessage();
                         incomeErrorMessage.setTotal(row);
                         incomeErrorMessage.setErrMessage("第"+row+"行 第"+column+"列数据不符合规范");

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

@@ -127,12 +127,12 @@ public class CostIncomeFileServiceImpl extends ServiceImpl<CostIncomeFileMapper,
         if (Objects.isNull(costIncomeFile)){
             throw new CostException(500,"文件记录不存在");
         }
-        // 根据文件的Id 和 医院Id获取数据
+//        // 根据文件的Id 和 医院Id获取数据
         List<CostIncomeGroup> costIncomeGroupList = costIncomeGroupMapper.selectList(new QueryWrapper<CostIncomeGroup>().lambda()
                 .eq(CostIncomeGroup::getHospId, hospId).eq(CostIncomeGroup::getFileId, id));
-        if (CollectionUtils.isEmpty(costIncomeGroupList)){
-            throw new CostException(410,"数据已撤销");
-        }
+//        if (CollectionUtils.isEmpty(costIncomeGroupList)){
+//            throw new CostException(410,"数据已撤销");
+//        }
         List<Long> list = costIncomeGroupList.stream().map(CostIncomeGroup::getId).collect(Collectors.toList());
         costIncomeGroupMapper.deleteBatchIds(list);
         costIncomeFile.setRollbackStatus(NumberConstant.ONE);

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

@@ -2,6 +2,7 @@ package com.imed.costaccount.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.druid.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.imed.costaccount.common.exception.CostException;
@@ -27,8 +28,6 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.imed.costaccount.service.impl.CostCostingGroupServiceImpl.isNumeric;
-
 
 @Service("costShareParamGroupService")
 public class CostShareParamGroupServiceImpl extends ServiceImpl<CostShareParamGroupMapper, CostShareParamGroup> implements CostShareParamGroupService {
@@ -110,13 +109,13 @@ public class CostShareParamGroupServiceImpl extends ServiceImpl<CostShareParamGr
             this.saveBatch(costShareParamGroupList);
             return Result.build(200, "数据导入成功", null);
         } else {
-            return Result.build(500, "数据未成功导入", null);
+            return Result.build(200, "数据未成功导入", null);
         }
     }
 
     private void checkShareParamGroupData(List<List<Object>> list, int year, int month, List<IncomeErrorMessage> incomeErrorMessageList, Map<String, Department> departmentMap, Map<Long, Responsibility> responsibilityMap, Map<Long, Long> responsibilityDepMap, Map<String, CostShareParam> shareParamMap, List<CostShareParamGroup> costShareParamGroupList, List<Object> departmentCodes, List<Object> departmentNames) {
         for (int i = 2; i < list.size(); i++) {
-            int row = i + 2;
+            int row = i + 4;
             List<Object> data = list.get(i);
             // 检验成本分摊参数是否正确
             CostShareParamGroup costShareParamGroupRequest = new CostShareParamGroup();
@@ -137,7 +136,7 @@ public class CostShareParamGroupServiceImpl extends ServiceImpl<CostShareParamGr
                 if (data.size() > j ) {
                     if (Objects.isNull(data.get(j))){
                         data.set(j, NumberConstant.ZERO);
-                    }else if (!isNumeric(data.get(j).toString()) || data.get(j).toString().contains("-")){
+                    }else if (data.get(j).toString().contains("-")||!StringUtils.isNumber(data.get(j).toString())){
                         IncomeErrorMessage incomeErrorMessage = new IncomeErrorMessage();
                         incomeErrorMessage.setTotal(row);
                         incomeErrorMessage.setErrMessage("第"+row+"行 第"+column+"列数据不符合规范");