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-04-06 13:26:22 +08:00
parent 758c5a41fc a52f4a0b38
commit 1d792c0d99
14 changed files with 242 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
+4 -4
View File
@@ -1744,17 +1744,17 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
String title = "";
if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
title = "*类别,*检验项目,*配置项,*WVTA ID," +
"*编号,*责任领域,交付物模板,*交付物类型,";
"*编号,*责任领域,*交付物类型,交付物模板,";
}else{
title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID," +
"*Number,*Responsible Field,Deliverable Template,*Deliverable Type,";
"*Number,*Responsible Field,*Deliverable Type,Deliverable Template,";
}
List<String> list = Arrays.asList(title.split(","));
int index = 0;
if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
index = list.indexOf("*交付物类型") + 1;
index = list.indexOf("交付物模板") + 1;
}else{
index = list.indexOf("*Deliverable Type") + 1;
index = list.indexOf("Deliverable Template") + 1;
}
//创建临时文件夹
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+16
View File
@@ -1446,6 +1446,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
map.put("db_field_txt", paramsConfigEO.getConfigName());
map.put("type", true); //配置列 标识
map.put("isLock", paramsConfigEO.getIsLock()); //配置列 冻结标识
map.put("headFieldCn","查看");
map.put("headFieldEn","View");
map.put("moduleFlag","参数项收集清单");
map.put("field",paramsConfigEO.getId());
listConfig.add(map);
}
@@ -1454,6 +1458,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
for (int i = 0; i < fieldList.size(); i++) {
OnlCgformField onlCgformField = fieldList.get(i);
Map<String, Object> map = new HashMap<>();
map.put("headFieldCn",onlCgformField.getDbFieldTxt());
map.put("headFieldEn",onlCgformField.getDbFieldEnName());
map.put("moduleFlag","参数项收集清单");
map.put("field",onlCgformField.getDbFieldName());
String dbFieldName = onlCgformField.getDbFieldName();
if ("nio_number".equals(dbFieldName) || "params_name".equals(dbFieldName)) {
map.put("click5", true);
@@ -1532,6 +1540,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
}
Map<String, Object> operatorMap = new HashMap<>();
operatorMap.put("headFieldCn","操作");
operatorMap.put("headFieldEn","Operation");
operatorMap.put("moduleFlag","参数项收集清单");
if (CutEnum.CN.getValue().equals(cut)) {
operatorMap.put("db_field_txt", "操作");
} else {
@@ -1541,6 +1552,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
list.add(operatorMap);
list.addAll(indexOfDescription + 1, listConfig);
int count = 0;
for (Map<String, Object> map : list) {
//排序字段赋值，用于自定义列表
map.put("sortParams",String.valueOf(count++));
}
return list;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java
+2 -4
View File
@@ -1,6 +1,7 @@
package com.jero.modules.head.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.constant.enums.CutEnum;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.head.entity.HeadCustomEO;
@@ -8,7 +9,6 @@ import com.jero.modules.head.enums.AffirmFlagEnum;
import com.jero.modules.head.mapper.HeadCustomEOMapper;
import com.jero.modules.head.service.IHeadCustomEOService;
import com.jero.modules.head.vo.HeadCustomVO;
import net.sf.saxon.functions.ConstantFunction;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
@@ -17,14 +17,12 @@ import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
import java.util.Date;
import java.util.UUID;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 自定义表头
* @Author: jero-boot
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+18 -16
View File
@@ -725,9 +725,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
try {
String titleOne = "";
if(CutEnum.CN.getValue().equals(cut)){
titleOne = "责任领域,法规工程师,工程接口人,认证工程师,备注";
titleOne = "责任领域,法规工程师,工程接口人,工程接口人-法规工程师设置,工程接口人-认证工程师设置,备注";
}else{
titleOne = "Responsible Field,Regulation Engineer,Engineering Interface,Homologation Engineer,Comments";
titleOne = "Responsible Field,Regulation Engineer,Engineering Interface,Project Interface Person Regulation Engineer Setting,Project Interface Person Certification Engineer Setting,Comments";
}
//创建临时文件夹
@@ -799,8 +799,10 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
dataRow.createCell(0).setCellValue(dataList.get(j - 2).getDutyTerritory());
dataRow.createCell(1).setCellValue(dataList.get(j - 2).getLawEngineerName());
dataRow.createCell(2).setCellValue(dataList.get(j - 2).getEngineeringInterfacePersonName());
dataRow.createCell(3).setCellValue(dataList.get(j - 2).getCertificationEngineerName());
dataRow.createCell(4).setCellValue(dataList.get(j - 2).getRemark());
//dataRow.createCell(3).setCellValue(dataList.get(j - 2).getCertificationEngineerName());
dataRow.createCell(3).setCellValue(dataList.get(j - 2).getEngineerLawSetName());
dataRow.createCell(4).setCellValue(dataList.get(j - 2).getEngineerAttSetName());
dataRow.createCell(5).setCellValue(dataList.get(j - 2).getRemark());
}
}
@@ -1076,7 +1078,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
String lawEngineerName = row.getCell(1, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
String engineeringInterfacePersonName = row.getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
String certificationEngineerName = row.getCell(3,Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
// String certificationEngineerName = row.getCell(3,Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
if(StringUtils.isBlank(lawEngineerName)){
projectRelatedPersonnel.setLawEngineerName("");
@@ -1088,11 +1090,11 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
}else{
projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringInterfacePersonName);
}
if(StringUtils.isBlank(certificationEngineerName)){
/*if(StringUtils.isBlank(certificationEngineerName)){
projectRelatedPersonnel.setCertificationEngineerName("");
}else{
projectRelatedPersonnel.setCertificationEngineerName(certificationEngineerName);
}
}*/
// //除了责任领域全有值->可以
// if(StringUtils.isNotBlank(lawEngineerName) && StringUtils.isNotBlank(engineeringInterfacePersonName) && StringUtils.isNotBlank(certificationEngineerName)) {
// projectRelatedPersonnel.setLawEngineerName(lawEngineerName);
@@ -1112,7 +1114,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
// }
//导入的备注为数字,被识别成小数点后一位
Cell remarkCell = row.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
Cell remarkCell = row.getCell(3, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
remarkCell.setCellType(CellType.STRING);
String remark = remarkCell.toString();
if(StringUtils.isNotEmpty(remark)) {
@@ -1358,7 +1360,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
if (StringUtils.isNotBlank(projectRelatedPersonnel.getCertificationEngineerName())){
List<String> certificationEngineerNameList = Arrays.asList(projectRelatedPersonnel.getCertificationEngineerName().split(","));
//校验是否为项目基础表设定的认证工程师
List<ProjectRelatedPersonnel> baseCertificationEngineerList = queryCertificationEngineer(projectId);
/*List<ProjectRelatedPersonnel> baseCertificationEngineerList = queryCertificationEngineer(projectId);
List<String> baseCertificationEngineerNameList = baseCertificationEngineerList.stream().map(e -> e.getCertificationEngineerName()).collect(Collectors.toList());
//转为小写后在判断
List<String> baseCertificationEngineerNameListTemp = new ArrayList<>();
@@ -1375,7 +1377,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
}
break;
}
}
}*/
// for(String certificationEngineerName : certificationEngineerNameList){
// if(!baseCertificationEngineerNameList.contains(certificationEngineerName.toLowerCase())){
// //中英切换提示语
@@ -1641,25 +1643,25 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
//法规工程师异常提示语
if(ProjectRoleEnum.REGULATI_ENGINEER.getValue().equals(personnelType)){
if(CutEnum.CN.getValue().equals(cut)) {
message.append("导入的工程接口人姓名有误,请检查第" + row + "行");
message.append("导入的法规工程师姓名有误,请检查第" + row + "行。");
}else{
message.append("The imported engineering interface person is wrong.Please check line " + row );
message.append("The imported Regulatory engineer is wrong.Please check line " + row +".");
}
}
//认证工程师异常提示语
if(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(personnelType)){
if(CutEnum.CN.getValue().equals(cut)) {
message.append("导入的认证工程师姓名有误,请检查第" + row + "行");
message.append("导入的认证工程师姓名有误,请检查第" + row + "行。");
}else {
message.append("The imported certification engineer is wrong.Please check line " + row );
message.append("The imported certification engineer is wrong.Please check line " + row +".");
}
}
//工程接口人异常提示语
if(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(personnelType)){
if(CutEnum.CN.getValue().equals(cut)) {
message.append("导入的工程接口人姓名有误,请检查第" + row + "行");
message.append("导入的工程接口人姓名有误,请检查第" + row + "行。");
}else{
message.append("The imported engineering interface person is wrong.Please check line " + row );
message.append("The imported engineering interface person is wrong.Please check line " + row +".");
}
}
}else{