yaozhixue il y a 1 an
Parent
commit
e0491ee14b

+ 0 - 0
2023/uploadfile/1694433550779.png


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

@@ -639,7 +639,9 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		return Boolean.FALSE;
 	}
 
-	private List<ItfTblWxjsWxxmJyktDownload> getItfTblWxjsWxxmJyktDownloads(String downloadTaskNo, List<OrderRepairDetailReason> ordrs, List<ItfTblWxjsWxxmJyktDownload> wxxms) {
+	private List<ItfTblWxjsWxxmJyktDownload> getItfTblWxjsWxxmJyktDownloads(String downloadTaskNo,
+																			List<OrderRepairDetailReason> ordrs,
+																			List<ItfTblWxjsWxxmJyktDownload> wxxms) {
 		if (ordrs.size()>0) {
 			// 维修现象下载同步   无数据时不处理同时修改同步状态
 			// TL_SynDataFrom_tbl_wxjs_wxxm_jykt
@@ -780,7 +782,8 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		return Boolean.FALSE;
 	}
 
-	private void getOrderDetailFile(List<OrderDetailFile> ordrs, List<OrderRepairDetail> irds, Map<String, List<OrderRepairDetail>> irdsMap, ItfTblWxjsFjJyktDownload item) {
+	private void getOrderDetailFile(List<OrderDetailFile> ordrs, List<OrderRepairDetail> irds,
+									Map<String, List<OrderRepairDetail>> irdsMap, ItfTblWxjsFjJyktDownload item) {
 		OrderDetailFile n = new OrderDetailFile();
 		n.setId(IdWorker.getIdStr());
 		n.setFjguid(item.getFjguid());
@@ -826,6 +829,9 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 			n.setUpdateTime(item.getLastModifiedDate());
 		}
 		n.setOutPicture(item.getWjlj());
+		n.setNumber(item.getRepairtroubleno());
+		n.setRepairItemId(item.getRepairitemno());
+
 
 		ordrs.add(n);
 	}

+ 1 - 2
src/main/resources/mapper/FileOrderDetailMapper.xml

@@ -80,10 +80,9 @@
                'guangfo' as last_modified_by,a.update_time as last_modified_date,
                b.brand_wxjsguid as wxjsguid,a.brand_file_path as wjlj,a.create_time as cjsj,
                a.file_type as tpms,a.file_path as wjnm,a.pgwcmxid as wxmxguid,
-               b.out_id as wxjsmxguid,c.repair_item_no as repairitemno,c.xxyyguid as repairtroubleno
+               b.out_id as wxjsmxguid,a.repair_item_id as repairitemno,a.number as repairtroubleno
         from order_detail_file a
                  left join order_repair_detail b on a.order_base_id = b.order_base_id and b.id=a.order_detail_id
-                 left join order_repair_detail_item c on c.order_repair_detail_id = a.order_detail_id
         where a.order_base_id =  #{request.orderNo} and a.id =  #{request.id}
     </select>