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 89656a53..0f88e75c 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 @@ -419,9 +419,9 @@ public class SarBussionessStandController extends BaseController importSarBussionessStandFile(@RequestParam(value = "file",required = false)MultipartFile file,String menuId) throws Exception{ + public ResponseMessage importSarBussionessStandFile(@RequestParam(value = "file",required = false)MultipartFile file,String menuId,String userId) throws Exception{ - return sarBussionessStandEOService.importSarBussionessStandFile(file,menuId); + return sarBussionessStandEOService.importSarBussionessStandFile(file,menuId,userId); } @ApiOperation(value = "|SarBussionessStand|判断原文译文") @@ -467,7 +467,8 @@ public class SarBussionessStandController extends BaseController ResponseMessage emptyFileAnewStorage(String type); - ResponseMessage importSarBussionessStandFile(MultipartFile file,String menuId)throws Exception; + ResponseMessage importSarBussionessStandFile(MultipartFile file,String menuId,String userId)throws Exception; ResponseMessage repetitionFile(); 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 767e8b85..a0227d72 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 @@ -2038,14 +2038,14 @@ public class SarBussionessStandServiceImpl extends ServiceImpl importSarBussionessStandFile(MultipartFile file,String menuId)throws Exception { + public ResponseMessage 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(); @@ -2095,24 +2095,35 @@ public class SarBussionessStandServiceImpl extends ServiceImpl rowList = new LinkedHashMap<>(); for (int j = 0; j < columNos; j++) { Cell cell = row.getCell(j); Cell headerCell = headerRow.getCell(j); if (cell != null) { - if (i == 0) { - cell.setCellType(CellType.STRING); - sb.append(cell.getStringCellValue() + ","); + if (i == 1) { +// cell.setCellType(CellType.STRING); +// sb.append(cell.getStringCellValue() + ","); } else { if (CellType.NUMERIC == cell.getCellType() && HSSFDateUtil.isCellDateFormatted(cell)) { Date d = cell.getDateCellValue(); @@ -2123,7 +2134,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 100) { return Result.error("企标类别输入过长"); } - sarBussStandAttrInfo.setStandSort(standSort); + switch (standSort){ + case "BZJ": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "FT": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q-HD": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q-IOUM": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/ASB": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/BFC": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/BQB": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/CBFC": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/FD": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/FL": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/FT A": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/FT B": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/FT E": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/FT F": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/FT G": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/FT M": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/FT P": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/FT Q": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/FT R": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/FT S": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/FT T": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/FT V": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/FT X": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/FT Y": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/FT Z": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/MGB": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/QCBFC": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/QCFLC": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/SGZGS": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/SH": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q/SY": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "QB/NE": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "QC/T": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "QJ/SH": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "Q房/AYJ": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "TFT": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "津Q/NK": + sarBussStandAttrInfo.setStandSort(standSort); + break; + case "鲁Q/LX": + sarBussStandAttrInfo.setStandSort(standSort); + break; + default: + return Result.error("请输入正确的企标类别"); + } } else { return Result.error("企标类别不能为空"); } - String standYear = rowList.get("标准年份"); + String standNumber = rowList.get("企标编号"); + sarBussStandAttrInfo.setStandNumber(standNumber); + + String standYear = rowList.get("*标准年份"); if (StringUtils.isNotBlank(standYear)) { if (standYear.length() > 100) { return Result.error("标准年份输入过长"); @@ -2159,28 +2290,24 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 100) { - return Result.error("输入的标准名称过长"); + return Result.error("输入的企标名称过长"); } sarBussStandAttrInfo.setStandName(standName); } else { - return Result.error("中文名称不能为空"); + return Result.error("企标名称不能为空"); } - String standEnName = rowList.get("英文名称"); + String standEnName = rowList.get("企标英文名称"); sarBussStandAttrInfo.setStandEnName(standEnName); - String textStatusBuss = rowList.get("文本状态"); + String textStatusBuss = rowList.get("*文本状态"); if (StringUtils.isNotBlank(textStatusBuss)) { if (textStatusBuss.length() > 200) { return Result.error("输入的文本状态过长"); } - switch (textStatusBuss) { case "发布": sarBussStandAttrInfo.setTextStatusBuss("6jnqba2mby"); @@ -2207,30 +2334,32 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 100) { @@ -2239,18 +2368,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 100) { @@ -2259,15 +2376,109 @@ public class SarBussionessStandServiceImpl extends ServiceImpl list = new ArrayList<>(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java index b523c42a..1fd546fe 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java @@ -72,4 +72,7 @@ public interface TsUserDao extends BaseMapper { Integer selectUserByRole(@Param("role") RoleUserDTO roleSelectDTO); List selectUserByRoleByPage(@Param("role") RoleUserDTO roleSelectDTO); + + @Select("select UNAME from ts_user where USID = #{userId}") + String selectByName(String userId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java index d850a34a..fd625467 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java @@ -90,4 +90,6 @@ public interface ITsUserService extends IService { List selectNameById(List strings,String type); IPage getAllUsers(TsUser tsUser); + + String userIdByName(String userId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java index cb59428d..d4310ff6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java @@ -522,5 +522,11 @@ public class TsUserServiceImpl extends ServiceImpl implements return tsUserPage; } + @Override + public String userIdByName(String userId) { + String userName = tsUserDao.selectByName(userId); + return userName; + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java index f56e16a3..81115275 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java @@ -68,7 +68,15 @@ public class FieldConvertUtil { "在产车实施日期(项目),EOP实施日期(项目),实施说明,认证交付物,认证对象,监管类型,适用车辆类型,责任部门,相关部门,FO,项目评估角色," + "文本说明,标签,要求类型,清单类型,入库模块"; - public static String exportFieldName = "企标类别,标准年份,企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期,企标制修订状态,起草部门,代替企标编号,复审日期,起草人,被代替企标编号,采用标准,文件上传人员,采标程度,引用标准,适用车型,能源类型,适用产品线,体系类别,备案日期,关联模块-乘用车VPPS编码,关联模块--卡车VPPS编码,发布稿附件,编制说明附件,历史版本附件,其他文件附件,修改单附件,关联文件附件"; + public static String exportName = "填写说明\n" + + "1.导入数据从第三行开始,第一行为填写说明,第二行为表头,第三行是正式数据\n" + + "2.所有带*号的字段必须填写\n" + + "3.状态,类别字段是单选属性,必须和系统中的对应字段选项相匹配\n" + + "4.适用车型,能源类型,适用产品线字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文或中文逗号分割\n" + + "5.发布日期,企标实施日期,复审日期字段为日期,必须精确到日\n" + + "6.编号,企标名称,企标英文名称字段为文本,填写文本内容"; + + public static String exportFieldName = "*企标类别,企标编号,*标准年份,*企标名称,企标英文名称,*文本状态,发布日期,企标实施日期,起草部门,起草人,适用车型,能源类型,适用产品线,体系类别,关联模块-乘用车VPPS编码,关联模块--卡车VPPS编码,代替企标编号,采用标准,采标程度,引用标准,发布稿附件,编制说明附件,历史版本附件,其他文件附件,修改单附件,关联文件附件,"; /*** * @Description: Clob类型 转String