add

src/main/java/com/zfire/jiasm/syncdata/service/impl/DetailDownloadServiceImpl.java

@@ -146,7 +146,7 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 				+ " c.download_task_type_name "
 				+ " FROM itf_gree_to_fa_download_task_list a,itf_gree_to_fa_download_task_type c "
 				+ " where a.download_task_type=c.download_task_type "
-				+ " and a.download_key_value='603C28AF9ADB9C2DF8C6165689321C9D' ");
+				+ " and a.download_key_value='8d25c103548411eebd1b00163e0aad48' ");
 		return result;
 	}
 	
@@ -283,6 +283,7 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 				processWxjsJykt(downloadTaskNo, pgguid);
 			} else if (downloadTaskType == 660101){
 				// 维修工单三子表下载  TL_SynDataFrom_tbl_wxjs_jykt_child OK
+				// pgguid=itf_tbl_wxjs_jykt_download.wxjsguid
 				processSix(downloadTaskNo, pgguid);
 			}
 			// 差指定安维工单下差功能
@@ -549,12 +550,12 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		if (processWxJsXxyyJykt(downloadTaskNo,pgguid)) {
 			return;
 		}
-		// 维修项目现象 无数据时不处理同时修改同步状态
+		// 维修项目现象 无数据时不处理同时修改同步状态  与维修现象合到一个表中
 		// TL_SynDataFrom_tbl_wxjs_wxxm_jykt
 		// itf_tbl_wxjs_wxxm_jykt_download  ->order_repair_detail_item
-		if (processWxJsWxxmJykt(downloadTaskNo,pgguid)) {
+		/*if (processWxJsWxxmJykt(downloadTaskNo,pgguid)) {
 			return;
-		}
+		}*/
 
 		// 配件表 无数据时不处理同时修改同步状态
 		// TL_SynDataFrom_tbl_wxjs_pjmx_jykt
@@ -570,10 +571,6 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 
 
 
-
-
-
-
 		// 修改同步状态
 		OrderPar req = new OrderPar();
 		req.setOrderNo(downloadTaskNo);
@@ -590,8 +587,9 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		Map<String,List<OrderRepairDetail>> irdsMap = new HashMap<>();
 		List<OrderRepairDetailReason> ordrsOld = new ArrayList<>();
 		List<String> xxyyguid = new ArrayList<>();
+		List<ItfTblWxjsWxxmJyktDownload> wxxms = new ArrayList<>();
 
-		// 维修现象下载同步   无数据时不处理同时修改同步状态
+				// 维修现象下载同步   无数据时不处理同时修改同步状态
 		// TL_SynDataFrom_tbl_wxjs_xxyy_jykt
 		// itf_tbl_wxjs_xxyy_jykt_download   ->OrderRepairDetailReason
 		List<ItfTblWxjsXxyyJyktDownload> wxxxs = itfTblWxjsXxyyJyktDownloadService.lambdaQuery()
@@ -610,7 +608,7 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 			ordrsOld = orderRepairDetailReasonService.lambdaQuery()
 					.eq(OrderRepairDetailReason::getOrderBaseId,irds.get(0).getOrderBaseId()).list();
 
-			if (CollectionUtils.isEmpty(ordrsOld)){
+			if (CollectionUtils.isNotEmpty(ordrsOld)){
 				ordrsOld.stream().forEach(event->{
 					xxyyguid.add(event.getXxyyguid());
 				});
@@ -624,16 +622,44 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 				getOrderRepairDetailReason(ordrs, irdsMap, item);
 			}
 
+			// 两表合一，这里赋值维修项目值
+			wxxms = getItfTblWxjsWxxmJyktDownloads(downloadTaskNo, ordrs, wxxms);
+
 			if (ordrs.size()>0) {
 				orderRepairDetailReasonService.saveBatch(ordrs);
 				ordrs.clear();
 			}
 			// 修改同步状态
 			upSynStatusWxjsXxyyJykt(downloadTaskNo);
+			// 修改同步状态
+			if (wxxms.size()>0){
+				upSynStatusWxJsWxxmJykt(downloadTaskNo);
+			}
 		}
 		return Boolean.FALSE;
 	}
 
+	private List<ItfTblWxjsWxxmJyktDownload> getItfTblWxjsWxxmJyktDownloads(String downloadTaskNo, List<OrderRepairDetailReason> ordrs, List<ItfTblWxjsWxxmJyktDownload> wxxms) {
+		if (ordrs.size()>0) {
+			// 维修现象下载同步   无数据时不处理同时修改同步状态
+			// TL_SynDataFrom_tbl_wxjs_wxxm_jykt
+			// itf_tbl_wxjs_wxxm_jykt_download   ->order_repair_detail_item
+			wxxms = itfTblWxjsWxxmJyktDownloadService.lambdaQuery()
+					.eq(ItfTblWxjsWxxmJyktDownload::getDownloadTaskNo, downloadTaskNo).list();
+			// 生成维修现象数据
+			for (ItfTblWxjsWxxmJyktDownload item: wxxms){
+				for (OrderRepairDetailReason reason : ordrs){
+					if (reason.getNumber().equals(item.getXxyyh())){
+						reason.setRepairItemId(item.getWxxmh());
+						reason.setRepairItemName(item.getWxxmhmc());
+						break;
+					}
+				}
+			}
+		}
+		return wxxms;
+	}
+
 	// pgguid = order_repair_detail.brand_wxjsguid
 	// TL_SynDataFrom_tbl_wxjs_wxxm_jykt
 	// itf_tbl_wxjs_wxxm_jykt_download  ->order_repair_detail_item
@@ -669,7 +695,7 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 			ordrsOld = orderRepairDetailItemService.lambdaQuery()
 					.in(OrderRepairDetailItem::getOrderRepairDetailId,orderRepairDetailIds).list();
 
-			if (CollectionUtils.isEmpty(ordrsOld)){
+			if (CollectionUtils.isNotEmpty(ordrsOld)){
 				ordrsOld.stream().forEach(event->{
 					wxjsguid.add(event.getWxjsguid());
 				});
@@ -730,7 +756,7 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 			ordrsOld = orderDetailFileService.lambdaQuery()
 					.eq(OrderDetailFile::getOrderBaseId,irds.get(0).getOrderBaseId()).list();
 
-			if (CollectionUtils.isEmpty(ordrsOld)){
+			if (CollectionUtils.isNotEmpty(ordrsOld)){
 				ordrsOld.stream().forEach(event->{
 					fjguid.add(event.getFjguid());
 				});
@@ -799,6 +825,8 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		if (item.getLastModifiedDate()!=null){
 			n.setUpdateTime(item.getLastModifiedDate());
 		}
+		n.setOutPicture(item.getWjlj());
+
 		ordrs.add(n);
 	}
 

src/main/resources/bootstrap.properties

@@ -1,4 +1,4 @@
-spring.profiles.active=prd
+spring.profiles.active=prdt
 spring.application.name=jiasm-syncdata
 spring.main.allow-bean-definition-overriding=true
 # 修改线程池的拒绝策略