add

src/main/java/com/zfire/jiasm/syncdata/api/OrderAddBeanDTO.java

@@ -236,4 +236,6 @@ public class OrderAddBeanDTO {
     private Date createTime;
     // 修改时间
     private Date updateTime;
+    // 是否已下载总部采集数据 0=未下载 1=已下载
+    private Integer outCjDownloadFlag;
 }

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

@@ -18,6 +18,7 @@ import com.zfire.jiasm.syncdata.service.OrderService;
 import com.zfire.jiasm.syncdata.service.PublicService;
 import com.zfire.jiasm.syncdata.utils.MyBeanUtils;
 import com.zfire.jiasm.syncdata.utils.ResponseHelper;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.jetbrains.annotations.NotNull;
@@ -673,6 +674,10 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         createOrder.getOrderProductList().addAll(orderProductList);
         createOrder.setOperatorFlag(2);
         createOrder.setFlag(1);
+        if (orderBase.getOutCjDownloadFlag() == null){
+            createOrder.setOutCjDownloadFlag(0);
+        }
+
         if (orderWorker !=null){
             List<String> workerIds = new ArrayList<>();
             workerIds.add(orderWorker.getWorkerId());

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

@@ -136,11 +136,11 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateRapairOrder(Brand brand, Map<String, List<SysDictRef>> sysDictRefDLMap,
-                            Map<String, List<SysDictRef>> sysDictRefXLMap,
-                            Map<String, List<SysDictRef>> sysDictRefXiLieMap,
-                            ItfTblAssignDownload item,
-                            Map<String, List<SysDictRef>> sysDictRefDLMapXq,
-                            Map<String, List<SysDictRef>> sysDictRefXLMapXq, Map<String,String> productMap) {
+                                  Map<String, List<SysDictRef>> sysDictRefXLMap,
+                                  Map<String, List<SysDictRef>> sysDictRefXiLieMap,
+                                  @NotNull ItfTblAssignDownload item,
+                                  Map<String, List<SysDictRef>> sysDictRefDLMapXq,
+                                  Map<String, List<SysDictRef>> sysDictRefXLMapXq, Map<String,String> productMap) {
         List<ItfTblAssignXzydDownload> yds = itfTblAssignXzydDownloadService.lambdaQuery()
                 .eq(ItfTblAssignXzydDownload::getDownloadTaskNo, item.getDownloadTaskNo()).list();
 

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='8d25c103548411eebd1b00163e0aad48' ");
+				+ " and a.download_key_value='F1343427044A4432B7EC18C5A7AB9BBD' ");
 		return result;
 	}
 	
@@ -419,6 +419,7 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		List<OrderInstallDetail> oids = new ArrayList<>();
 		List<OrderInstallDetailCode> oidcs = new ArrayList<>();
 		List<ItfGreeToFaDownloadTaskList> its = new ArrayList<>();
+		List<String> ids = new ArrayList<>();
 		int count = 1;
 		int outid=0;
 
@@ -447,7 +448,10 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 							.eq(OrderInstallDetail::getOrderBaseId, order.getId())
 							.eq(OrderInstallDetail::getStatus,0).list();
 					if (CollectionUtils.isNotEmpty(delorderDetailRec)){
-						orderInstallDetailService.removeByIds(delorderDetailRec);
+						delorderDetailRec.stream().forEach(ddr -> {
+							ids.add(ddr.getId());
+						});
+						orderInstallDetailService.removeByIds(ids);
 					}
 
 					for (ItfTblAzWgmxJyktDownload item :jykts){
@@ -1750,6 +1754,7 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 	public void processOrderInstallDetailS(String downloadTaskNo, String pgguid) throws Exception {
 		List<OrderInstallDetail> oids = new ArrayList<>();
 		List<ItfGreeToFaDownloadTaskList> its = new ArrayList<>();
+		List<String> ids = new ArrayList<>();
 		int count = 1;
 
 		// 提取数据
@@ -1777,7 +1782,10 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 							.eq(OrderInstallDetail::getOrderBaseId, order.getId())
 							.eq(OrderInstallDetail::getStatus,0).list();
 					if (CollectionUtils.isNotEmpty(delorderDetailRec)){
-						orderInstallDetailService.removeByIds(delorderDetailRec);
+						delorderDetailRec.stream().forEach(ddr -> {
+							ids.add(ddr.getId());
+						});
+						orderInstallDetailService.removeByIds(ids);
 					}
 
 					for (ItfTblAzWgmxSyktDownload item :sykts){
@@ -1848,6 +1856,7 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		List<OrderInstallDetail> oids = new ArrayList<>();
 		List<ItfGreeToFaDownloadTaskList> its = new ArrayList<>();
 		List<OrderInstallDetailCode> oidcs = new ArrayList<>();
+		List<String> ids = new ArrayList<>();
 		int count = 1;
 
 		// 提取数据
@@ -1874,7 +1883,10 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 							.eq(OrderInstallDetail::getOrderBaseId, order.getId())
 							.eq(OrderInstallDetail::getStatus,0).list();
 					if (CollectionUtils.isNotEmpty(delorderDetailRec)){
-						orderInstallDetailService.removeByIds(delorderDetailRec);
+						delorderDetailRec.stream().forEach(ddr -> {
+							ids.add(ddr.getId());
+						});
+						orderInstallDetailService.removeByIds(ids);
 					}
 
 					for (ItfTblAzWgmxQitaDownload item :qts){

src/main/resources/bootstrap-prdt.properties

@@ -299,8 +299,8 @@ SMSSelf_marketing_Rate=5000
 ######################## 同步定时任务配置 ########################
 #师傅 证件、师傅、工单子表信息
 workercertificatec=FALSE
-workerceruploadc=TRUE
-detaildownc=FALSE
+workerceruploadc=FALSE
+detaildownc=TRUE
 workercertbxc=FALSE
 workerrzc=FALSE
 inbeforec=FALSE