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 14:17:10 +08:00
parent 1085bb1176 e9f11d5391
commit 0b13dfb42b
2 changed files with 26 additions and 19 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
+2 -1
View File
@@ -4496,7 +4496,8 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
projectCertificationInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", "")); projectCertificationInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", ""));
projectCertificationInventoryEOTemp.setProjectLibraryId(projectLibraryId); projectCertificationInventoryEOTemp.setProjectLibraryId(projectLibraryId);
projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
// projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
projectCertificationInventoryEOTemp.setCreateTime(new Date()); projectCertificationInventoryEOTemp.setCreateTime(new Date());
projectCertificationInventoryEOTemp.setUpdateTime(new Date()); projectCertificationInventoryEOTemp.setUpdateTime(new Date());
projectCertificationInventoryEOTemp.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue()); projectCertificationInventoryEOTemp.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+7 -1
View File
@@ -11897,6 +11897,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} else { } else {
inventoryEO.setVerifyDutyIdName(""); inventoryEO.setVerifyDutyIdName("");
} }
}
//设计交付物类型 //设计交付物类型
lawsInventoryEO.setDesignDeliverableType(lawsInventoryEOS.get(0).getDesignDeliverableType()); lawsInventoryEO.setDesignDeliverableType(lawsInventoryEOS.get(0).getDesignDeliverableType());
lawsInventoryEO.setDesignDeliverableTypeName(lawsInventoryEOS.get(0).getDesignDeliverableTypeName()); lawsInventoryEO.setDesignDeliverableTypeName(lawsInventoryEOS.get(0).getDesignDeliverableTypeName());
@@ -11915,7 +11916,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
lawsInventoryEO.setVerifyDutyId(lawsInventoryEOS.get(0).getVerifyDutyId()); lawsInventoryEO.setVerifyDutyId(lawsInventoryEOS.get(0).getVerifyDutyId());
lawsInventoryEO.setVerifyDutyIdName(lawsInventoryEOS.get(0).getVerifyDutyIdName()); lawsInventoryEO.setVerifyDutyIdName(lawsInventoryEOS.get(0).getVerifyDutyIdName());
}
lawsInventoryEO.setDesignDueDate(lawsInventoryEOS.get(0).getDesignDueDate());
lawsInventoryEO.setVerifyDueDate(lawsInventoryEOS.get(0).getVerifyDueDate());
lawsInventoryEO.setDesignRemark(lawsInventoryEOS.get(0).getDesignRemark());
lawsInventoryEO.setVerifyRemark(lawsInventoryEOS.get(0).getVerifyRemark());
} }
} }
} }