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

Merge branch 'master' into 'fix_20230524'

Browse Source 
# Conflicts:
#   jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java
This commit is contained in:
高嵩
2023-06-14 18:30:56 +08:00
parent bbb0ccd043 522475cfd7
commit 2dfe98aea5
17 changed files with 323 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/CommonUtils.java
+1 -1
View File
@@ -220,7 +220,7 @@ public class CommonUtils {
*/
public static boolean limitFileSuffix(String fileName,String[] fileSuffixLimits){
final List<String> fileNameList = Arrays.asList(fileSuffixLimits);
boolean isExists = fileNameList.stream().anyMatch(name -> fileName.substring(0,fileName.lastIndexOf('.')).contains(name)||fileName.substring(fileName.lastIndexOf('.')).equals(name));
boolean isExists = fileNameList.stream().anyMatch(name -> fileName.substring(0,fileName.lastIndexOf('.')).contains(name)||fileName.substring(fileName.lastIndexOf('.')).contains(name));
return isExists;
}
/**
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+48 -6
View File
@@ -3789,9 +3789,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
+ "3.If the control type is drop-down multi-selection, multiple entries are separated by English or Chinese exclamation points\n"
+ "4.Configuration data is filled in according to the sequence of control type, and if there are multiple control types, it needs to be separated by \"#\"\n"
+ "5.When the control contains multiple component types, if you fill in only some of the information, you need to distinguish blank data with \"#\"\n"
+ "6.When filling in, start in column G and do not modify information such as NIO number and parameter name\n"
+ "7.File fields are file type, must create a folder in the directory of the same level as the file with the name of the nio number and place the file in the folder. Assume that the file is saved in the A number B.pdf,Should fill in A/B.pdf\n"
+ "8.When importing into the system, you need to put the Excel into a folder, place other attachment files correctly as required, and finally compress the folder into zip format for import\n";
+ "6.If the value contains multiple parameters, copy the row, insert and paste the contents of the row, and enter the corresponding parameter values in the newly pasted row\n"
+ "7.When filling in, start in column G and do not modify information such as NIO number and parameter name\n"
+ "8.File fields are file type, must create a folder in the directory of the same level as the file with the name of the nio number and place the file in the folder. Assume that the file is saved in the A number B.pdf,Should fill in A/B.pdf\n"
+ "9.When importing into the system, you need to put the Excel into a folder, place other attachment files correctly as required, and finally compress the folder into zip format for import\n";
} else {
explanation = "填写说明\n"
+ "1.导入数据从第三行开始,第一行为表头,第二行为填写说明,第三行是示例数据，需要从第四行开始填写\n"
@@ -3799,9 +3800,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
+ "3.控件类型为下拉多选时，填写多个时采用英文或中文感叹号分割\n"
+ "4.配置数据按照控件类型顺序进行填写，若存在多种控件类型填写时需要通过“#”隔开\n"
+ "5.控件中包含多种组件类型时，若只填写其中部分信息需要用#区分空白数据\n"
+ "6.填写时从G列开始，请勿修改NIO编号和参数名称等信息\n"
+ "7.上传附件为文件属性,填写时需要在本文件同级目录下以NIO编号为名称建立文件夹,并在文件夹下放置文件且该文件夹下只能有一层级,假设在NIO.XXXX下放置了B.pdf,则应填写NIO.XXXX/B.pdf\n"
+ "8.导入系统时，需要将该Excel放入文件夹内，并按照要求正确放置其他附件文件，最后将文件夹压缩为zip格式进行导入\n";
+ "6.填写值中包含多值参数时，需要复制行并插入粘贴行内容，并在新粘贴的行内填写相对应配置的参数值\n"
+ "7.填写时从G列开始，请勿修改NIO编号和参数名称等信息\n"
+ "8.上传附件为文件属性,填写时需要在本文件同级目录下以NIO编号为名称建立文件夹,并在文件夹下放置文件且该文件夹下只能有一层级,假设在NIO.XXXX下放置了B.pdf,则应填写NIO.XXXX/B.pdf\n"
+ "9.导入系统时，需要将该Excel放入文件夹内，并按照要求正确放置其他附件文件，最后将文件夹压缩为zip格式进行导入\n";
}
XSSFRow row2 = sheetItems.createRow(1);
row2.setHeight((short) 2500);
@@ -4346,6 +4348,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
List<String> dbFieldExampleList = new LinkedList<>();
// 固定列
int indexOfDescription = 1; // 参数名称的位置
for (int i = 0; i < fieldList.size(); i++) {
OnlCgformField onlCgformField = fieldList.get(i);
String dbFieldName = onlCgformField.getDbFieldName();
@@ -4356,6 +4359,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
|| "control_type".equals(dbFieldName) || "control_verify".equals(dbFieldName) || "control_values".equals(dbFieldName)
|| "is_must".equals(dbFieldName) || "references_col".equals(dbFieldName)) {
dbFieldList.add(dbFieldName);
if ("nio_number".equals(dbFieldName)) {
indexOfDescription = i;
}
if (CutEnum.CN.getValue().equals(cut)) {
dbFieldNameList.add(onlCgformField.getDbFieldTxt()); // 字段中文名
@@ -4417,6 +4423,26 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
dbFieldList.addAll(dbFieldListConfig);
dbFieldNameList.addAll(dbFieldNameListConfig);
// 认证类别列
List<String> dbFieldNameListCC = new LinkedList<>();
List<String> dbFieldListCC = new LinkedList<>();
// 查询所有认证类别
List<SysDictItem> sysDictItemList = sysDictItemService.selectItemsByDictCode("cert_category");
if (CutEnum.EN.getValue().equals(cut)) {
sysDictItemList.forEach(sysDictItem -> {
dbFieldListCC.add(sysDictItem.getItemValue());
dbFieldNameListCC.add(sysDictItem.getEnName() + " Number");
});
} else {
sysDictItemList.forEach(sysDictItem -> {
dbFieldListCC.add(sysDictItem.getItemValue());
dbFieldNameListCC.add(sysDictItem.getItemText() + "编号");
});
}
dbFieldList.addAll(dbFieldListCC);
dbFieldNameList.addAll(dbFieldNameListCC);
String[] title = new String[3];
String dbFieldStr = StringUtils.join(dbFieldList, ",");
String dbFieldNameStr = StringUtils.join(dbFieldNameList, ",");
@@ -4595,6 +4621,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
ParamsManifestEO paramsManifestEO = paramsManifestEOService.getById(paramsManifestId);
String paramsTemplateId = paramsManifestEO.getParamsTemplateId();
Integer paramsTemplatePublishVersion = paramsManifestEO.getParamsTemplatePublishVersion();
ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
BeanUtils.copyProperties(paramsCollectManifestVO, paramsCollectManifestEO);
@@ -4832,6 +4860,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
result.add(record1);
}*/
List<String> nioNumberList = dataList.stream().map(m -> (String) m.getNioNumber()).collect(Collectors.toList());
List<CertCategoryParamsInfoPublishEO> certCategoryParamsInfoPublishEOList = certCategoryParamsInfoPublishEOService.queryListByVersionAndNio(paramsTemplateId, paramsTemplatePublishVersion, nioNumberList); //查询所有认证类别参数项
for (ParamsCollectManifestEO collectManifestEO : exportDataList) {
Map<String, Object> record1 = objectToMapDre(collectManifestEO);
String controlType = (String) record1.get("control_type");
@@ -4844,6 +4875,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
record1.put("control_type", controlTypeMap.get(controlType));
record1.put("control_verify", controlVerifyMap.get(controlVerify));
// 认证类别列
List<CertCategoryParamsInfoPublishEO> certCategoryParamsInfoPublishEOS = certCategoryParamsInfoPublishEOList.stream().filter(e -> nioNumber.equals(e.getNioNumber())).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(certCategoryParamsInfoPublishEOS)) {
certCategoryParamsInfoPublishEOS.forEach(certCategoryParamsInfoPublishEO -> {
record1.put(certCategoryParamsInfoPublishEO.getCertCategory(), certCategoryParamsInfoPublishEO.getParamsNumber());
});
}
// 处理参考列，没引用过则不显示该列
if (StringUtils.isNotEmpty(paramsManifestEO.getReferencesColName()) && StringUtils.isNotEmpty(collectManifestEO.getReferencesCol())) {
List<String> referencesColList = Arrays.asList(collectManifestEO.getReferencesCol().split("#"));
@@ -5480,6 +5519,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
|| "is_must".equals(key) || "references_col".equals(key)) {
continue;
}
if(key.length() < 15){
continue;
}
//
ParamsConfigDataEO configDataEO = new ParamsConfigDataEO();
List<ParamsConfigDataEO> list = paramsConfigDataEOList.stream().filter(e -> collectManifestMap.get(nioNumber).equals(e.getParamsCollectManifestId())
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+19 -19
View File
@@ -4373,25 +4373,25 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//处理法规预警模块预警时间查询条件 flag = 0(新车实施日期), flag = 1(在产车实施日期)
String warnTime = (String) parameter.get("WarnTime");
if(StringUtils.isNotBlank(warnTime)){
if("0".equals(flag)){
//日期(区分单日期还时间范围)
if (warnTime.contains(",")) {
conditionSb.append(" and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') >= '" + warnTime.split(",")[0] + "'"
+ " and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'");
} else {
conditionSb.append(" and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') = '" + warnTime + "'");
}
}else{
//日期(区分单日期还时间范围)
if (warnTime.contains(",")) {
conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') >= '" + warnTime.split(",")[0] + "'"
+ " and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'");
} else {
conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') = '" + warnTime + "'");
}
}
}
// if(StringUtils.isNotBlank(warnTime)){
// if("0".equals(flag)){
// //日期(区分单日期还时间范围)
// if (warnTime.contains(",")) {
// conditionSb.append(" and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') >= '" + warnTime.split(",")[0] + "'"
// + " and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'");
// } else {
// conditionSb.append(" and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') = '" + warnTime + "'");
// }
// }else{
// //日期(区分单日期还时间范围)
// if (warnTime.contains(",")) {
// conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') >= '" + warnTime.split(",")[0] + "'"
// + " and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'");
// } else {
// conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') = '" + warnTime + "'");
// }
// }
// }
//高级搜索 queryConditionVOList List<QueryConditionVO>
if(ObjectUtils.isNotEmpty(parameter.get("queryConditionVOList"))){
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java
+2
View File
@@ -303,6 +303,8 @@ public class ProjectLawsInventoryEOController extends JeroController<ProjectLaws
try {
projectLawsInventoryEOService.setBatch(projectLawsInventoryEO);
} catch (Exception e) {
e.printStackTrace();
log.error("批量设置失败：" + e.getMessage());
if(CutEnum.CN.getValue().equals(cut)){
return Result.error("批量设置失败！");
}else{
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java
+16
View File
@@ -147,4 +147,20 @@ public class ProjectTaskPlanning implements Serializable {
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date eight;
/**mp*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date mp;
/**地方批准1*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date localapproval1;
/**地方批准2*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date localapproval2;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java
+1
View File
@@ -26,6 +26,7 @@ public enum ProjectTaskPlanningNameEnum {
G_FIVE("G5","G5"),
G_SIX("G6","G6"),
G_SEVEN("G7","G7"),
G_MP("MP","MP"),
// VERIFY_DEADLINE("验证符合性确认","Validation Compliance Confirmation"),
;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+145 -153
View File
@@ -618,29 +618,27 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if (allList.size() > 0) {
for (String allDuty : allDutyList) {
String dutyPerson = allDuty;
if (!StringUtils.isEmpty(dutyPerson)) {
if (!allList.contains(dutyPerson)) {
if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())) {
if (relatedPersonnel.getEngineeringInterfacePerson() != null) {
String engineeringInterfacePerson = dutyPerson + "," + relatedPersonnel.getEngineeringInterfacePerson();
relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson);
} else {
relatedPersonnel.setEngineeringInterfacePerson(dutyPerson);
}
} else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())) {
if (relatedPersonnel.getEngineerLawSet() != null) {
String engineerLawSet = dutyPerson + "," + relatedPersonnel.getEngineerLawSet();
relatedPersonnel.setEngineerLawSet(engineerLawSet);
} else {
relatedPersonnel.setEngineerLawSet(dutyPerson);
}
} else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) {
if (relatedPersonnel.getEngineerAttSet() != null) {
String engineerAttSet = dutyPerson + "," + relatedPersonnel.getEngineerAttSet();
relatedPersonnel.setEngineerAttSet(engineerAttSet);
} else {
relatedPersonnel.setEngineerAttSet(dutyPerson);
}
if (StringUtils.isNotEmpty(dutyPerson) && !allList.contains(dutyPerson) && StringUtils.isNotEmpty(roleCode1)) {
if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())) {
if (relatedPersonnel.getEngineeringInterfacePerson() != null) {
String engineeringInterfacePerson = dutyPerson + "," + relatedPersonnel.getEngineeringInterfacePerson();
relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson);
} else {
relatedPersonnel.setEngineeringInterfacePerson(dutyPerson);
}
} else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())) {
if (relatedPersonnel.getEngineerLawSet() != null) {
String engineerLawSet = dutyPerson + "," + relatedPersonnel.getEngineerLawSet();
relatedPersonnel.setEngineerLawSet(engineerLawSet);
} else {
relatedPersonnel.setEngineerLawSet(dutyPerson);
}
} else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) {
if (relatedPersonnel.getEngineerAttSet() != null) {
String engineerAttSet = dutyPerson + "," + relatedPersonnel.getEngineerAttSet();
relatedPersonnel.setEngineerAttSet(engineerAttSet);
} else {
relatedPersonnel.setEngineerAttSet(dutyPerson);
}
}
}
@@ -4429,171 +4427,165 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String DesdutyId = projectLawsInventoryEOList.get(0).getDesignDutyId();
String VerdutyId = projectLawsInventoryEOList.get(0).getVerifyDutyId();
String desdutyId = projectLawsInventoryEO.getDesignDutyId();
String verdutyId = projectLawsInventoryEO.getVerifyDutyId();
List<String> dutyTerritoryList = new ArrayList<>();
//获取批量设置中责任领域
String dutyTerritory = projectLawsInventoryEOList.get(0).getDutyTerritory();
if (!StringUtils.isEmpty(dutyTerritory)) {
String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
if (StringUtils.isNotEmpty(dutyTerritory)) {
for (ProjectLawsInventoryEO info : infoList) {
info.setDutyTerritory(dutyTerritory);
}
}
if (!StringUtils.isEmpty(DesdutyId)) {
dutyTerritoryList = Arrays.asList(dutyTerritory.split(","));
} else {
for (ProjectLawsInventoryEO info : infoList) {
info.setDesignDutyId(DesdutyId);
}
}
if (!StringUtils.isEmpty(VerdutyId)) {
for (ProjectLawsInventoryEO info : infoList) {
info.setVerifyDutyId(VerdutyId);
if (StringUtils.isNotEmpty(info.getDutyTerritory())) {
dutyTerritoryList.addAll(Arrays.asList(info.getDutyTerritory().split(",")));
}
}
}
if (!StringUtils.isEmpty(dutyTerritory)) {
dutyTerritoryList = Arrays.asList(dutyTerritory.split(","));
dutyTerritoryList = dutyTerritoryList.stream().distinct().collect(Collectors.toList());
} else {
dutyTerritoryList = dutyTerritoryList.stream().distinct().collect(Collectors.toList());
if (StringUtils.isNotEmpty(desdutyId)) {
for (ProjectLawsInventoryEO info : infoList) {
List<String> dutyList = new ArrayList<>();
dutyList = Arrays.asList(info.getDutyTerritory().split(","));
dutyTerritoryList.addAll(dutyList);
info.setDesignDutyId(desdutyId);
}
}
if (StringUtils.isNotEmpty(verdutyId)) {
for (ProjectLawsInventoryEO info : infoList) {
info.setVerifyDutyId(verdutyId);
}
dutyTerritoryList = dutyTerritoryList.stream().distinct().collect(Collectors.toList());
}
// 获取当前的projectLibrartId
String projectLibrartId = infoEOList.get(0).getProjectLibraryId();
String cut = infoEOList.get(0).getCut();
String projectLibrartId = infoList.get(0).getProjectLibraryId();
String cut = projectLawsInventoryEO.getCut();
Map<String, Object> params = new HashMap<>();
params.put("projectLibraryId", projectLibrartId);
params.put("userId", currentUser.getId());
params.put("modelType", RoleRelModelTypeEnum.LAWS_INVENTORY.getValue());
ProjectLibraryRoleRelEO projectLibraryRoleRelEO = projectLibraryRoleRelEOService.queryByProjectLibraryIdAndUserId(params);
//获取当前项目库id的studio工程师和认证工程师
List<String> studionList = new ArrayList<>();
List<String> certificationEngineerList = new ArrayList<>();
List<ProjectLibraryBase> projectLibraryBases = projectLibraryBaseService.queryById(projectLibrartId, cut);
String roleCode1 = projectLibraryRoleRelEO.getRoleCode();
if(CollectionUtils.isNotEmpty(dutyTerritoryList)){
//获取相关责任领域下的和projectLibrartId的相关人员名单的信息
List<ProjectRelatedPersonnel> projectRelatedPersonnelList = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritoy(projectLibrartId, dutyTerritoryList);
if(CollectionUtils.isNotEmpty(projectRelatedPersonnelList)){
List<ProjectRelatedPersonnel> updatePrpEoList = new ArrayList<>();
//获取相关责任领域下的和projectLibrartId的相关人员名单的信息
List<ProjectRelatedPersonnel> projectRelatedPersonnelList = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritoy(projectLibrartId, dutyTerritoryList);
for (ProjectLawsInventoryEO projectLawsInventoryEO1 : infoList) {
List<ProjectRelatedPersonnel> list = new ArrayList<>();
//分别获取当前编辑中的设计符合性和认证符合性责任人
List<String> designDutyIdList = new ArrayList<>();
if (StringUtils.isNotEmpty(projectLawsInventoryEO1.getDesignDutyId())) {
designDutyIdList = Arrays.asList(projectLawsInventoryEO1.getDesignDutyId().split(","));
}
for (ProjectLawsInventoryEO projectLawsInventoryEO1 : infoList) {
List<String> verifyDutyIdList = new ArrayList<>();
if (StringUtils.isNotEmpty(projectLawsInventoryEO1.getVerifyDutyId())) {
verifyDutyIdList = Arrays.asList(projectLawsInventoryEO1.getVerifyDutyId().split(","));
}
//分别获取当前编辑中的设计符合性和认证符合性责任人
List<String> designDutyIdList = new ArrayList<>();
designDutyIdList = Arrays.asList(projectLawsInventoryEO1.getDesignDutyId().split(","));
List<String> verifyDutyIdList = new ArrayList<>();
verifyDutyIdList = Arrays.asList(projectLawsInventoryEO1.getVerifyDutyId().split(","));
//allDutyList 为法规工程师中验证符合性和确认符合中的责任人
List<String> allDutyList = new ArrayList<>();
allDutyList.addAll(designDutyIdList);
allDutyList.addAll(verifyDutyIdList);
allDutyList = allDutyList.stream().distinct().collect(Collectors.toList());
//allDutyList 为法规工程师中验证符合性和确认符合中的责任人
List<String> allDutyList = new ArrayList<>();
allDutyList.addAll(designDutyIdList);
allDutyList.addAll(verifyDutyIdList);
allDutyList = allDutyList.stream().distinct().collect(Collectors.toList());
List<String> allList = new ArrayList<>();
List<String> enginnerList = new ArrayList<>();
List<String> lawEnginnerList = new ArrayList<>();
List<String> enginnerLawSetList = new ArrayList<>();
List<String> enginnerAttSetList = new ArrayList<>();
List<String> allList = new ArrayList<>();
List<String> enginnerList = new ArrayList<>();
List<String> lawEnginnerList = new ArrayList<>();
List<String> enginnerLawSetList = new ArrayList<>();
List<String> enginnerAttSetList = new ArrayList<>();
//根据相关人员名单获取的工程接口人
for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) {
String enginneringInterfacePerson = relatedPersonnel.getEngineeringInterfacePerson();
if (!StringUtils.isEmpty(enginneringInterfacePerson)) {
enginnerList = Arrays.stream(enginneringInterfacePerson.split(",")).collect(Collectors.toList());
allList.addAll(enginnerList);
}
}
//获取相关人员名单中的法规工程师
for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) {
String lawEngineer = relatedPersonnel.getLawEngineer();
if (!StringUtils.isEmpty(lawEngineer)) {
lawEnginnerList = Arrays.stream(lawEngineer.split(",")).collect(Collectors.toList());
allList.addAll(lawEnginnerList);
}
}
//获取相关人员名单中的工程接口-法规工程师设置
for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) {
String engineerLawSet = relatedPersonnel.getEngineerLawSet();
if (!StringUtils.isEmpty(engineerLawSet)) {
enginnerLawSetList = Arrays.stream(engineerLawSet.split(",")).collect(Collectors.toList());
allList.addAll(enginnerLawSetList);
}
}
//获取相关人员名单中的工程接口-认证工程师设置
for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) {
String engineerAttSet = relatedPersonnel.getEngineerAttSet();
if (!StringUtils.isEmpty(engineerAttSet)) {
enginnerAttSetList = Arrays.stream(engineerAttSet.split(",")).collect(Collectors.toList());
allList.addAll(enginnerAttSetList);
}
}
//获取当前项目库id的studio工程师和认证工程师
List<String> studionList = new ArrayList<>();
List<String> certificationEngineerList = new ArrayList<>();
List<ProjectLibraryBase> projectLibraryBases = projectLibraryBaseService.queryById(projectLibrartId, cut);
for (ProjectLibraryBase projectLibraryBase : projectLibraryBases) {
studionList.add(projectLibraryBase.getStudioEngineer());
for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) {
// 工程接口人
String enginneringInterfacePerson = relatedPersonnel.getEngineeringInterfacePerson();
if (!StringUtils.isEmpty(enginneringInterfacePerson)) {
enginnerList = Arrays.stream(enginneringInterfacePerson.split(",")).collect(Collectors.toList());
allList.addAll(enginnerList);
}
String certificationEngineer = projectLibraryBase.getCertificationEngineer();
if (!StringUtils.isEmpty(certificationEngineer)) {
certificationEngineerList = Arrays.stream(certificationEngineer.split(",")).collect(Collectors.toList());
allList.addAll(certificationEngineerList);
}
}
allList = allList.stream().filter(all -> {
return StringUtils.isNotBlank(all);
}).distinct().collect(Collectors.toList());
/*
for(String all : allList){
if(all.equals("")){
allList.remove(all);
}
}
*/
//遍历所有人alllist中是否包含责任人,如果包含，不用操作。
//-------如果不包含,再去判断当前用户的角色是studio、法规还是认证
for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) {
if (allList.size() > 0) {
for (String allDuty : allDutyList) {
String dutyPerson = allDuty;
if (!StringUtils.isEmpty(dutyPerson)) {
if (!allList.contains(dutyPerson)) {
if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())) {
if (relatedPersonnel.getEngineeringInterfacePerson() != null) {
String engineeringInterfacePerson = dutyPerson + "," + relatedPersonnel.getEngineeringInterfacePerson();
relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson);
} else {
relatedPersonnel.setEngineeringInterfacePerson(dutyPerson);
}
} else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())) {
if (relatedPersonnel.getEngineerLawSet() != null) {
String engineerLawSet = dutyPerson + "," + relatedPersonnel.getEngineerLawSet();
relatedPersonnel.setEngineerLawSet(engineerLawSet);
} else {
relatedPersonnel.setEngineerLawSet(dutyPerson);
}
} else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) {
if (relatedPersonnel.getEngineerAttSet() != null) {
String engineerAttSet = dutyPerson + "," + relatedPersonnel.getEngineerAttSet();
relatedPersonnel.setEngineerAttSet(engineerAttSet);
} else {
relatedPersonnel.setEngineerAttSet(dutyPerson);
// 法规工程师
String lawEngineer = relatedPersonnel.getLawEngineer();
if (!StringUtils.isEmpty(lawEngineer)) {
lawEnginnerList = Arrays.stream(lawEngineer.split(",")).collect(Collectors.toList());
allList.addAll(lawEnginnerList);
}
// 工程接口-法规工程师设置
String engineerLawSet = relatedPersonnel.getEngineerLawSet();
if (!StringUtils.isEmpty(engineerLawSet)) {
enginnerLawSetList = Arrays.stream(engineerLawSet.split(",")).collect(Collectors.toList());
allList.addAll(enginnerLawSetList);
}
// 工程接口-认证工程师设置
String engineerAttSet = relatedPersonnel.getEngineerAttSet();
if (!StringUtils.isEmpty(engineerAttSet)) {
enginnerAttSetList = Arrays.stream(engineerAttSet.split(",")).collect(Collectors.toList());
allList.addAll(enginnerAttSetList);
}
}
for (ProjectLibraryBase projectLibraryBase : projectLibraryBases) {
studionList.add(projectLibraryBase.getStudioEngineer());
String certificationEngineer = projectLibraryBase.getCertificationEngineer();
if (!StringUtils.isEmpty(certificationEngineer)) {
certificationEngineerList = Arrays.stream(certificationEngineer.split(",")).collect(Collectors.toList());
allList.addAll(certificationEngineerList);
}
}
allList = allList.stream().filter(all -> {
return StringUtils.isNotBlank(all);
}).distinct().collect(Collectors.toList());
//遍历所有人alllist中是否包含责任人,如果包含，不用操作。
//-------如果不包含,再去判断当前用户的角色是studio、法规还是认证
for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) {
if (allList.size() > 0) {
for (String allDuty : allDutyList) {
String dutyPerson = allDuty;
if (StringUtils.isNotEmpty(dutyPerson) && !allList.contains(dutyPerson) && StringUtils.isNotEmpty(roleCode1)) {
if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())) {
if (relatedPersonnel.getEngineeringInterfacePerson() != null) {
String engineeringInterfacePerson = dutyPerson + "," + relatedPersonnel.getEngineeringInterfacePerson();
relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson);
} else {
relatedPersonnel.setEngineeringInterfacePerson(dutyPerson);
}
} else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())) {
if (relatedPersonnel.getEngineerLawSet() != null) {
String engineerLawSet = dutyPerson + "," + relatedPersonnel.getEngineerLawSet();
relatedPersonnel.setEngineerLawSet(engineerLawSet);
} else {
relatedPersonnel.setEngineerLawSet(dutyPerson);
}
} else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) {
if (relatedPersonnel.getEngineerAttSet() != null) {
String engineerAttSet = dutyPerson + "," + relatedPersonnel.getEngineerAttSet();
relatedPersonnel.setEngineerAttSet(engineerAttSet);
} else {
relatedPersonnel.setEngineerAttSet(dutyPerson);
}
}
}
}
}
}
updatePrpEoList.addAll(projectRelatedPersonnelList);
}
this.projectRelatedPersonnelService.updateBatchById(updatePrpEoList);
}
list.addAll(projectRelatedPersonnelList);
// this.projectRelatedPersonnelService.updateBatchById(projectRelatedPersonnelList);
}
this.projectRelatedPersonnelService.updateBatchById(list);
projectLawsInventoryEOList.forEach(projectLawsInventory -> {
//更新三个符合性流程中的处理人。
this.updateFlowInfo(projectLawsInventory);
@@ -6846,7 +6838,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
params.put("projectLawsInventoryIds", projectLawsInventoryIds);
params.put("pIds", pIds);
//根据流程实例id 、 法规清单id 删除相关流程。
workFlowFeignClient.deleteProcessInstanceByProjectLawsInventoryIds(params);
// workFlowFeignClient.deleteProcessInstanceByProjectLawsInventoryIds(params);
//清除流程中心对应的数据
params.put("ids", ids);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+6
View File
@@ -2469,6 +2469,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
if (ObjectUtils.isNotEmpty(TimeNodeVOsList) && TimeNodeVOsList.size() > 0) {
List<TimeNodeVO> TimeNodeVOList = TimeNodeVOsList.get(0);
for (TimeNodeVO tnVo : TimeNodeVOList) {
if(tnVo.isG()){
continue;
}
if (null != postNodeTnVo) {
break;
}
@@ -2505,6 +2508,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
if (ObjectUtils.isNotEmpty(TimeNodeVOsList) && TimeNodeVOsList.size() > 0) {
List<TimeNodeVO> TimeNodeVOList = TimeNodeVOsList.get(0);
for (TimeNodeVO tnVo : TimeNodeVOList) {
if(tnVo.isG()){
continue;
}
tnVo.setProjectId(plb.getId());
preNodeList.addAll(getNodeProgressList(tnVo));
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java
+66
View File
@@ -299,6 +299,52 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
timeNodeVOS.add(certificationSubmissionVo);
}
//地方批准1
if(ObjectUtils.isNotEmpty(projectTaskPlanning.getLocalapproval1())){
TimeNodeVO certificationSubmissionVo = new TimeNodeVO();
if(CutEnum.CN.getValue().equals(cut)){
certificationSubmissionVo.setName(ProjectTaskPlanningNameEnum.LOCALAPPROVAL_1.getName());
}else{
certificationSubmissionVo.setName(ProjectTaskPlanningNameEnum.LOCALAPPROVAL_1.getValue());
}
certificationSubmissionVo.setTime(projectTaskPlanning.getLocalapproval1());
if(projectTaskPlanning.getLocalapproval1().after(trueNow)){
certificationSubmissionVo.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
}else if(projectTaskPlanning.getLocalapproval1().before(trueNow)){
certificationSubmissionVo.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
}else{
certificationSubmissionVo.setStatus(PlanStatusEnum.ON_GOING.getValue());
}
certificationSubmissionVo.setProjectId(projectTaskPlanning.getProjectId());
certificationSubmissionVo.setG(false);
timeNodeVOS.add(certificationSubmissionVo);
}
//地方批准2
if(ObjectUtils.isNotEmpty(projectTaskPlanning.getLocalapproval2())){
TimeNodeVO certificationSubmissionVo = new TimeNodeVO();
if(CutEnum.CN.getValue().equals(cut)){
certificationSubmissionVo.setName(ProjectTaskPlanningNameEnum.LOCALAPPROVAL_2.getName());
}else{
certificationSubmissionVo.setName(ProjectTaskPlanningNameEnum.LOCALAPPROVAL_2.getValue());
}
certificationSubmissionVo.setTime(projectTaskPlanning.getLocalapproval2());
if(projectTaskPlanning.getLocalapproval2().after(trueNow)){
certificationSubmissionVo.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
}else if(projectTaskPlanning.getLocalapproval2().before(trueNow)){
certificationSubmissionVo.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
}else{
certificationSubmissionVo.setStatus(PlanStatusEnum.ON_GOING.getValue());
}
certificationSubmissionVo.setProjectId(projectTaskPlanning.getProjectId());
certificationSubmissionVo.setG(false);
timeNodeVOS.add(certificationSubmissionVo);
}
// G0 - G7
if(ObjectUtils.isNotEmpty(projectTaskPlanning.getZero())){
TimeNodeVO timeNodeVO = new TimeNodeVO();
@@ -453,6 +499,26 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
timeNodeVOS.add(timeNodeVO);
}
if(ObjectUtils.isNotEmpty(projectTaskPlanning.getMp())){
TimeNodeVO timeNodeVO = new TimeNodeVO();
if(CutEnum.CN.getValue().equals(cut)){
timeNodeVO.setName(ProjectTaskPlanningNameEnum.G_MP.getName());
}else{
timeNodeVO.setName(ProjectTaskPlanningNameEnum.G_MP.getValue());
}
timeNodeVO.setTime(projectTaskPlanning.getMp());
if(projectTaskPlanning.getMp().after(trueNow)){
timeNodeVO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
}else if(projectTaskPlanning.getMp().before(trueNow)){
timeNodeVO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
}else{
timeNodeVO.setStatus(PlanStatusEnum.ON_GOING.getValue());
}
timeNodeVO.setProjectId(projectTaskPlanning.getProjectId());
timeNodeVO.setG(true);
timeNodeVOS.add(timeNodeVO);
}
// 排序
// Collections.sort(timeNodeVOS, listConfirmationVO);
timeNodeVOS = timeNodeVOS.stream()
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java
+3 -1
View File
@@ -102,7 +102,7 @@ public class LawsWarnService {
} else if(StringUtils.equals(flag,"1")){
parameter.put("implement_time",parameter.get("WarnTime"));
}
parameter.remove("WarnTime");
// parameter.remove("WarnTime");
String cut = (String) parameter.get("cut");//中英文切换标识
List<OnlCgformField> onlCgformFieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
@@ -122,6 +122,8 @@ public class LawsWarnService {
fieldListNew.add(fieldTemp);
}
}
//封装查询条件
String condition = bussDocumentLibraryEOService.getConditionStr(parameter);
int pageNo = Integer.parseInt(parameter.get("pageNo").toString());
jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
+1 -1
View File
@@ -282,7 +282,7 @@ jero :
type: STANDALONE
enabled: true
# 文件限制后缀黑名单
fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin
fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin,$DATA
# 跨站白名单
whiteUrls:
#cas单点登录
jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml
+1 -1
View File
@@ -253,7 +253,7 @@ jero :
type: STANDALONE
enabled: true
# 文件限制后缀黑名单
fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin
fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin,$DATA
# 跨站白名单
whiteUrls:
#cas单点登录
jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml
+1 -1
View File
@@ -257,7 +257,7 @@ jero :
type: STANDALONE
enabled: true
# 文件限制后缀黑名单
fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin
fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin,$DATA
# 跨站白名单
whiteUrls:
#cas单点登录
jero-web/src/common/lang/en-us.js
+1
View File
@@ -1333,6 +1333,7 @@ module.exports = {
inRecentMonths6:'In recent 6 months',
inRecentYear1:'In recent 1 year',
inRecentYear2:'In recent 2 year',
inRecentYear3:'In recent 3 year',
selectAll:'Select All',
importLocalDisassemblyOrder:'Import local disassembly order',
notExport:'Not exported',
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -1435,6 +1435,7 @@ module.exports = {
inRecentMonths6: '近6个月内',
inRecentYear1: '近1年内',
inRecentYear2: '近2年内',
inRecentYear3: '近3年内',
selectAll: '全选',
importLocalDisassemblyOrder: '导入本地拆解单',
notExport: '未导出',
jero-web/src/components/search/index.vue
+4 -1
View File
@@ -245,7 +245,7 @@
if (this.isDefault) {
let startTime = moment(new Date()).format('YYYY-MM-DD')
// this.queryParam['WarnTimeText'] = '2'
let endTime = this.getNowdate()
let endTime = '2099-01-01'
this.queryParam['WarnTime'] = [startTime, endTime]
this.queryParam = { ...this.queryParam }
}
@@ -295,6 +295,9 @@
}else if (this.queryParam['WarnTimeText'] == '5') {
monthData = 7
yearData = -1
}else if (this.queryParam['WarnTimeText'] == '6') {
monthData = 37
yearData = 3
}
if(this.queryParam['WarnTimeText'] == '5'){
var time = new Date();
jero-web/src/views/regulatoryEarlyWarning/index.vue
+7 -1
View File
@@ -155,7 +155,10 @@
value: '4',
name: this.$t('inRecentYear2')
},
{
value: '6',
name: this.$t('inRecentYear3')
},
]
}
],
@@ -338,6 +341,9 @@
} else if (this.searchParmes['WarnTimeText'] == '4') {
monthData = 25
yearData = 2
}else if (this.queryParam['WarnTimeText'] == '6') {
monthData = 37
yearData = 3
}
var date_now = new Date()//获取当前时间
var year = date_now.getFullYear()//获取当前时间的年份