|
@@ -570,6 +570,9 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
|
|
|
if (wbsContract != null) {
|
|
|
wbsContract.setContractId(String.valueOf(contractInfo.getId()));
|
|
|
wbsContract.setProjectId(projectId);
|
|
|
+ wbsContract.setClassName(wbsTreePrivate.getClassName());
|
|
|
+ wbsContract.setUnitName(wbsTreePrivate.getUnitName());
|
|
|
+ wbsContract.setIsClassifition(wbsTreePrivate.getIsClassifition());
|
|
|
listContract.add(wbsContract);
|
|
|
}
|
|
|
}
|
|
@@ -682,6 +685,9 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
|
|
|
if (wbsContract != null) {
|
|
|
wbsContract.setContractId(id.toString());
|
|
|
wbsContract.setProjectId(projectId);
|
|
|
+ wbsContract.setClassName(wbsTreePrivate.getClassName());
|
|
|
+ wbsContract.setUnitName(wbsTreePrivate.getUnitName());
|
|
|
+ wbsContract.setIsClassifition(wbsTreePrivate.getIsClassifition());
|
|
|
listContract.add(wbsContract);
|
|
|
}
|
|
|
}
|
|
@@ -744,6 +750,9 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
|
|
|
|| !Objects.equals(nonNull(a.getMixRatioTestIds()), nonNull(b.getMixRatioTestIds()))
|
|
|
|| !Objects.equals(nonNull(a.getInitTableId()), nonNull(b.getInitTableId()))
|
|
|
|| !Objects.equals(nonNull(a.getInitTableName()), nonNull(b.getInitTableName()))
|
|
|
+ || !Objects.equals(nonNull(a.getClassName()), nonNull(b.getClassName()))
|
|
|
+ || !Objects.equals(nonNull(a.getUnitName()), nonNull(b.getUnitName()))
|
|
|
+ || !Objects.equals(nonNull(a.getIsClassifition()), nonNull(b.getIsClassifition()))
|
|
|
|| !Objects.equals(a.getSort(), b.getSort());
|
|
|
}
|
|
|
|