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

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

Browse Source
This commit is contained in:
zyx.net
2023-09-26 11:24:45 +08:00
parent 9ba433461c d60ebb4a3c
commit 4a0a077188
2 changed files with 44 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+34 -12
View File
@@ -35,11 +35,9 @@ import com.jero.modules.platform.service.IPlatformProjectCertificationInventoryE
import com.jero.modules.platform.service.IPlatformProjectLawsInventoryEOService;
import com.jero.modules.platform.service.IPlatformProjectLibraryBaseService;
import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEO;
import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOEn;
import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOEnPlatform;
import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOPlatform;
import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
import com.jero.modules.project.entity.ProjectCertificationInventoryEOEn;
import com.jero.modules.project.entity.ProjectCertificationInventoryEOEnPlatform;
import com.jero.modules.project.entity.ProjectCertificationInventoryEOPlatform;
import com.jero.modules.project.entity.ProjectCertificationInventoryLogEO;
@@ -5529,26 +5527,50 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
if(ProjectRoleEnum.INTERFACE_PERSON.getValue().equals(roleCode) ||
ProjectRoleEnum.PERSON_LIABLE.getValue().equals(roleCode)){
workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryDutyEnginnerEOPlatform.class, copy);
List<ProjectCertificationInventoryDutyEnginnerEOPlatform> projectCertificationInventoryDutyEnginnerEOPlatformList = new ArrayList<>();
for (ProjectCertificationInventoryDutyEnginnerEO projectCertificationInventoryDutyEnginnerEO : copy) {
ProjectCertificationInventoryDutyEnginnerEOPlatform projectCertificationInventoryDutyEnginnerEOPlatform = new ProjectCertificationInventoryDutyEnginnerEOPlatform();
BeanUtils.copyProperties(projectCertificationInventoryDutyEnginnerEO,projectCertificationInventoryDutyEnginnerEOPlatform);
projectCertificationInventoryDutyEnginnerEOPlatformList.add(projectCertificationInventoryDutyEnginnerEOPlatform);
}
workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryDutyEnginnerEOPlatform.class, projectCertificationInventoryDutyEnginnerEOPlatformList);
}else{
workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryEOPlatform.class, dataList);
List<ProjectCertificationInventoryEOPlatform> projectCertificationInventoryEOPlatformList = new ArrayList<>();
for (ProjectCertificationInventoryEO certificationInventoryEO : dataList) {
ProjectCertificationInventoryEOPlatform projectCertificationInventoryEOPlatform = new ProjectCertificationInventoryEOPlatform();
BeanUtils.copyProperties(certificationInventoryEO,projectCertificationInventoryEOPlatform);
projectCertificationInventoryEOPlatformList.add(projectCertificationInventoryEOPlatform);
}
workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryEOPlatform.class, projectCertificationInventoryEOPlatformList);
}
}else{
if(ProjectRoleEnum.INTERFACE_PERSON.getValue().equals(roleCode) ||
ProjectRoleEnum.PERSON_LIABLE.getValue().equals(roleCode)){
List<ProjectCertificationInventoryDutyEnginnerEOEn> copyEn = new ArrayList<>();
// List<ProjectCertificationInventoryDutyEnginnerEOEn> copyEn = new ArrayList<>();
// for (ProjectCertificationInventoryDutyEnginnerEO projectCertificationInventoryDutyEnginnerEOTemp : copy) {
// ProjectCertificationInventoryDutyEnginnerEOEn projectCertificationInventoryDutyEnginnerEOEn = new ProjectCertificationInventoryDutyEnginnerEOEn();
// BeanUtils.copyProperties(projectCertificationInventoryDutyEnginnerEOTemp,projectCertificationInventoryDutyEnginnerEOEn);
// copyEn.add(projectCertificationInventoryDutyEnginnerEOEn);
// }
List<ProjectCertificationInventoryDutyEnginnerEOEnPlatform> copyEn = new ArrayList<>();
for (ProjectCertificationInventoryDutyEnginnerEO projectCertificationInventoryDutyEnginnerEOTemp : copy) {
ProjectCertificationInventoryDutyEnginnerEOEn projectCertificationInventoryDutyEnginnerEOEn = new ProjectCertificationInventoryDutyEnginnerEOEn();
BeanUtils.copyProperties(projectCertificationInventoryDutyEnginnerEOTemp,projectCertificationInventoryDutyEnginnerEOEn);
copyEn.add(projectCertificationInventoryDutyEnginnerEOEn);
ProjectCertificationInventoryDutyEnginnerEOEnPlatform projectCertificationInventoryDutyEnginnerEOEnPlatform = new ProjectCertificationInventoryDutyEnginnerEOEnPlatform();
BeanUtils.copyProperties(projectCertificationInventoryDutyEnginnerEOTemp,projectCertificationInventoryDutyEnginnerEOEnPlatform);
copyEn.add(projectCertificationInventoryDutyEnginnerEOEnPlatform);
}
workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryDutyEnginnerEOEnPlatform.class, copyEn);
}else{
List<ProjectCertificationInventoryEOEn> dataListEn = new ArrayList<>();
// List<ProjectCertificationInventoryEOEn> dataListEn = new ArrayList<>();
// for (ProjectCertificationInventoryEO projectCertificationInventoryEOTemp : dataList) {
// ProjectCertificationInventoryEOEn projectCertificationInventoryEOEn = new ProjectCertificationInventoryEOEn();
// BeanUtils.copyProperties(projectCertificationInventoryEOTemp,projectCertificationInventoryEOEn);
// dataListEn.add(projectCertificationInventoryEOEn);
// }
List<ProjectCertificationInventoryEOEnPlatform> dataListEn = new ArrayList<>();
for (ProjectCertificationInventoryEO projectCertificationInventoryEOTemp : dataList) {
ProjectCertificationInventoryEOEn projectCertificationInventoryEOEn = new ProjectCertificationInventoryEOEn();
BeanUtils.copyProperties(projectCertificationInventoryEOTemp,projectCertificationInventoryEOEn);
dataListEn.add(projectCertificationInventoryEOEn);
ProjectCertificationInventoryEOEnPlatform projectCertificationInventoryEOEnPlatform = new ProjectCertificationInventoryEOEnPlatform();
BeanUtils.copyProperties(projectCertificationInventoryEOTemp,projectCertificationInventoryEOEnPlatform);
dataListEn.add(projectCertificationInventoryEOEnPlatform);
}
//下拉选中英文转换
// transition(dataListEn,projectCertificationInventoryEO);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+10 -1
View File
@@ -9918,6 +9918,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String resultMsg = "";
ProcessHistoryEO citePhEo = null;
String flag = "";
if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
resultMsg = "引用交付物成功！";
} else {
@@ -9998,19 +9999,27 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if (ObjectUtils.isEmpty(citePhEo)) {
if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
flag = "error";
resultMsg = "所选引用项目中，没有匹配到数据，请重新选择！";
} else {
flag = "error";
resultMsg = "There is no matching data in the selected reference project. Please reselect!";
}
}
} else {
if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
flag = "error";
resultMsg = "所选引用项目中流程完成数据为空，请重新选择！";
} else {
flag = "error";
resultMsg = "The process completion data in the selected reference project is empty, please reselect!";
}
}
return Result.OK(resultMsg, citePhEo);
if(StringUtils.isNotBlank(flag)){
return Result.error(resultMsg);
}else{
return Result.OK(resultMsg, citePhEo);
}
}
@Override