jiangping
2024-01-24 f84dcb86fc4c833202d9495a259d07082b7b72ae
server/service/src/main/java/com/doumee/service/business/impl/WorktypeServiceImpl.java
@@ -175,15 +175,15 @@
        return worktypeMapper.selectCount(wrapper);
    }
    @Override
    public List<String> importBatch(MultipartFile file,Integer id){
        List<Worktype> list = new ArrayList<>();
        if(id!=null){
    public List<String> importBatch(MultipartFile file ){
        /*  List<Worktype> list = new ArrayList<>();
      if(id!=null){
            Worktype param = new Worktype();
            param.setIsdeleted(Constants.ZERO);
            param.setDataType(Constants.ZERO);
            param.setInsuranceId(id);
            list = findList(param);
        }
        }*/
        ExcelImporter ie = null;
        List<WorktypeImport> dataList =null;
        try {
@@ -197,9 +197,9 @@
        }
         List<String> result = new ArrayList<>();
        for(WorktypeImport model : dataList){
            if(StringUtils.isNotBlank(model.getName()) && !isNewWorkTypeByName(model.getName(),list)){
//            if(StringUtils.isNotBlank(model.getName()) && !isNewWorkTypeByName(model.getName(),list)){
                result.add(model.getName());
            }
//            }
        }
        return result;
    }