WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

Browse Source
This commit is contained in:
高嵩
2023-03-29 19:25:43 +08:00
parent b78e416ad8 72a3baaddc
commit 31dd9677a1
10 changed files with 260 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java
+2
View File
@@ -153,4 +153,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
List<SysUser> getPPEmployeeList(@Param("thirdType") String thirdType);
void updateByIdPP (SysUser sysUser);
List<SysUser> getListUserName();
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml
+4
View File
@@ -222,4 +222,8 @@
id = #{id}
</update>
<select id="getListUserName" resultType="com.jero.modules.system.entity.SysUser">
select * from sys_user
</select>
</mapper>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java
+21 -20
View File
@@ -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;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java
+29 -17
View File
@@ -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;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java
-1
View File
@@ -21,7 +21,6 @@ public enum ProjectRoleEnum {
MANAGER("manage","11",""),
ADMIN("系统管理员","12",""),
VIEWER("Viewer","13",""),
DUTYPERSON("责任人","14","")
;
String name;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+133 -24
View File
@@ -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<Proj
private IProjectRelatedPersonnelService iProjectRelatedPersonnelService;
@Autowired
private IOSSFileService iOSSFileService;
@Autowired
private SysUserMapper sysUserMapper;
/**
* 保存
@@ -740,6 +743,16 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
}
data.setCertificationProgress_dictText(certificationProgress_dictText);
}
// String GetEndTime = String.valueOf(data.getEndTime());
// if(StringUtils.isNotEmpty(GetEndTime)){
// Date endTime = new Date();
// if(StringUtils.equals(cut,CutEnum.CN.getValue())){
// endTime = data.getEndTime();
// }else {
// endTime = data.getEndTime();
// }
// data.setEndTimeStr(String.valueOf(endTime));
// }
}
}
}
@@ -2965,11 +2978,17 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
//工程接口人engineeringInterfacePerson
String sdt = projectCertificationInventoryEO.getSdtName();
//责任人
String dutyPerson = projectCertificationInventoryEO.getDutyPersonName();
String dutyPerson = projectCertificationInventoryEO.getDutyPersonName();;
//交付物类型
String deliverableType = projectCertificationInventoryEO.getDeliverableTypeName();
String deliverableType = "";
if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
deliverableType = projectCertificationInventoryEO.getDeliverableTypeName();
}else {
deliverableType = projectCertificationInventoryEO.getDeliverableTypeNameEn();
}
//截止时间
Date endTime = projectCertificationInventoryEO.getEndTime();
String endTime = projectCertificationInventoryEO.getEndTimeStr();
//文件
//交付物模板
@@ -3089,7 +3108,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
//工程接口人
List<Map<String, String>> mapPersonList = (List<Map<String, String>>) objectMap.get("engineeringInterfacePersonList");
//所有人
List<Map<String, String>> allPersonList = (List<Map<String, String>>) objectMap.get("allPersonList");
// List<Map<String, String>> allPersonList = (List<Map<String, String>>) objectMap.get("allPersonList");
List<SysUser> 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<Proj
nameCn = "责任人";
nameEn = "Assignee";
//验证人员是否存在
personnelVerify(projectCertificationInventoryEO, errorMsg, msgList, dutyPerson, allPersonList,nameCn,nameEn, com.jero.modules.project.enums.ProjectRoleEnum.DUTYPERSON.getValue());
personDutyPerson(projectCertificationInventoryEO, errorMsg, msgList, dutyPerson, listUserName,nameCn,nameEn);
}else {
String message = "";
if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
@@ -3146,12 +3170,19 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
projectCertificationInventoryEO.setDeliverableTemplate(value);
}
//截止时间
SimpleDateFormat sd = new SimpleDateFormat();
String endTimeStr = sd.format(endTime);
if(StringUtils.isNotBlank(endTimeStr)){
// SimpleDateFormat sd = new SimpleDateFormat();
// String endTimeStr = sd.format(endTime);
if(StringUtils.isNotBlank(endTime)){
flag = dateVerify(projectCertificationInventoryEO, errorMsg, endTime,msgList,"截止时间","Due Date");
if(flag){
projectCertificationInventoryEO.setEndTime(projectCertificationInventoryEO.getEndTime());
SimpleDateFormat sd = new SimpleDateFormat();
Date date = null;
try {
date = sd.parse(endTime);
} catch (ParseException e) {
e.printStackTrace();
}
projectCertificationInventoryEO.setEndTime(date);
}
}else{
String message = "";
@@ -3187,14 +3218,14 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
}
private boolean dateVerify(ProjectCertificationInventoryEO projectCertificationInventoryEO,
String errorMsg, Date field, List<String> msgList, String nameCn, String nameEn) {
String errorMsg, String field, List<String> 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 ServiceImpl<Proj
}
msgList.add(errorMsg);
}
Date now = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
long longnow = now.getTime();
try {
Date date = sdf.parse(field);
long longdate = date.getTime();
if(longnow>longdate){
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<Proj
}
return null;
}
private void personDutyPerson(ProjectCertificationInventoryEO projectCertificationInventoryEO,
String errorMsg, List<String> msgList, String regulationOwnerId,
List<SysUser> 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<String> msgList, String regulationOwnerId,
List<Map<String, String>> mapList, String nameCn, String nameEn, String fieldNumber) {
@@ -3337,8 +3418,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
count ++;
if(com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(fieldNumber)){
projectCertificationInventoryEO.setSdt(stringStringMap.get("value"));
}else if(com.jero.modules.project.enums.ProjectRoleEnum.DUTYPERSON.getValue().equals(fieldNumber)){
projectCertificationInventoryEO.setDutyPerson(stringStringMap.get("value"));
}
break;
}
@@ -3456,12 +3535,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
List<OSSFile> 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<Proj
fileTemp.mkdirs();
//文件
exportFile(dataList,fileInfos);
for(int i =0 ;i<dataList.size();i++){
if(dataList.get(i).getValueType().equals(SysCategoryValueTypeEnum.FILE.getValue())){
if(StringUtils.isNotEmpty(dataList.get(i).getDeliveryResult())){
fileName = ossFileService.getFileInfos(dataList.get(i).getDeliveryResult()).stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(","));
dataList.get(i).setDeliveryResult(fileName);
}
}else if(dataList.get(i).getValueType().equals(SysCategoryValueTypeEnum.TEXT.getValue())){
if(StringUtils.isNotEmpty(dataList.get(i).getDeliveryResult())){
fileName = dataList.get(i).getDeliveryResult();
dataList.get(i).setDeliveryResult(fileName);
}
}else if(dataList.get(i).getValueType().equals(SysCategoryValueTypeEnum.NA.getValue())){
fileName = "";
dataList.get(i).setDeliveryResult(fileName);
}else if(dataList.get(i).getValueType().equals(SysCategoryValueTypeEnum.SELECT.getValue())) {
if (StringUtils.isNotEmpty(dataList.get(i).getDeliveryResult())) {
fileName = dataList.get(i).getDeliveryResult();
dataList.get(i).setDeliveryResult(fileName);
}
}
}
String excelName = projectCertificationInventoryEO.getExcelName()+".xlsx";
// String excelName = "";
// if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
@@ -3540,15 +3639,22 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
for(ProjectCertificationInventoryEO projectCertificationInventoryEO : dataList){
String deliverableTemplate = projectCertificationInventoryEO.getDeliverableTemplate();
String serialNumber = projectCertificationInventoryEO.getSerialNumber();
String deliveryResult = projectCertificationInventoryEO.getDeliveryResult();
if(StringUtils.isBlank(serialNumber)){
continue;
}
List<OSSFile> deliverableTemplateFileList = new ArrayList<>();
List<OSSFile> deliveryResultList = new ArrayList<>();
List<OSSFile> 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<Proj
if(StringUtils.isNotBlank(projectCertificationInventoryEO.getDeliverableTemplate())){
fileIdList.add(projectCertificationInventoryEO.getDeliverableTemplate());
}
if(StringUtils.isNotBlank(projectCertificationInventoryEO.getDeliveryResult())){
fileIdList.add(projectCertificationInventoryEO.getDeliveryResult());
}
}
//查询所有的文件
List<OSSFile> fileInfos = new ArrayList<>();
@@ -3679,8 +3788,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
case "*交付物类型": return "deliverableTypeName";
case "交付物模板": return "deliverableTemplateName";
case "交付结果": return "deliveryResult";
case "*截止日期": return "endTime";
// case "*截止日期": return "endTimeStr";
case "截止日期": return "endTime";
case "*截止日期": return "endTimeStr";
case "流程状态": return "flowStatus";
case "报告编号": return "reportNumber";
case "产品型号": return "productModel";
@@ -3697,8 +3806,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
case "*Deliverable Type": return "deliverableTypeNameEn";
case "Deliverable Template": return "deliverableTemplateName";
case "Deliverables Result": return "deliveryResult";
case "*Due Date": return "endTime";
// case "*Due Date": return "endTimeStr";
case "Due Date": return "endTime";
case "*Due Date": return "endTimeStr";
case "Process Status": return "flowStatus";
case "Report No": return "reportNumber";
case "Product Model": return "productModel";
jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue
+7 -4
View File
@@ -94,7 +94,7 @@
<a-form-model-item class="itemModel"
:prop="'dataList.'+index+'.dykzq'"
:rules="[{ required: true, message: $t('dykzq') + $t('cannotEmpty'), trigger: 'blur'},
{max: 50,message: $t('relevantSections') + $t('cannotExceed') + 50 + $t('Characters'),trigger: 'blur'
{max: 50,message: $t('dykzq') + $t('cannotExceed') + 50 + $t('Characters'),trigger: 'blur'
}]">
<a-input class="box-input"
:disabled="disabled"
@@ -104,7 +104,7 @@
</a-form-model-item>
<div class="header-text">
<a-icon class="icon-text" @click="addClick(index)" type="plus-circle"/>
<a-icon class="icon-text" v-if="formInline.dataList.length > 1" @click="deleteClick(index)"
<a-icon class="icon-text" v-if="formInline.dataList.length > 1" @click="deleteClick(index,'dataList.'+index+'.dykzq')"
type="minus-circle" :disabled="disabled"/>
</div>
</div>
@@ -166,7 +166,7 @@ export default {
message: this.$t('gnxt') + this.$t('cannotEmpty'),
trigger: 'blur'
},
{max: 50,message: this.$t('relevantSections') + this.$t('cannotExceed') + 50 + this.$t('Characters'),trigger: 'blur'
{max: 50,message: this.$t('gnxt') + this.$t('cannotExceed') + 50 + this.$t('Characters'),trigger: 'blur'
}
],
// dykzq: [
@@ -248,7 +248,10 @@ export default {
this.formInline.dataList.splice(index + 1, 0, {})
this.formInline = { ...this.formInline }
},
deleteClick(index) {
deleteClick(index,value) {
this.$nextTick(() => {
this.$refs.ruleForm.validateField([value])
})
this.formInline.dataList.splice(index, 1)
this.formInline = { ...this.formInline }
},
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+22 -22
View File
@@ -10,7 +10,7 @@
{{$t('templateDownload')}}
</div>
</div>
<a-spin :spinning="confirmLoading">
<a-form-model class="formAdd" ref="ruleForm" :model="form" :rules="rules">
<a-row :gutter="24">
@@ -20,7 +20,7 @@
<span class="title-text-text" :title="$t('selectTheVehicleTemplate')">{{$t('selectTheVehicleTemplate')}}</span>
</div>
<a-form-model-item class="itemModel" prop="dutyTerritory">
<a-select :disabled="disabled" class="box-input" v-model="form.cxmb" allowClear :placeholder="$t('PleaseSelect')" @change="update">
<a-select :disabled="disabled" class="box-input" v-model="form.cxmb" allowClear :placeholder="$t('PleaseSelect')" @change="update">
<a-select-option v-for="(item , key ) in selectListMb" :key="key" :value="item.id" >
{{ item.cpdjbh }}
</a-select-option>
@@ -59,7 +59,7 @@
</div>
</div>
</a-col>
<a-col :span="24">
<div class="box-title-text-add">
<div class="title-text-add plus">
@@ -82,7 +82,7 @@
</div>
<a-form-model-item class="itemModel">
<a-input disabled class="box-input" :placeholder="$t('pleaseEnter')" :title='form.cpsb' v-model="form.cpsb" :max-length="50"></a-input>
</a-form-model-item>
</div>
</a-col>
@@ -93,7 +93,7 @@
</div>
<a-form-model-item class="itemModel">
<a-input disabled class="box-input" :placeholder="$t('pleaseEnter')" :title='form.cpmc' v-model="form.cpmc" :max-length="50"></a-input>
</a-form-model-item>
</div>
</a-col>
@@ -104,7 +104,7 @@
</div>
<a-form-model-item class="itemModel">
<a-input disabled class="box-input" :placeholder="$t('pleaseEnter')" :title='form.cpxh' v-model="form.cpxh" :max-length="50"></a-input>
</a-form-model-item>
</div>
</a-col>
@@ -143,7 +143,7 @@
</a-form-model-item>
</div>
</a-col>
</a-row>
</a-form-model>
</a-spin>
@@ -192,7 +192,7 @@ import ImportFile from '@/components/ImportFileData/index'
this.getSelect()
this.getData()
},
methods: {
// 模板下载
handleModule() {
@@ -220,7 +220,7 @@ import ImportFile from '@/components/ImportFileData/index'
this.form=res.result
if(res.result.dllx1==null){
this.form.dllx1=undefined
}
if(res.result.dllx2==null){
this.form.dllx2=undefined
@@ -233,7 +233,7 @@ import ImportFile from '@/components/ImportFileData/index'
}
this.$forceUpdate()
}
}
})
},
@@ -258,7 +258,7 @@ import ImportFile from '@/components/ImportFileData/index'
})
}
})
},
next(){
this.save()
@@ -266,8 +266,8 @@ import ImportFile from '@/components/ImportFileData/index'
if(valid){
this.$emit('basicInformationForm')
}})
},
getSelect(){
getAction('/ota/otaBaCxList/list').then(res=>{
@@ -279,7 +279,7 @@ import ImportFile from '@/components/ImportFileData/index'
obj=item
this.selectListPc.push(obj)
}
})
}
})
@@ -306,12 +306,12 @@ import ImportFile from '@/components/ImportFileData/index'
}else{
this. projectNameList2=['其他']
}
},
changeId(value,option){
this.selectListPc.map(item=>{
if(item.id==value){
this.form.cpsb = item.cpsb
this.form.cpsb = item.cpsb
this.form.cpmc = item.cpmc
this.form.cpxh = item.cpxh
getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaIdT:'',otaId:item.id}).then(res=>{
@@ -338,9 +338,9 @@ import ImportFile from '@/components/ImportFileData/index'
}
.box-title-text-add {
line-height: 1.4;
//line-height: 1.4;
display: flex;
align-items: center;
}
.title-text-add {
@@ -354,7 +354,7 @@ import ImportFile from '@/components/ImportFileData/index'
// text-overflow: ellipsis;
// white-space: nowrap;
height: 42px;
line-height: 42px;
//line-height: 20px;
margin-top: 3px;
}
@@ -368,7 +368,7 @@ import ImportFile from '@/components/ImportFileData/index'
text-overflow: ellipsis;
white-space: nowrap;
height: 42px;
line-height: 42px;
//line-height: 42px;
margin-top: 3px;
margin-bottom: 20px;
}
@@ -400,11 +400,11 @@ import ImportFile from '@/components/ImportFileData/index'
}
.plus{
margin-top: 5px;
line-height: 1.4 !important;
line-height: 1.2;
}
.plus2{
word-break: break-all;
line-height: 1.3;
line-height: 1.2;
}
.Required {
color: red;
jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
+14 -10
View File
@@ -145,7 +145,7 @@
</div>
</a-col>
<a-col :span="24">
<div class="box-title-text-add">
<div class="plus">
<div class="title-text-add">
<span class="title-text-text" :title="$t('usernotificationmode')">{{$t('usernotificationmode')}}</span>
</div>
@@ -160,7 +160,7 @@
</div>
</a-col>
<a-col :span="24">
<div class="box-title-text-add">
<div class="plus">
<div class="title-text-add">
<span class="title-text-text" :title="$t('allupdatestotheusermanualareinformed')">{{$t('allupdatestotheusermanualareinformed')}}</span>
</div>
@@ -246,7 +246,7 @@ export default {
})
},
getData(){
let otaIdT=localStorage.getItem('otaIdT')
if(otaIdT==null){
otaIdT=''
@@ -257,11 +257,11 @@ export default {
}
getAction('/ota/otaBaSjGgnrfs/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
if(res.code == 200){
this.formInline= res.result ==null ? {
sjky:'车辆解闭锁功能可用，但不可驾驶',
sjbkygn:'除解闭锁均不可用'
} :res.result
} :res.result
this.formInline.id=res.result.id
this.$forceUpdate()
}
@@ -305,9 +305,9 @@ export default {
}
.box-title-text-add {
line-height: 1.4;
//line-height: 1.4;
display: flex;
align-items: center;
}
h1{
font-weight: 700;
@@ -322,9 +322,9 @@ h1{
margin-right: 16px;
//overflow: hidden;
//text-overflow: ellipsis;
white-space: nowrap;
//white-space: nowrap;
height: 42px;
line-height: 42px;
//line-height: 42px;
margin-top: 3px;
}
@@ -338,7 +338,7 @@ h1{
text-overflow: ellipsis;
white-space: nowrap;
height: 42px;
line-height: 42px;
//line-height: 42px;
margin-top: 3px;
margin-bottom: 20px;
}
@@ -371,4 +371,8 @@ h1{
left: 40%;
text-align: center!important;
}
.plus{
display: flex;
}
</style>
jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+28 -25
View File
@@ -19,7 +19,7 @@
<span class="title-text-text" :title="$t('selectTheVehicleTemplate')">{{$t('selectTheVehicleTemplate')}}</span>
</div>
<a-form-model-item class="itemModel" prop="dutyTerritory">
<a-select :disabled="disabled" class="box-input" v-model="form.cxmb" allowClear :placeholder="$t('PleaseSelect')" @change="changeId">
<a-select-option v-for="(item , key ) in selectList" :key="key" :value="item.id" >
{{ item.value }}
@@ -34,7 +34,7 @@
<span class="title-text-text" :title="$t('theNameOfFirm')">{{$t('theNameOfFirm')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-input
<a-input
:max-length="50"
:disabled="disabled"
class="box-input"
@@ -52,12 +52,12 @@
<span class="title-text-text" :title="$t('registrationnumber')">{{$t('registrationnumber')}}</span>
</div>
<a-form-model-item class="itemModel" prop="djbh">
<a-input
<a-input
:max-length="50"
:disabled="disabled"
:title='form.djbh'
class="box-input"
class="box-input"
:placeholder="$t('pleaseEnter')"
v-model.trim="form.djbh">
</a-input>
@@ -87,7 +87,7 @@
<span class="title-text-text" :title="$t('noticebatch')">{{$t('noticebatch')}}</span>
</div>
<a-form-model-item class="itemModel" prop="dutyTerritory">
<a-input
<a-input
:max-length="500"
:disabled="disabled"
:title='form.ggpc'
@@ -104,7 +104,7 @@
<span class="title-text-text" :title="$t('producttrademark')">{{$t('producttrademark')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-input
<a-input
:max-length="50"
:disabled="disabled"
:title='form.cpsb'
@@ -121,7 +121,7 @@
<span class="title-text-text" :title="$t('productname')">{{$t('productname')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-input
<a-input
:max-length="50"
:disabled="disabled"
:title='form.cpmc'
@@ -130,7 +130,7 @@
v-model="form.cpmc">
</a-input>
</a-form-model-item>
</div>
</a-col>
<a-col :span="24">
@@ -139,7 +139,7 @@
<span class="title-text-text" :title="$t('productModel')">{{$t('productModel')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-input
<a-input
:max-length="50"
:disabled="disabled"
:title='form.cpxh'
@@ -153,7 +153,7 @@
<a-col :span="24">
<div class="box-title-text-add">
<div class="title-text-add">
<span class="title-text-text" :title="$t('Vehicledynamictype')">{{$t('Vehicledynamictype')}}</span>
<span class="title-text-text plus3" :title="$t('Vehicledynamictype')">{{$t('Vehicledynamictype')}}</span>
</div>
<a-form-model-item class="itemModel" style="width: 38%">
<a-select class="box-input" v-model="form.dllx1" :disabled="disabled" :placeholder="$t('PleaseSelect')" @change="changeSelect($event,target)">
@@ -179,7 +179,7 @@
</div>
</a-col>
<a-col :span="24">
<div class="box-title-text-add">
<div>
<div class="title-text-add plus">
<span class="title-text-text " :title="$t('communicationTerminal')">{{$t('communicationTerminal')}}</span>
</div>
@@ -195,7 +195,7 @@
</div>
</a-col>
<a-col :span="24">
<div class="box-title-text-add">
<div>
<div class="title-text-add plus">
<span class="title-text-text" :title="$t('otaUpgradeManagementSystem')">{{$t('otaUpgradeManagementSystem')}}</span>
</div>
@@ -261,7 +261,7 @@ import { message } from 'ant-design-vue'
otaId:'',
rules:{
djbh:[
{
{
required: true,
message:this.$t('registrationnumber')+this.$t('cannotEmpty'),
trigger:'blur'
@@ -280,7 +280,7 @@ import { message } from 'ant-design-vue'
localStorage.removeItem('otaId')
localStorage.removeItem('otaIdT')
localStorage.setItem('otaIdT',value)
this.getData()
},
// 模板下载
@@ -344,8 +344,8 @@ import { message } from 'ant-design-vue'
this.$forceUpdate()
}
})
},
next(){
this.$refs.ruleForm.validate(valid=>{
@@ -354,10 +354,10 @@ import { message } from 'ant-design-vue'
setTimeout(()=>{
this.$emit('basicInformationForm')
},1000)
}
})
},
save(){
this.$refs.ruleForm.validate(valid=>{
@@ -387,7 +387,7 @@ import { message } from 'ant-design-vue'
}else{
this. projectNameList2=['其他']
}
},
update(){
this.$forceUpdate()
@@ -406,7 +406,7 @@ import { message } from 'ant-design-vue'
.box-title-text-add {
line-height: 1.4;
display: flex;
align-items: center;
}
.title-text-add {
@@ -420,7 +420,7 @@ import { message } from 'ant-design-vue'
// text-overflow: ellipsis;
// white-space: nowrap;
height: 42px;
line-height: 42px;
//line-height: 42px;
margin-top: 3px;
}
@@ -434,7 +434,7 @@ import { message } from 'ant-design-vue'
text-overflow: ellipsis;
white-space: nowrap;
height: 42px;
line-height: 42px;
//line-height: 42px;
margin-top: 3px;
margin-bottom: 20px;
}
@@ -477,11 +477,14 @@ import { message } from 'ant-design-vue'
}
.plus{
margin-top: 5px;
line-height: 1.4 !important;
line-height: 1.2;
}
.plus2{
width: 134px;
margin-top: 5px;
line-height: 1.4 !important;
line-height: 1.2;
}
.plus3{
word-break: break-word;
}
</style>