|
@@ -79,23 +79,19 @@ public class ProjectTest1 {
|
|
|
aftermarket.setMaintenanceSaleChargeMan(chuanyunBuildProject.getSalesDirector().getObjectId());
|
|
|
aftermarket.setImplProManager(chuanyunBuildProject.getImplementationManager().getObjectId());
|
|
|
|
|
|
-// List<ChuanyunMaintenanceProDO> maintenanceProList = new ArrayList<>();
|
|
|
-// if (chuanyunBuildProject.getMaintenanceProList().size() > 0) {
|
|
|
+// Object[] maintenanceProList = new String[]{};
|
|
|
+// int index = 0;
|
|
|
+// if(chuanyunBuildProject.getMaintenanceProList().size() > 0){
|
|
|
// for (int j = 0; j < chuanyunBuildProject.getMaintenanceProList().size(); j++) {
|
|
|
-// ChuanyunMaintenanceProDO chuanyunMaintenanceProDO = chuanyunBuildProject.getMaintenanceProList().get(j);
|
|
|
-// ChuanyunMaintenanceProDO newChuanyunMaintenanceProDO = new ChuanyunMaintenanceProDO();
|
|
|
-// newChuanyunMaintenanceProDO.setProProperty(chuanyunMaintenanceProDO.getProProperty());
|
|
|
-// newChuanyunMaintenanceProDO.setProContent(chuanyunMaintenanceProDO.getProContent());
|
|
|
-// newChuanyunMaintenanceProDO.setProVersion(chuanyunMaintenanceProDO.getProVersion());
|
|
|
-// newChuanyunMaintenanceProDO.setMaintenanceChargeMan(chuanyunMaintenanceProDO.getMaintenanceChargeMan());
|
|
|
-// newChuanyunMaintenanceProDO.setRemark(chuanyunMaintenanceProDO.getRemark());
|
|
|
-// // log.info("{chuanyunMaintenanceProDO => {}}", chuanyunMaintenanceProDO);
|
|
|
-// maintenanceProList.add(newChuanyunMaintenanceProDO);
|
|
|
+// maintenanceProList[index] = chuanyunBuildProject.getMaintenanceProList().get(j);
|
|
|
+// index++;
|
|
|
// }
|
|
|
// }
|
|
|
-// aftermarket.setMaintenanceProList(maintenanceProList);
|
|
|
|
|
|
- aftermarket.setMaintenanceProList(chuanyunBuildProject.getMaintenanceProList());
|
|
|
+ Object[] maintenanceProList = chuanyunBuildProject.getMaintenanceProList().toArray(new Object[chuanyunBuildProject.getMaintenanceProList().size()]);
|
|
|
+
|
|
|
+ aftermarket.setMaintenanceProList(maintenanceProList);
|
|
|
+
|
|
|
// aftermarket.setMaintenanceCycleList(chuanyunBuildProject.getMaintenanceCycleList());
|
|
|
} else { //AS(售后)
|
|
|
aftermarket.setAfterSaleManager(chuanyunBuildProject.getProjectManager().getObjectId());
|
|
@@ -160,7 +156,8 @@ public class ProjectTest1 {
|
|
|
private String implProManager; //实施项目经理(仅维保项目有)
|
|
|
|
|
|
@JsonProperty("D001789F28649f6f044a4224b5c68aa821918f50")
|
|
|
- private List<ChuanyunMaintenanceProDO> maintenanceProList; //维保交付内容(子表)(仅维保项目有)
|
|
|
+ private Object[] maintenanceProList;
|
|
|
+ //private List<ChuanyunMaintenanceProDO> maintenanceProList; //维保交付内容(子表)(仅维保项目有)
|
|
|
|
|
|
@JsonProperty("D001789Fe75a894fabe3490ab47812cb7d79fd25")
|
|
|
private List<ChuanyunMaintenanceCycleDO> maintenanceCycleList; //维保周期(子表)(仅维保项目有)
|