From 5ad13178ffc47c360833fff434114f4d24b4633a Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Thu, 30 Mar 2023 20:43:09 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussionessStandController.java | 6 +- .../impl/SarBussionessStandServiceImpl.java | 170 +++++++++++++++--- .../adc/da/slrs/sarUser/dao/TsUserDao.java | 3 + .../slrs/sarUser/service/ITsUserService.java | 2 + .../service/impl/TsUserServiceImpl.java | 6 + .../adc/da/utils/util/FieldConvertUtil.java | 10 +- 6 files changed, 173 insertions(+), 24 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 89656a53..6bb9f32f 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 @@ -467,7 +467,8 @@ public class SarBussionessStandController extends BaseController 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 standYear = rowList.get("*标准年份"); if (StringUtils.isNotBlank(standYear)) { if (standYear.length() > 100) { return Result.error("标准年份输入过长"); @@ -2162,7 +2290,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 100) { return Result.error("输入的标准名称过长"); @@ -2175,7 +2303,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 200) { return Result.error("输入的文本状态过长"); @@ -2207,7 +2335,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl { 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..8042889b 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 From 7932c3d986d5ed69a7400b16d0e8a70e13531d72 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 31 Mar 2023 00:27:07 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 165 +++++++++++------- .../adc/da/utils/util/FieldConvertUtil.java | 2 +- 2 files changed, 102 insertions(+), 65 deletions(-) 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 f919566e..66272da0 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 @@ -2045,7 +2045,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 100) { @@ -2287,20 +2290,17 @@ 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("*文本状态"); @@ -2308,7 +2308,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 200) { return Result.error("输入的文本状态过长"); } - switch (textStatusBuss) { case "发布": sarBussStandAttrInfo.setTextStatusBuss("6jnqba2mby"); @@ -2356,9 +2355,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 100) { @@ -2367,18 +2363,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 100) { @@ -2387,10 +2371,101 @@ public class SarBussionessStandServiceImpl extends ServiceImpl Date: Fri, 31 Mar 2023 09:25:11 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarBussionessStandController.java | 4 ++-- .../service/ISarBussionessStandService.java | 2 +- .../service/impl/SarBussionessStandServiceImpl.java | 3 +-- 3 files changed, 4 insertions(+), 5 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 6bb9f32f..fab3ae47 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|判断原文译文") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index a151748b..25a366cb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -58,7 +58,7 @@ public interface ISarBussionessStandService extends IService 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 66272da0..7f9817de 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,7 +2038,7 @@ 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)) { @@ -2466,7 +2466,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl Date: Fri, 31 Mar 2023 09:54:38 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) 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 7f9817de..2400a534 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 @@ -2341,17 +2341,22 @@ public class SarBussionessStandServiceImpl extends ServiceImpl Date: Fri, 31 Mar 2023 10:08:53 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E6=A0=87=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarBussionessStandServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 2400a534..5465ff1b 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 @@ -2486,8 +2486,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl Date: Fri, 31 Mar 2023 15:02:57 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarBussionessStandController.java | 2 ++ 1 file changed, 2 insertions(+) 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 fab3ae47..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 @@ -479,6 +479,8 @@ public class SarBussionessStandController extends BaseController Date: Fri, 31 Mar 2023 15:36:11 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 106 ++++++++++-------- 1 file changed, 60 insertions(+), 46 deletions(-) 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 5465ff1b..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 @@ -2148,7 +2148,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl list = new ArrayList<>();