From 908795cd980b6aa99d6582a2b053dff8c972b6ad Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Wed, 29 Mar 2023 18:04:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E9=AA=8C=E8=AF=81=E5=92=8C?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/mapper/SysUserMapper.java | 2 + .../system/mapper/xml/SysUserMapper.xml | 4 + .../ProjectCertificationInventoryEO.java | 41 ++--- .../ProjectCertificationInventoryEOEn.java | 46 +++-- .../project/enums/ProjectRoleEnum.java | 1 - ...ctCertificationInventoryEOServiceImpl.java | 157 +++++++++++++++--- 6 files changed, 189 insertions(+), 62 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java index 2bd69698c..c9dcb01e8 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java @@ -153,4 +153,6 @@ public interface SysUserMapper extends BaseMapper { List getPPEmployeeList(@Param("thirdType") String thirdType); void updateByIdPP (SysUser sysUser); + + List getListUserName(); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml index 4f19d362b..414f333b2 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml @@ -222,4 +222,8 @@ id = #{id} + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java index 54c3fb880..09da7697e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java @@ -65,28 +65,28 @@ public class ProjectCertificationInventoryEO implements Serializable { private String sysOrgCode; /**类别*/ - @Excel(name = "类别", width = 15) + @Excel(name = "类别", width = 20) @ApiModelProperty(value = "类别") private String category; /**检验项目*/ - @Excel(name = "检验项目", width = 15) + @Excel(name = "检验项目", width = 20) @ApiModelProperty(value = "检验项目") private String inspectionItem; /**配置项*/ - @Excel(name = "配置项", width = 15) + @Excel(name = "配置项", width = 20) @ApiModelProperty(value = "配置项") @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4") private String configItem; /**WVTA ID*/ - @Excel(name = "WVTA ID", width = 15) + @Excel(name = "WVTA ID", width = 20) @ApiModelProperty(value = "WVTA ID") private String wvtaId; /**标准编号*/ - @Excel(name = "*标准编号", width = 15) + @Excel(name = "*标准编号", width = 20) @ApiModelProperty(value = "标准编号") private String serialNumber; @@ -94,7 +94,7 @@ public class ProjectCertificationInventoryEO implements Serializable { @ApiModelProperty(value = "责任领域") private String dutyTerritory; /**责任领域名称**/ - @Excel(name = "*责任领域", width = 15) + @Excel(name = "*责任领域", width = 20) @TableField(exist = false) private String dutyTerritoryName; /**责任领域名称-英文**/ @@ -105,7 +105,7 @@ public class ProjectCertificationInventoryEO implements Serializable { @ApiModelProperty(value = "工程接口人") private String sdt; /**工程接口人名称**/ - @Excel(name = "工程接口人", width = 15) + @Excel(name = "工程接口人", width = 20) @TableField(exist = false) private String sdtName; @@ -113,7 +113,7 @@ public class ProjectCertificationInventoryEO implements Serializable { @ApiModelProperty(value = "责任人") private String dutyPerson; /**责任人名称**/ - @Excel(name = "责任人", width = 15) + @Excel(name = "责任人", width = 20) @TableField(exist = false) private String dutyPersonName; @@ -121,7 +121,7 @@ public class ProjectCertificationInventoryEO implements Serializable { @ApiModelProperty(value = "交付物类型") private String deliverableType; // 交付物类型名称 - @Excel(name = "交付物类型", width = 15) + @Excel(name = "交付物类型", width = 20) @TableField(exist = false) private String deliverableTypeName; // 交付物类型名称-英文 @@ -144,16 +144,16 @@ public class ProjectCertificationInventoryEO implements Serializable { private String deliverableTemplate; /**交付物模板名称**/ @TableField(exist = false) - @Excel(name = "交付物模板", width = 15) + @Excel(name = "交付物模板", width = 20) private String deliverableTemplateName; /**交付结果*/ - @Excel(name = "交付结果", width = 15) + @Excel(name = "交付结果", width = 20) @ApiModelProperty(value = "交付结果") private String deliveryResult; /**截止日期*/ - @Excel(name = "截止日期", width = 15, format = "yyyy-MM-dd") + @Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "截止日期") @@ -162,31 +162,32 @@ public class ProjectCertificationInventoryEO implements Serializable { @ApiModelProperty(value = "流程状态") private String flowStatus; // 流程状态展示名称 - @Excel(name = "流程状态", width = 15) + @Excel(name = "流程状态", width = 20) @TableField(exist = false) private String flowStatusName; /**报告编号*/ - @Excel(name = "报告编号", width = 15) + @Excel(name = "报告编号", width = 20) @ApiModelProperty(value = "报告编号") private String reportNumber; /**产品型号*/ - @Excel(name = "产品型号", width = 15) + @Excel(name = "产品型号", width = 20) @ApiModelProperty(value = "产品型号") private String productModel; /**生产企业名称*/ - @Excel(name = "生产企业名称", width = 15) + @Excel(name = "生产企业名称", width = 20) @ApiModelProperty(value = "生产企业名称") private String productionEnterpriseName; /**认证进度*/ - @Excel(name = "认证进度", width = 15) + @ApiModelProperty(value = "认证进度") private String certificationProgress; /**认证进度展示名称**/ + @Excel(name = "认证进度", width = 20) @TableField(exist = false) private String certificationProgress_dictText; @@ -214,7 +215,7 @@ public class ProjectCertificationInventoryEO implements Serializable { @TableField(exist = false) private String excelName; -// @Excel(name = "截止日期", width = 15, format = "yyyy-MM-dd") -// @TableField(exist = false) -// private String endTimeStr; +// @Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd") + @TableField(exist = false) + private String endTimeStr; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java index 1f31acd54..3b3cdd292 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java @@ -63,28 +63,28 @@ public class ProjectCertificationInventoryEOEn implements Serializable { private java.lang.String sysOrgCode; /**类别*/ - @Excel(name = "Category", width = 15) + @Excel(name = "Category", width = 20) @ApiModelProperty(value = "类别") private java.lang.String category; /**检验项目*/ - @Excel(name = "Inspection Items", width = 15) + @Excel(name = "Inspection Items", width = 20) @ApiModelProperty(value = "检验项目") private java.lang.String inspectionItem; /**配置项*/ - @Excel(name = "Configuration Item", width = 15) + @Excel(name = "Configuration Item", width = 20) @ApiModelProperty(value = "配置项") @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4") private java.lang.String configItem; /**WVTA ID*/ - @Excel(name = "WVTA ID", width = 15) + @Excel(name = "WVTA ID", width = 20) @ApiModelProperty(value = "WVTA ID") private java.lang.String wvtaId; /**标准编号*/ - @Excel(name = "*Standard No", width = 15) + @Excel(name = "*Standard No", width = 20) @ApiModelProperty(value = "标准编号") private java.lang.String serialNumber; @@ -92,7 +92,7 @@ public class ProjectCertificationInventoryEOEn implements Serializable { @ApiModelProperty(value = "责任领域") private java.lang.String dutyTerritory; /**责任领域名称**/ - @Excel(name = "*Responsible Field", width = 15) + @Excel(name = "*Responsible Field", width = 20) @TableField(exist = false) private String dutyTerritoryName; /**责任领域名称-英文**/ @@ -103,7 +103,7 @@ public class ProjectCertificationInventoryEOEn implements Serializable { @ApiModelProperty(value = "工程接口人") private java.lang.String sdt; /**工程接口人名称**/ - @Excel(name = "Eng. Interface", width = 15) + @Excel(name = "Eng. Interface", width = 20) @TableField(exist = false) private String sdtName; @@ -111,7 +111,7 @@ public class ProjectCertificationInventoryEOEn implements Serializable { @ApiModelProperty(value = "责任人") private java.lang.String dutyPerson; /**责任人名称**/ - @Excel(name = "Assignee", width = 15) + @Excel(name = "Assignee", width = 20) @TableField(exist = false) private String dutyPersonName; @@ -119,7 +119,7 @@ public class ProjectCertificationInventoryEOEn implements Serializable { @ApiModelProperty(value = "交付物类型") private java.lang.String deliverableType; // 交付物类型名称 - @Excel(name = "Deliverable Type", width = 15) + @Excel(name = "Deliverable Type", width = 20) @TableField(exist = false) private String deliverableTypeName; // 交付物类型名称-英文 @@ -142,16 +142,16 @@ public class ProjectCertificationInventoryEOEn implements Serializable { private java.lang.String deliverableTemplate; /**交付物模板名称**/ @TableField(exist = false) - @Excel(name = "交付物模板", width = 15) + @Excel(name = "交付物模板", width = 20) private String deliverableTemplateName; /**交付结果*/ - @Excel(name = "Deliverables Result", width = 15) + @Excel(name = "Deliverables Result", width = 20) @ApiModelProperty(value = "交付结果") private java.lang.String deliveryResult; /**截止日期*/ - @Excel(name = "Due Date", width = 15, format = "yyyy-MM-dd") + @Excel(name = "Due Date", width = 20, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "截止日期") @@ -161,32 +161,33 @@ public class ProjectCertificationInventoryEOEn implements Serializable { @ApiModelProperty(value = "流程状态") private java.lang.String flowStatus; // 流程状态展示名称 - @Excel(name = "Process Status", width = 15) + @Excel(name = "Process Status", width = 20) @TableField(exist = false) private String flowStatusName; /**报告编号*/ - @Excel(name = "Report No", width = 15) + @Excel(name = "Report No", width = 20) @ApiModelProperty(value = "报告编号") private java.lang.String reportNumber; /**产品型号*/ - @Excel(name = "Product Model", width = 15) + @Excel(name = "Product Model", width = 20) @ApiModelProperty(value = "产品型号") private java.lang.String productModel; /**生产企业名称*/ - @Excel(name = "Name Of Manufacturer", width = 15) + @Excel(name = "Name Of Manufacturer", width = 40) @ApiModelProperty(value = "生产企业名称") private java.lang.String productionEnterpriseName; /**认证进度*/ - @Excel(name = "Homologation Progress", width = 15) + @ApiModelProperty(value = "认证进度") private java.lang.String certificationProgress; /**认证进度展示名称**/ @TableField(exist = false) + @Excel(name = "Homologation Progress", width = 40) private String certificationProgress_dictText; // @Excel(name = "认证进度备注", width = 15) @@ -205,4 +206,15 @@ public class ProjectCertificationInventoryEOEn implements Serializable { @TableField(exist = false) private String roleCode; + + /**值类型，对应SysCategoryValueTypeEnum中value**/ + @TableField(exist = false) + private String valueType; + + @TableField(exist = false) + private String excelName; + + // @Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd") + @TableField(exist = false) + private String endTimeStr; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java index cbffa1463..24bfda6e3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java @@ -21,7 +21,6 @@ public enum ProjectRoleEnum { MANAGER("manage","11",""), ADMIN("系统管理员","12",""), VIEWER("Viewer","13",""), - DUTYPERSON("责任人","14","") ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index f003acfa6..78289d860 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -45,6 +45,7 @@ import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.enums.SysCategoryValueTypeEnum; import com.jero.modules.system.mapper.SysCategoryMapper; import com.jero.modules.system.mapper.SysRoleMapper; +import com.jero.modules.system.mapper.SysUserMapper; import com.jero.modules.system.service.ISysCategoryService; import com.jero.modules.system.service.ISysDictItemService; import com.jero.modules.system.service.ISysUserService; @@ -155,6 +156,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl> mapPersonList = (List>) objectMap.get("engineeringInterfacePersonList"); //所有人 - List> allPersonList = (List>) objectMap.get("allPersonList"); +// List> allPersonList = (List>) objectMap.get("allPersonList"); + + List listUserName = new ArrayList<>(); + listUserName = sysUserMapper.getListUserName(); + listUserName = listUserName.stream().distinct().collect(Collectors.toList()); + String nameCn = ""; String nameEn = ""; @@ -3113,7 +3137,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl msgList, String nameCn, String nameEn) { + String errorMsg, String field, List msgList, String nameCn, String nameEn) { //判断格式是否正确 boolean flag = true; if(ObjectUtils.isNotEmpty(field)){ - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - String format = sdf.format(field); - if (!DateUtils.isValidDate(format)) { +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); +// String format = sdf.format(field); + if (!DateUtils.isValidDate(field)) { flag = false; if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ errorMsg += nameCn + "格式不正确, 正确格式如:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日"; @@ -3203,6 +3234,24 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpllongdate){ + flag = false; + if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ + errorMsg += nameCn + "不能导入今天之前的日期"; + }else{ + errorMsg += nameEn + " Cannot import dates before today "; + } + msgList.add(errorMsg); + } + } catch (ParseException e) { + e.printStackTrace(); + } } return flag; } @@ -3315,7 +3364,39 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl msgList, String regulationOwnerId, + List listUserName ,String nameCn, String nameEn){ + //单选 + if(regulationOwnerId.contains(",")){ + if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ + errorMsg += nameCn + "导入只能填写一个用户名, "; + }else{ + errorMsg += "Only one user name can be entered for"+ nameEn +"import, "; + } + msgList.add(errorMsg); + } + int count =0; + for(SysUser name : listUserName){ + if(StringUtils.isNotEmpty(name.getUsername())){ + if(name.getUsername().equals(regulationOwnerId)){ + count++; + String id = name.getId(); + projectCertificationInventoryEO.setDutyPerson(id); + break; + } + } + } + if(count==0){ + if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ + errorMsg += nameCn+regulationOwnerId+"与所有人员名单不匹配"; + }else{ + errorMsg += nameEn+regulationOwnerId+"does not match a person with all person list"; + } + msgList.add(errorMsg); + } + } private void personnelVerify(ProjectCertificationInventoryEO projectCertificationInventoryEO, String errorMsg, List msgList, String regulationOwnerId, List> mapList, String nameCn, String nameEn, String fieldNumber) { @@ -3337,8 +3418,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl fileInfos = getOssFiles(dataList); //处理文件名称 + String fileName = ""; for (int i = 0; i < dataList.size(); i++) { - if(StringUtils.isNotEmpty(dataList.get(i).getDeliveryResult())){ - String fileName = ossFileService.getFileInfos(dataList.get(i).getDeliveryResult()).stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(",")); - dataList.get(i).setDeliveryResult(fileName); - - } if(StringUtils.isNotEmpty(dataList.get(i).getDeliverableTemplate())){ String deliverableTemplateName = template(fileInfos, dataList.get(i).getDeliverableTemplate()); dataList.get(i).setDeliverableTemplateName(deliverableTemplateName); @@ -3482,6 +3557,30 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl deliverableTemplateFileList = new ArrayList<>(); + List deliveryResultList = new ArrayList<>(); List oSSFileList = new ArrayList<>(); if(StringUtils.isNotBlank(deliverableTemplate)){ deliverableTemplateFileList = fileInfos.stream().filter(e -> deliverableTemplate.contains(e.getId())).collect(Collectors.toList()); oSSFileList.addAll(deliverableTemplateFileList); } + if(StringUtils.isNotBlank(deliveryResult) && projectCertificationInventoryEO.getValueType().equals(SysCategoryValueTypeEnum.FILE.getValue())){ + deliveryResultList = fileInfos.stream().filter(e -> deliveryResult.contains(e.getId())).collect(Collectors.toList()); + oSSFileList.addAll(deliveryResultList); + + } if(oSSFileList.size() != 0){ String fileNowPath = uploadpath + "/tempZip/" + serialNumber; File file = new File(fileNowPath); @@ -3594,6 +3700,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl fileInfos = new ArrayList<>(); @@ -3679,8 +3788,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl