yaozhixue vor 1 Jahr
Ursprung
Commit
5df03963d2

+ 2 - 2
src/main/java/com/zfire/jiasm/syncdata/download/order/DetailDownloadInstallTask.java

@@ -66,10 +66,10 @@ public class DetailDownloadInstallTask {
 			for (Map<String, Object> downloadType : types) {
 				int topDownloadTaskType = (Integer) downloadType.get("download_task_type");
 				// 关联任务表提取相应的数据
-				List<Map<String, Object>> result = detailDownloadService.getTaskDataInstall(topDownloadTaskType);
+				// List<Map<String, Object>> result = detailDownloadService.getTaskDataInstall(topDownloadTaskType);
 
 				// 测试用
-				// List<Map<String, Object>> result = detailDownloadService.getTaskDataInstallTest(topDownloadTaskType);
+				List<Map<String, Object>> result = detailDownloadService.getTaskDataInstallTest(topDownloadTaskType);
 
 				for (Map<String, Object> row : result) {
 					// ID

+ 4 - 2
src/main/java/com/zfire/jiasm/syncdata/service/impl/DetailDownloadServiceImpl.java

@@ -619,7 +619,7 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 				if (xxyyguid.contains(item.getXxyyguid())){
 					continue;
 				}
-				getOrderRepairDetailReason(ordrs, irdsMap, item);
+				getOrderRepairDetailReason(ordrs, irdsMap, item, irds);
 			}
 
 			// 两表合一,这里赋值维修项目值
@@ -851,10 +851,12 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		ordrs.add(n);
 	}
 
-	private void getOrderRepairDetailReason(List<OrderRepairDetailReason> ordrs, Map<String, List<OrderRepairDetail>> irdsMap, ItfTblWxjsXxyyJyktDownload item) {
+	private void getOrderRepairDetailReason(List<OrderRepairDetailReason> ordrs, Map<String, List<OrderRepairDetail>> irdsMap,
+											ItfTblWxjsXxyyJyktDownload item, List<OrderRepairDetail> irds) {
 		OrderRepairDetailReason n = new OrderRepairDetailReason();
 		n.setId(IdWorker.getIdStr());
 		n.setOrderRepairDetailId(irdsMap.get(item.getWxjsguid()).get(0).getId());
+		n.setOrderBaseId(irds.get(0).getOrderBaseId());
 		n.setXxyyguid(item.getXxyyguid());
 		n.setWxjsguid(item.getWxjsguid());
 		n.setRepairBugId("");