|
|
|
@ -311,6 +311,16 @@ public class SampleProofTrackingServiceImpl implements SampleProofTrackingServic |
|
|
|
|
|
|
|
ProjectInfoTrackingData projectInfoData = new ProjectInfoTrackingData(); |
|
|
|
BeanUtils.copyProperties(data, projectInfoData); |
|
|
|
// c* 字段命名在不同 Bean 规范下存在歧义,显式赋值避免遗漏。 |
|
|
|
projectInfoData.setcProjectRegion(data.getcProjectRegion()); |
|
|
|
projectInfoData.setcQualityEngineer1(data.getcQualityEngineer1()); |
|
|
|
projectInfoData.setcQualityEngineer2(data.getcQualityEngineer2()); |
|
|
|
projectInfoData.setcQualityEngineer3(data.getcQualityEngineer3()); |
|
|
|
projectInfoData.setcQualityEngineer4(data.getcQualityEngineer4()); |
|
|
|
projectInfoData.setcQualityEngineer5(data.getcQualityEngineer5()); |
|
|
|
projectInfoData.setcQualityEngineer6(data.getcQualityEngineer6()); |
|
|
|
projectInfoData.setcManufactureEngineer(data.getcManufactureEngineer()); |
|
|
|
projectInfoData.setcQualityEngineer7(data.getcQualityEngineer7()); |
|
|
|
if (isBlank(projectInfoData.getProjectName()) && !isBlank(projectInfoData.getProjectDesc())) { |
|
|
|
projectInfoData.setProjectName(projectInfoData.getProjectDesc().trim()); |
|
|
|
} |
|
|
|
@ -324,6 +334,15 @@ public class SampleProofTrackingServiceImpl implements SampleProofTrackingServic |
|
|
|
|
|
|
|
ProjectPartTrackingData projectPartData = new ProjectPartTrackingData(); |
|
|
|
BeanUtils.copyProperties(data, projectPartData); |
|
|
|
// 与项目信息同理,确保一键修改时 c* 字段不会被拷贝机制吞掉。 |
|
|
|
projectPartData.setcQualityEngineer1(data.getcQualityEngineer1()); |
|
|
|
projectPartData.setcQualityEngineer2(data.getcQualityEngineer2()); |
|
|
|
projectPartData.setcQualityEngineer3(data.getcQualityEngineer3()); |
|
|
|
projectPartData.setcQualityEngineer4(data.getcQualityEngineer4()); |
|
|
|
projectPartData.setcQualityEngineer5(data.getcQualityEngineer5()); |
|
|
|
projectPartData.setcQualityEngineer6(data.getcQualityEngineer6()); |
|
|
|
projectPartData.setcManufactureEngineer(data.getcManufactureEngineer()); |
|
|
|
projectPartData.setcQualityEngineer7(data.getcQualityEngineer7()); |
|
|
|
projectPartData.setStatus(isBlank(data.getPartStatus()) ? "草稿" : data.getPartStatus().trim()); |
|
|
|
projectPartData.setPriority(data.getPriorityLevel()); |
|
|
|
projectPartData.setUpdateBy(operateUser); |
|
|
|
@ -448,9 +467,9 @@ public class SampleProofTrackingServiceImpl implements SampleProofTrackingServic |
|
|
|
if (isBlank(data.getProjectPhase())) { |
|
|
|
data.setProjectPhase("Sample"); |
|
|
|
} |
|
|
|
if (data.getProofingNumber() == null || data.getProofingNumber() <= 0) { |
|
|
|
/* if (data.getProofingNumber() == null || data.getProofingNumber() <= 0) { |
|
|
|
data.setProofingNumber(1); |
|
|
|
} |
|
|
|
}*/ |
|
|
|
if (data.getPlanStartDate() == null) { |
|
|
|
data.setPlanStartDate(new Date()); |
|
|
|
} |
|
|
|
|