From 4de795c255c6ed020b5b39bf44743ba0a3ca185c Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Tue, 4 Apr 2023 13:10:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E4=BC=98=E5=8C=96=E5=8F=8A=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussionessStandController.java | 8 +++ .../impl/SarBussionessStandServiceImpl.java | 57 ++++++++++--------- .../adc/da/utils/util/FieldConvertUtil.java | 4 +- 3 files changed, 39 insertions(+), 30 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 5053c5f4..d2a60dbc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -33,6 +33,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.ApiOperation; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.poi.hssf.usermodel.HSSFCellStyle; import org.apache.poi.hssf.usermodel.HSSFDateUtil; import org.apache.poi.hssf.usermodel.HSSFSheet; @@ -94,6 +95,9 @@ public class SarBussionessStandController extends BaseController importSarBussionessStandFile(@RequestParam(value = "file",required = false)MultipartFile file,String menuId,String userId) throws Exception{ + List tsResources = tsResourceService.getByMenuId(menuId); + if (ObjectUtils.isEmpty(tsResources)) { + return Result.error("请选择需要导入的目录"); + } return sarBussionessStandEOService.importSarBussionessStandFile(file,menuId,userId); } @ApiOperation(value = "|SarBussionessStand|判断原文译文") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 21a63880..e4f4371f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -259,8 +259,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl importSarBussionessStandFile(MultipartFile file,String menuId,String userId)throws Exception { - - List tsResources = tsResourceService.getByMenuId(menuId); - if (ObjectUtils.isEmpty(tsResources)) { - return Result.error("请选择需要导入的目录"); - } //给出头部信息 - String[] headerExcel = {"*企标类别,企标编号,*标准年份,*企标名称,企标英文名称,*文本状态,发布日期,企标实施日期,起草部门,起草人,适用车型,能源类型,适用产品线,体系类别,关联模块-乘用车VPPS编码,关联模块--卡车VPPS编码,发布稿,编制说明,历史版本,其他文件,修改单,代替企标编号,采用标准,采标程度,引用标准,关联文件,"}; + String[] headerExcel = {"*企标类别,*企标编号,*标准年份,*企标名称,企标英文名称,*文本状态,发布日期,企标实施日期,起草部门,起草人,适用车型,能源类型,适用产品线,体系类别,关联模块-乘用车VPPS编码,关联模块--卡车VPPS编码,发布稿,编制说明,历史版本,其他文件,修改单,代替企标编号,采用标准,采标程度,引用标准,关联文件,"}; //获取文件全称 String fileNameStr = file.getOriginalFilename(); @@ -2294,8 +2287,16 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 100){ + return Result.error("第"+ count +"行企标编号输入过长"); + } + sarBussStandAttrInfo.setStandNumber(standNumber); + }else { + return Result.error("第"+ count +"行企标编号不能为空"); + } + String standYear = rowList.get("*标准年份"); if (StringUtils.isNotBlank(standYear)) { @@ -2524,7 +2525,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl