Browse Source

一键修改

master
han\hanst 8 hours ago
parent
commit
aeaec7a20f
  1. 77
      src/main/java/com/xujie/sys/modules/sampletracking/data/ProofTrackingData.java
  2. 23
      src/main/java/com/xujie/sys/modules/sampletracking/service/impl/SampleProofTrackingServiceImpl.java

77
src/main/java/com/xujie/sys/modules/sampletracking/data/ProofTrackingData.java

@ -273,5 +273,82 @@ public class ProofTrackingData extends QueryPage {
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField(exist = false)
private Date endDate;
/**
* 兼容 c* 字段在 Bean/OGNL/Jackson 场景下的属性名解析差异
* 统一提供 getc setc* 访问器确保前端 cProjectRegion/cQuality* 等字段在
* 一键创建/一键修改链路中可稳定落到 SQL 参数
*/
public String getcProjectRegion() {
return cProjectRegion;
}
public void setcProjectRegion(String cProjectRegion) {
this.cProjectRegion = cProjectRegion;
}
public String getcQualityEngineer1() {
return cQualityEngineer1;
}
public void setcQualityEngineer1(String cQualityEngineer1) {
this.cQualityEngineer1 = cQualityEngineer1;
}
public String getcQualityEngineer2() {
return cQualityEngineer2;
}
public void setcQualityEngineer2(String cQualityEngineer2) {
this.cQualityEngineer2 = cQualityEngineer2;
}
public String getcQualityEngineer3() {
return cQualityEngineer3;
}
public void setcQualityEngineer3(String cQualityEngineer3) {
this.cQualityEngineer3 = cQualityEngineer3;
}
public String getcQualityEngineer4() {
return cQualityEngineer4;
}
public void setcQualityEngineer4(String cQualityEngineer4) {
this.cQualityEngineer4 = cQualityEngineer4;
}
public String getcQualityEngineer5() {
return cQualityEngineer5;
}
public void setcQualityEngineer5(String cQualityEngineer5) {
this.cQualityEngineer5 = cQualityEngineer5;
}
public String getcQualityEngineer6() {
return cQualityEngineer6;
}
public void setcQualityEngineer6(String cQualityEngineer6) {
this.cQualityEngineer6 = cQualityEngineer6;
}
public String getcManufactureEngineer() {
return cManufactureEngineer;
}
public void setcManufactureEngineer(String cManufactureEngineer) {
this.cManufactureEngineer = cManufactureEngineer;
}
public String getcQualityEngineer7() {
return cQualityEngineer7;
}
public void setcQualityEngineer7(String cQualityEngineer7) {
this.cQualityEngineer7 = cQualityEngineer7;
}
}

23
src/main/java/com/xujie/sys/modules/sampletracking/service/impl/SampleProofTrackingServiceImpl.java

@ -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());
}

Loading…
Cancel
Save