add

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

@@ -101,7 +101,7 @@ public class DetailDownloadInstallTask {
 	// 从格力总部同步的采集附件图生成平台的采集图
 	@Scheduled(fixedDelayString = "${cjfile}")
 	public void processBX(){
-		if (cjfilec.equals(TaskConfigEnum.TRUE.getCode())){
+		if (cjfilec.equals(TaskConfigEnum.FALSE.getCode())){
 			return;
 		}
 

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

@@ -430,8 +430,6 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 	public void processJyktFj(String downloadTaskNo, String pgguid) {
 		List<OrderDetailFile> odfs = new ArrayList<>();
 		List<OrderInstallDetail> oids = new ArrayList<>();
-		List<OrderInstallDetailCode> oidcs = new ArrayList<>();
-		Map<String,List<OrderInstallDetailCode>> oidcsMap = new HashMap<>();
 		Map<String,List<OrderInstallDetail>> oidsMap = new HashMap<>();
 		List<String> fsFjguid = new ArrayList<>();
 
@@ -473,13 +471,6 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 					});
 				}
 
-				// 提取采集条码明细数据
-				oidcs = orderInstallDetailCodeService.lambdaQuery()
-						.eq(OrderInstallDetailCode::getOrderBaseId,order.getId()).list();
-				if (CollectionUtils.isNotEmpty(oidcs)){
-					oidcsMap = oidcs.stream().collect(Collectors.groupingBy(OrderInstallDetailCode::getOrderDetailId));
-				}
-
 				log.info("采集明细 fsFjguid {}", JSONObject.toJSONString(fsFjguid));
 
 				for (ItfTblAzWgmxJyktFjDownload item :jykts){
@@ -498,26 +489,6 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 						OrderDetailFile a = new OrderDetailFile();
 						getItfTblAzWgmxJyktFj(odfs,oidsMap.get(item.getPgwcmxid()).get(0), order, item, a);
 
-						/*// 填充采集条码明细表图片数据
-						// 附件类型 1=内机条码 2=上墙图片 3=外机条码
-						if (oidcsMap.containsKey(a.getOrderDetailId())){
-							// 内机
-							if (a.getFileType()==1){
-								for (OrderInstallDetailCode u :oidcsMap.get(a.getOrderDetailId())){
-									if (u.getType().equals("1") && StringUtils.isEmpty(u.getPath())){
-										u.setPath(a.getFilePath());
-									}
-								}
-							} else if (a.getFileType()==3){
-								for (OrderInstallDetailCode u :oidcsMap.get(a.getOrderDetailId())){
-									if (u.getType().equals("2")){
-
-									}
-								}
-
-							}
-						}*/
-
 					}
 
 				}

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

@@ -295,8 +295,6 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
     public void extractedMXFile(){
         List<OrderDetailFile> odfiles = new ArrayList<>();
         List<OrderDetailFile> odfilesUpList = new ArrayList<>();
-        List<OrderInstallDetailCode> oidcs = new ArrayList<>();
-        List<OrderInstallDetailCode> upoidcs = new ArrayList<>();
 
         odfiles = orderDetailFileService.lambdaQuery()
                 .eq(OrderDetailFile::getOutZjljProcess,0)
@@ -308,11 +306,6 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                 processMXFileInfo(item);
                 odfilesUpList.add(item);
 
-                //  若为内外要图时填充采集条码信息
-                // '附件类型 1=内机条码 2=上墙图片 3=外机条码
-
-
-
                 updateMXFile(odfilesUpList, 100);
             } catch (Exception ex) {
                 ex.printStackTrace();