add

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

@@ -316,7 +316,8 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
 
         // 提取本地订单
         OrderBase old = orderBaseService.lambdaQuery()
-                .eq(OrderBase::getPgguid, item.getPgguid()).one();
+                .eq(OrderBase::getPgguid, item.getPgguid())
+                .last("limit 1").one();
 
         // 获取安装工单主表
         OrderBase newLCLS = getAddOrderBaseUp(item, brand,oads, its);
@@ -343,7 +344,8 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         // 费用清单 放扩展表
         // 提取已同步的数据
         OrderInstall oldOrderInstall = orderInstallService.lambdaQuery()
-                .eq(OrderInstall::getOrderBaseId,old.getId()).one();
+                .eq(OrderInstall::getOrderBaseId,old.getId())
+                .last("limit 1").one();
         // 获取安装费用清单
         List<ItfTblAzAssignFeeDownload> fyqd = itfTblAzAssignFeeDownloadService.lambdaQuery()
                 .eq(ItfTblAzAssignFeeDownload::getDownloadTaskNo, item.getDownloadTaskNo())
@@ -392,7 +394,8 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
 
         // 提取本地订单
         OrderBase old = orderBaseService.lambdaQuery()
-                .eq(OrderBase::getPgguid, item.getPgguid()).one();
+                .eq(OrderBase::getPgguid, item.getPgguid())
+                .last("limit 1").one();
 
         // 获取安装工单主表
         OrderBase newLCLS = getAddOrderBaseUpApi(item, brand,oads, its);
@@ -419,7 +422,8 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         // 费用清单 放扩展表
         // 提取已同步的数据
         OrderInstall oldOrderInstall = orderInstallService.lambdaQuery()
-                .eq(OrderInstall::getOrderBaseId,old.getId()).one();
+                .eq(OrderInstall::getOrderBaseId,old.getId())
+                .last("limit 1").one();
         // 获取安装费用清单
         List<ItfTblAzAssignFeeDownload> fyqd = itfTblAzAssignFeeDownloadService.lambdaQuery()
                 .eq(ItfTblAzAssignFeeDownload::getDownloadTaskNo, item.getDownloadTaskNo())
@@ -870,7 +874,8 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         OrderWorker oow = orderWorkerService.lambdaQuery()
                 .eq(OrderWorker::getOrderBaseId,id)
                 .eq(OrderWorker::getOutWorkerSource,Boolean.FALSE)
-                .eq(OrderWorker::getIsMaster,Boolean.TRUE).one();
+                .eq(OrderWorker::getIsMaster,Boolean.TRUE)
+                .last("limit 1").one();
         OrderWorker own = new OrderWorker();
         Boolean uf = Boolean.FALSE;
 
@@ -1372,7 +1377,8 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         // 3:已预约不可更改预约时间 未预约总部为准
         OrderReAppointment ora = orderReAppointmentService.lambdaQuery()
                 .eq(OrderReAppointment::getOrderBaseId,old.getId())
-                .eq(OrderReAppointment::getFlag,1).one();
+                .eq(OrderReAppointment::getFlag,1)
+                .last("limit 1").one();
         // 已预约过 退回查询处理
         if (ora == null){
             old.setAppointmentTime(lclsNew.getAppointmentTime());
@@ -1498,7 +1504,8 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         // 3:已预约不可更改预约时间 未预约总部为准
         OrderReAppointment ora = orderReAppointmentService.lambdaQuery()
                 .eq(OrderReAppointment::getOrderBaseId,old.getId())
-                .eq(OrderReAppointment::getFlag,1).one();
+                .eq(OrderReAppointment::getFlag,1)
+                .last("limit 1").one();
         // 已预约过 退回查询处理
         if (ora != null){
             upInfo.setAppointmentTime(old.getAppointmentTime());
@@ -1932,6 +1939,7 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         OrderAppraise oaOne = orderAppraiseService.lambdaQuery()
                 .eq(OrderAppraise::getOrderBaseId,orderBase.getId())
                 .eq(OrderAppraise::getType,0)
+                .last("limit 1")
                 .one();
         if (oaOne !=null){
             jcaninsert=0;
@@ -1940,7 +1948,8 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
 
         // 提取差评申诉信息
         OrderAppeal oldcpss = orderAppealService.lambdaQuery()
-                .eq(OrderAppeal::getOrderBaseId,orderBase.getId()).one();
+                .eq(OrderAppeal::getOrderBaseId,orderBase.getId())
+                .last("limit 1").one();
 
         for (ItfTblAzAssignSatisfactionDownload s :sas){
             getSynReqId.add(s.getSynReqId());
@@ -2024,7 +2033,8 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
 
         // 提取差评申诉信息
         OrderAppeal oldcpss = orderAppealService.lambdaQuery()
-                .eq(OrderAppeal::getOrderBaseId,orderBase.getId()).one();
+                .eq(OrderAppeal::getOrderBaseId,orderBase.getId())
+                .last("limit 1").one();
 
         for (ItfTblAzAssignSatisfactionDownload s :sas){
             // cppjly = Boolean.FALSE;
@@ -2064,7 +2074,8 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
                 OrderAppraise oldoatt = orderAppraiseService.lambdaQuery()
                         .eq(OrderAppraise::getOrderBaseId,orderBase.getId())
                         .eq(OrderAppraise::getPid,s.getId())
-                        .eq(OrderAppraise::getType,1).one();
+                        .eq(OrderAppraise::getType,1)
+                        .last("limit 1").one();
                 if (oldoatt !=null){
                     jcaninsert=0;
                 }
@@ -2172,7 +2183,8 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
                 .eq(ItfTblAzAssignSatisfactionDownload::getPgguid, s.getPgguid())
                 .eq(ItfTblAzAssignSatisfactionDownload::getId, s.getId())
                 .lt(ItfTblAzAssignSatisfactionDownload::getLastModifiedDate, s.getLastModifiedDate())
-                .eq(ItfTblAzAssignSatisfactionDownload::getPjly, s.getPjly()).one();
+                .eq(ItfTblAzAssignSatisfactionDownload::getPjly, s.getPjly())
+                .last("limit 1").one();
         if (azas !=null){
             s.setSynStatus(9);
             s.setSynTime(new Date());
@@ -2186,7 +2198,8 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
     private boolean checkRecord(OrderBase orderBase, ItfTblAzAssignSatisfactionDownload s) {
         OrderAppraise oldoa = orderAppraiseService.lambdaQuery()
                 .eq(OrderAppraise::getOrderBaseId, orderBase.getId())
-                .eq(OrderAppraise::getPid, s.getId()).one();
+                .eq(OrderAppraise::getPid, s.getId())
+                .last("limit 1").one();
         if (oldoa !=null){
             s.setSynStatus(9);
             s.setSynTime(new Date());
@@ -2201,7 +2214,7 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         OrderAppraise oaOne = orderAppraiseService.lambdaQuery()
                 .eq(OrderAppraise::getOrderBaseId, orderBase.getId())
                 .eq(OrderAppraise::getType,1)
-                .one();
+                .last("limit 1").one();
         if (oaOne !=null){
             spmessage = oaOne.getAppraiseContent();
         }

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

@@ -213,7 +213,8 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		if (!CollectionUtils.isEmpty(yjhxps)){
 			// 提取工单数据
 			OrderBase orderBase = orderBaseService.lambdaQuery()
-					.eq(OrderBase::getPgguid,pgguid).one();
+					.eq(OrderBase::getPgguid,pgguid)
+					.last("limit 1").one();
 			for (ItfTblTradeNewForOldDownload item:yjhxps){
 				if (orderBase !=null){
 					YjhxAppraise up = new YjhxAppraise();
@@ -257,7 +258,8 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		if (!CollectionUtils.isEmpty(jykts)){
 			// 提取工单数据
 			OrderBase order = orderBaseService.lambdaQuery()
-					.eq(OrderBase::getPgguid,pgguid).one();
+					.eq(OrderBase::getPgguid,pgguid)
+					.last("limit 1").one();
 
 			for (ItfTblAzWgmxJyktDownload item :jykts){
 				// 生成采集明细数据
@@ -296,7 +298,8 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		if (!CollectionUtils.isEmpty(jykts)){
 			// 提取工单数据
 			OrderBase order = orderBaseService.lambdaQuery()
-					.eq(OrderBase::getPgguid,pgguid).one();
+					.eq(OrderBase::getPgguid,pgguid)
+					.last("limit 1").one();
 			if (order!=null){
 				// 提取现有的采集附件数据
 				List<OrderDetailFile> fs = orderDetailFileService.lambdaQuery()
@@ -358,7 +361,8 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		if (!CollectionUtils.isEmpty(fjs)){
 			// 提取工单数据
 			OrderBase order = orderBaseService.lambdaQuery()
-					.eq(OrderBase::getPgguid,pgguid).one();
+					.eq(OrderBase::getPgguid,pgguid)
+					.last("limit 1").one();
 			if (order!=null){
 				// 提取现有的采集附件数据
 				List<OrderDetailFile> fs = orderDetailFileService.lambdaQuery()
@@ -412,7 +416,8 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		if (!CollectionUtils.isEmpty(tms)){
 			// 提取工单数据
 			OrderBase order = orderBaseService.lambdaQuery()
-					.eq(OrderBase::getPgguid,pgguid).one();
+					.eq(OrderBase::getPgguid,pgguid)
+					.last("limit 1").one();
 			if (order!=null){
 				// 提取现有的条码数据
 				List<OrderInstallDetailCode> codes = orderInstallDetailCodeService.lambdaQuery()
@@ -465,7 +470,8 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		if (!CollectionUtils.isEmpty(kts)){
 			// 提取工单数据
 			OrderBase order = orderBaseService.lambdaQuery()
-					.eq(OrderBase::getPgguid,pgguid).one();
+					.eq(OrderBase::getPgguid,pgguid)
+					.last("limit 1").one();
 			if (order!=null){
 				// 提取现有的采集附件数据
 				List<OrderDetailFile> fs = orderDetailFileService.lambdaQuery()
@@ -774,7 +780,8 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		if (!CollectionUtils.isEmpty(sykts)){
 			// 提取工单数据
 			OrderBase order = orderBaseService.lambdaQuery()
-					.eq(OrderBase::getPgguid,pgguid).one();
+					.eq(OrderBase::getPgguid,pgguid)
+					.last("limit 1").one();
 
 			for (ItfTblAzWgmxSyktDownload item :sykts){
 				// 生成采集明细数据
@@ -806,7 +813,8 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		if (!CollectionUtils.isEmpty(qts)){
 			// 提取工单数据
 			OrderBase order = orderBaseService.lambdaQuery()
-					.eq(OrderBase::getPgguid,pgguid).one();
+					.eq(OrderBase::getPgguid,pgguid)
+					.last("limit 1").one();
 
 			for (ItfTblAzWgmxQitaDownload item :qts){
 				// 生成采集明细数据
@@ -835,7 +843,8 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		if (!CollectionUtils.isEmpty(jdds)){
 			for (ItfTblYjhxJddDownload item :jdds){
 				YjhxAppraise jdd = yjhxAppraiseService.lambdaQuery()
-						.eq(YjhxAppraise::getHxjddid,item.getHxjddid()).one();
+						.eq(YjhxAppraise::getHxjddid,item.getHxjddid())
+						.last("limit 1").one();
 				// 存在更新，不存在插入
 				addOrUp(pgguid, item, jdd);
 			}
@@ -866,7 +875,8 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 			YjhxAppraise add = new YjhxAppraise();
 			// 工单ID
 			OrderBase orderBase = orderBaseService.lambdaQuery()
-					.eq(OrderBase::getPgguid, pgguid).one();
+					.eq(OrderBase::getPgguid, pgguid)
+					.last("limit 1").one();
 			MyBeanUtils.copyProperties(item,add);
 			add.setOrderBaseId(orderBase.getId());
 			add.setWebsitId(orderBase.getWebsitId());
@@ -892,11 +902,13 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 			for (ItfTblAzAssignXzydDownload item:zdmx){
 				// 存在更新，不存在插入 order_information syncId三方平台主键
 				OrderInformation info = orderInformationService.lambdaQuery()
-						.eq(OrderInformation::getSyncId,item.getId()).one();
+						.eq(OrderInformation::getSyncId,item.getId())
+						.last("limit 1").one();
 
 				// 工单ID
 				OrderBase orderBase = orderBaseService.lambdaQuery()
-						.eq(OrderBase::getPgguid, pgguid).one();
+						.eq(OrderBase::getPgguid, pgguid)
+						.last("limit 1").one();
 
 				if (info !=null){
 					// 次数，与是否已读不相同时修改，其他不修改 这里只能做是否已读的处理

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

@@ -224,7 +224,7 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
                         // 安装工单操作明细 TL_PrePareSynDataby_fa_order_install_operating_log
                         if (ojtutl.getTableName().equals("order_install_operating_log") &&
                                 ojtutl.getOrderType().equals(OrderTypeEnum.ORDER_TYPE_INSTALL.getCode())){
-                            getFkmx(brand, ojtutl);
+                            getFkmx(ojtutl);
                         }
                         // 安装工单用户改约明细 与操作明细最好放在一起，因表设计分开，所以独立开来处理
                         if (ojtutl.getTableName().equals("order_re_appointment") &&
@@ -350,23 +350,26 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
                 .eq(OrderBase::getId, ojtutl.getOrderNo())
                 .last("limit 1")
                 .one();
-        // 提取工单机型数据
-        OrderProduct op = orderProductService.lambdaQuery()
-                .eq(OrderProduct::getId, ojtutl.getId())
-                .last("limit 1")
-                .one();
-        if (op==null){
-            throw new RemoteServiceException("order_product找不到记录id="+ojtutl.getId());
-        }
-        if (StringUtils.isEmpty(op.getPgguid())){
-            // 更新pgguid
-            upPgid(ojtutl, orderBase);
-            op.setPgguid(orderBase.getPgguid());
+        if (orderBase !=null && orderBase.getUploadFlag()){
+            // 提取工单机型数据
+            OrderProduct op = orderProductService.lambdaQuery()
+                    .eq(OrderProduct::getId, ojtutl.getId())
+                    .last("limit 1")
+                    .one();
+            if (op==null){
+                throw new RemoteServiceException("order_product找不到记录id="+ojtutl.getId());
+            }
+            if (StringUtils.isEmpty(op.getPgguid())){
+                // 更新pgguid
+                upPgid(ojtutl, orderBase);
+                op.setPgguid(orderBase.getPgguid());
+            }
+            // 更新pgmxid
+            upPgmix(ojtutl, op);
+            // 生成数据
+            generateMx(brand, ojtutl, op,orderBase);
         }
-        // 更新pgmxid
-        upPgmix(ojtutl, op);
-        // 生成数据
-        generateMx(brand, ojtutl, op,orderBase);
+
         // 修改数据上传任务表中的状态 单号,id,同步状态,类型
         publicService.updateUploadTaskListStatus(ojtutl.getOrderNo(), ojtutl.getSynReqId(),1, ojtutl.getUploadTaskType());
     }
@@ -415,7 +418,7 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
                 .eq(OrderBase::getId, ojtutl.getOrderNo())
                 .last("limit 1")
                 .one();
-        if (orderBase !=null ){
+        if (orderBase !=null  && orderBase.getUploadFlag()){
             ReAppointment request = new ReAppointment();
             request.setOrderNo(ojtutl.getOrderNo());
             request.setId(ojtutl.getId());
@@ -446,12 +449,12 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public void getFkmx(Brand brand, OutJiasmToGreeUploadTaskList ojtutl) {
+    public void getFkmx(OutJiasmToGreeUploadTaskList ojtutl) {
         OrderBase orderBase = orderBaseService.lambdaQuery()
                 .eq(OrderBase::getId, ojtutl.getOrderNo())
                 .last("limit 1")
                 .one();
-        if (orderBase !=null ){
+        if (orderBase !=null  && orderBase.getUploadFlag()){
             // 修改fikd
             OperatingLog request = new OperatingLog();
             request.setFkid(UUID.randomUUID().toString());

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

@@ -139,7 +139,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                 .last("limit 1")
                 .one();
 
-        if (orderBase !=null ){
+        if (orderBase !=null && orderBase.getUploadFlag()){
             // 若工单被删除不再同步 不写生成数据
 
             // 条件判断
@@ -156,7 +156,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         return orderBaseInstallProc(brand, ojtutl, CategoryRefmap, orderBase);
     }
 
-    private Boolean upInit(@NotNull OutJiasmToGreeUploadTaskList ojtutl, Map<String, List<SysDictRef>> CategoryRefmap, OrderBase orderBase) {
+    public Boolean upInit(@NotNull OutJiasmToGreeUploadTaskList ojtutl, Map<String, List<SysDictRef>> CategoryRefmap, OrderBase orderBase) {
         List<OrderInstallDetail> details = new ArrayList<>();
         // 修改采集明细表与采集条码表ID
         upOutId(ojtutl.getId());
@@ -189,7 +189,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
     }
 
     @NotNull
-    private Boolean checkOrderDetailFile(@NotNull OutJiasmToGreeUploadTaskList ojtutl) {
+    public Boolean checkOrderDetailFile(@NotNull OutJiasmToGreeUploadTaskList ojtutl) {
         List<OrderDetailFile> detailFiles = new ArrayList<>();
         Boolean flag = Boolean.TRUE;
         detailFiles = orderDetailFileService.lambdaQuery()
@@ -212,7 +212,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         return flag;
     }
 
-    private void addTSHJP(@NotNull OutJiasmToGreeUploadTaskList ojtutl, OrderBase orderBase) {
+    public void addTSHJP(@NotNull OutJiasmToGreeUploadTaskList ojtutl, OrderBase orderBase) {
         OrderInstallDetail iods = orderInstallDetailService.lambdaQuery()
                 .eq(OrderInstallDetail::getOrderBaseId, orderBase.getId())
                 .eq(OrderInstallDetail::getIsSpecial, "YES")
@@ -284,7 +284,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                 .last("limit 1")
                 .one();
 
-        if (orderBase !=null ){
+        if (orderBase !=null  && orderBase.getUploadFlag()){
             // 安装工单产品信息,操作日志,完工明细,完工明细附件
             // 预约改约-总部短信发送请求表,派服务人员-短信发送请求表 以主表的pgguid统一修改
             upPgguid(orderBase);
@@ -685,7 +685,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         }
     }
 
-    private Integer setfjType(Integer type) {
+    public Integer setfjType(Integer type) {
         Integer result = type;
         switch (type){
             case 1:
@@ -785,7 +785,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         return Boolean.TRUE;
     }
 
-    private void uploadOrderDetailFile(@NotNull OutJiasmToGreeUploadTaskList ojtutl, Map<String, List<SysDictRef>> CategoryRefmap, OrderBase orderBase) {
+    public void uploadOrderDetailFile(@NotNull OutJiasmToGreeUploadTaskList ojtutl, Map<String, List<SysDictRef>> CategoryRefmap, OrderBase orderBase) {
 
         // 修改序 outid
         upOrderDetailFileOutId(ojtutl);
@@ -794,7 +794,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         uploadOrderDetailFilePiture(ojtutl, CategoryRefmap, orderBase);
     }
 
-    private void uploadOrderDetailFilePiture(@NotNull OutJiasmToGreeUploadTaskList ojtutl, Map<String, List<SysDictRef>> CategoryRefmap, OrderBase orderBase) {
+    public void uploadOrderDetailFilePiture(@NotNull OutJiasmToGreeUploadTaskList ojtutl, Map<String, List<SysDictRef>> CategoryRefmap, OrderBase orderBase) {
         String oldFile ="";
         String newFile ="";
         // 根据产品类别名称 生成不同的完工明细数据
@@ -853,7 +853,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         }
     }
 
-    private void upOrderDetailFileOutId(@NotNull OutJiasmToGreeUploadTaskList ojtutl) {
+    public void upOrderDetailFileOutId(@NotNull OutJiasmToGreeUploadTaskList ojtutl) {
         List<OrderDetailFile> upList = new ArrayList<>();
         // 查看是否有需要修改的数据
         List<OrderDetailFile> oids = orderDetailFileService.lambdaQuery()
@@ -888,7 +888,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         }
     }
 
-    private void upOrderInstallDetailCodePgguid(@NotNull OutJiasmToGreeUploadTaskList ojtutl, OrderBase orderBase) {
+    public void upOrderInstallDetailCodePgguid(@NotNull OutJiasmToGreeUploadTaskList ojtutl, OrderBase orderBase) {
         List<OrderInstallDetailCode> oidcs = orderInstallDetailCodeService.lambdaQuery()
                 .eq(OrderInstallDetailCode::getOrderBaseId, ojtutl.getId())
                 .isNull(OrderInstallDetailCode::getPgguid)
@@ -902,7 +902,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         }
     }
 
-    private void upPgwcmxid(OutJiasmToGreeUploadTaskList ojtutl) {
+    public void upPgwcmxid(OutJiasmToGreeUploadTaskList ojtutl) {
         List<OrderInstallDetail> upList = new ArrayList<>();
         List<OrderInstallDetail> detaillist = orderInstallDetailService.lambdaQuery()
                 .eq(OrderInstallDetail::getOrderBaseId, ojtutl.getId())
@@ -923,7 +923,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         }
     }
 
-    private void stopUpload(@NotNull OutJiasmToGreeUploadTaskList ojtutl, String msg) {
+    public void stopUpload(@NotNull OutJiasmToGreeUploadTaskList ojtutl, String msg) {
         OutJiasmToGreeUploadTaskList up = new OutJiasmToGreeUploadTaskList();
         up.setSynReqId(ojtutl.getSynReqId());
         up.setSynStatus(99);
@@ -945,7 +945,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         }
     }
 
-    private boolean checkPare(OutJiasmToGreeUploadTaskList ojtutl, OrderBase orderBase) {
+    public boolean checkPare(OutJiasmToGreeUploadTaskList ojtutl, OrderBase orderBase) {
         // 接收派工网点为空上传忽略
         if (StringUtils.isEmpty(orderBase.getReceWebsitId()) || orderBase.getReceWebsitId().equals("0")){
             stopUpload(ojtutl, "接收派工网点为空上传忽略");
@@ -965,7 +965,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
     @Transactional(rollbackFor = Exception.class)
     public Boolean orderInstallCjOrWg(String cjOrWg, Brand brand, OutJiasmToGreeUploadTaskList ojtutl,
                                       Map<String, List<SysDictRef>> CategoryRefmap, OrderBase orderBase){
-        if (orderBase !=null ){
+        if (orderBase !=null  && orderBase.getUploadFlag()){
             // 生成待同步的安装工单主表
             ItfTblAzAssignLcLsUpload lcls = getItfTblAzAssignLcLsUpload(brand, orderBase);
             // 1： 插入工单主表数据
@@ -1119,7 +1119,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
     }
 
 
-    private void upPgguid(OrderBase orderBase) {
+    public void upPgguid(OrderBase orderBase) {
         List<OrderProduct> upOps = new ArrayList<>();
         List<OrderInstallOperatingLog> uplog = new ArrayList<>();
         List<OrderInstallDetail> updetail = new ArrayList<>();
@@ -1188,7 +1188,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
     }
 
     @NotNull
-    private ItfTblAzAssignLcLsUpload getItfTblAzAssignLcLsUpload(@NotNull Brand brand, OutJiasmToGreeUploadTaskList ojtutl,
+    public ItfTblAzAssignLcLsUpload getItfTblAzAssignLcLsUpload(@NotNull Brand brand, OutJiasmToGreeUploadTaskList ojtutl,
                                                                  OrderBase orderBase) {
         WebsitSH websitSH = new WebsitSH();
         OrderPar orderPar = new OrderPar();
@@ -1260,7 +1260,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
     }
 
     @NotNull
-    private ItfTblAzAssignLcLsUpload getItfTblAzAssignLcLsUpload(Brand brand, OrderBase orderBase) {
+    public ItfTblAzAssignLcLsUpload getItfTblAzAssignLcLsUpload(Brand brand, OrderBase orderBase) {
         OrderPar orderPar = new OrderPar();
 
         orderPar.setBrandId(brand.getBrandId());
@@ -1273,7 +1273,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         return lcls;
     }
 
-    private void setWebsit(Brand brand, OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls) {
+    public void setWebsit(Brand brand, OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls) {
         WebsitSH websitSH = new WebsitSH();
 
         // 创建人及创建人名称改为对应的创建网点
@@ -1341,7 +1341,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         lcls.setCjwdxtbh(websitSH.getBrandSysWebsitNumber());
     }
 
-    private Boolean installDtailJS(String cjOrWg, Brand brand, OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls,
+    public Boolean installDtailJS(String cjOrWg, Brand brand, OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls,
                                    OrderInstallDetail detail, String taskno, String mainName,
                                    Long synReqId) {
         // 获取完工采集明细数据 (家用空调、商用空调、其他) TL_fa_order_install_detail_js
@@ -1403,7 +1403,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
     }
 
 
-    private Boolean getDetailCodeCj(OrderBase orderBase, OrderInstallDetail detail,
+    public Boolean getDetailCodeCj(OrderBase orderBase, OrderInstallDetail detail,
                                     String mainName, String taskno, Long synReqId) {
         // 获取条码采集明细id
         InstalDetailCode instalDetailCode = new InstalDetailCode();
@@ -1462,7 +1462,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         return Boolean.TRUE;
     }
 
-    private boolean uploadImage(OrderBase orderBase, OrderInstallDetailCode code, Long synReqId) {
+    public boolean uploadImage(OrderBase orderBase, OrderInstallDetailCode code, Long synReqId) {
         String oldFile;
         String newFile;
         oldFile = IdWorker.getIdStr() + ".jpeg";
@@ -1479,7 +1479,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
     }
 
 
-    private Boolean uploadBarCodeexc(String newFile, String oldFile,String wdno,OrderInstallDetailCode code, Long synReqId) {
+    public Boolean uploadBarCodeexc(String newFile, String oldFile,String wdno,OrderInstallDetailCode code, Long synReqId) {
         try{
             // 1: 获取签名信息
             GreeFileResponseHelper response =  greeLogic.ossGetSignt(wdno,"GET");
@@ -1522,7 +1522,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         }
     }
 
-    private Boolean generateDetailCodeCj(OrderBase orderBase, OrderInstallDetailCode code, String mainName, String taskno) {
+    public Boolean generateDetailCodeCj(OrderBase orderBase, OrderInstallDetailCode code, String mainName, String taskno) {
         /*// 采集条码表中的pgguid 统一改成工单基础表的pgguid
         InstalDetailCode upcode = new InstalDetailCode();
         upcode.setOrderNo(code.getOrderBaseId());
@@ -1547,7 +1547,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         return Boolean.TRUE;
     }
 
-    private Boolean getItfTblazwgmxsykttmmxls(String taskno, ItfTblAzWgmxSyktTmmxLsUpload sy) {
+    public Boolean getItfTblazwgmxsykttmmxls(String taskno, ItfTblAzWgmxSyktTmmxLsUpload sy) {
         ItfTblazwgmxsykttmmxls ls = new ItfTblazwgmxsykttmmxls();
         MyBeanUtils.copyProperties(sy,ls);
         ls.setSynTaskNo(taskno);
@@ -1556,7 +1556,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         return itfTblazwgmxsykttmmxlsService.save(ls);
     }
 
-    private Boolean getcjfjdataCj(OrderInstallDetail detail, String mainName, String taskno) {
+    public Boolean getcjfjdataCj(OrderInstallDetail detail, String mainName, String taskno) {
         // 安装工单采集附件表提取数据
         InstallCJDetailFile installCJDetailFile = new InstallCJDetailFile();
         installCJDetailFile.setOrderNo(detail.getOrderBaseId());
@@ -1591,7 +1591,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
     }
 
 
-    private Boolean uploadFileexc(String newFile, String oldFile,String wdno,OrderDetailFile file) {
+    public Boolean uploadFileexc(String newFile, String oldFile,String wdno,OrderDetailFile file) {
         try{
             // 1: 获取签名信息
             GreeFileResponseHelper response =  greeLogic.ossGetSignt(wdno,"GET");
@@ -1638,7 +1638,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         }
     }
 
-    private void getSaveFileInfo(String id1, ResultData resultData, Map<String, String> req) {
+    public void getSaveFileInfo(String id1, ResultData resultData, Map<String, String> req) {
         req.put("bizAppId","flydiy-auto-sit-default-front-greeshmerge");
         req.put("bizTable","default");
         req.put("bizType","default");
@@ -1703,7 +1703,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         return Boolean.TRUE;
     }
 
-    private Boolean processItfTblazwgmxjyktfj(String mainName, OrderDetailFile file, String taskno, ItfTblAzWgmxJyktFjUpload jyktfj) {
+    public Boolean processItfTblazwgmxjyktfj(String mainName, OrderDetailFile file, String taskno, ItfTblAzWgmxJyktFjUpload jyktfj) {
         if (! getItfTblazwgmxjyktfj(taskno, jyktfj)){
             return Boolean.FALSE;
         }
@@ -1716,7 +1716,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         return Boolean.TRUE;
     }
 
-    private Boolean getItfTblazwgmxjyktfj(String taskno, ItfTblAzWgmxJyktFjUpload jyktfj) {
+    public Boolean getItfTblazwgmxjyktfj(String taskno, ItfTblAzWgmxJyktFjUpload jyktfj) {
         ItfTblazwgmxjyktfj fj = new ItfTblazwgmxjyktfj();
         MyBeanUtils.copyProperties(jyktfj,fj);
         fj.setSynTaskNo(taskno);
@@ -1724,7 +1724,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         return itfTblazwgmxjyktfjService.save(fj);
     }
 
-    private Boolean getItfTblazwgmxsyktfj(String taskno, ItfTblAzWgmxSyktFjUpload syktfj) {
+    public Boolean getItfTblazwgmxsyktfj(String taskno, ItfTblAzWgmxSyktFjUpload syktfj) {
         ItfTblazwgmxsyktfj fj = new ItfTblazwgmxsyktfj();
         MyBeanUtils.copyProperties(syktfj,fj);
         fj.setSynTaskNo(taskno);
@@ -1734,7 +1734,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
     }
 
 
-    private void modifyItfTblazwgmxjyktfj(OrderDetailFile file, String taskno) {
+    public void modifyItfTblazwgmxjyktfj(OrderDetailFile file, String taskno) {
         InstallDetail req = new InstallDetail();
         req.setOrderNo(file.getOrderBaseId());
         req.setId(taskno);
@@ -1747,7 +1747,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
     }
 
 
-    private Boolean saveItfTblazwgmxqitafj(String taskno, ItfTblAzWgmxQitaFjUpload otherfj) {
+    public Boolean saveItfTblazwgmxqitafj(String taskno, ItfTblAzWgmxQitaFjUpload otherfj) {
         ItfTblazwgmxqitafj fj = new ItfTblazwgmxqitafj();
         MyBeanUtils.copyProperties(otherfj,fj);
         fj.setSynTaskNo(taskno);
@@ -1755,7 +1755,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         return itfTblazwgmxqitafjService.save(fj);
     }
 
-    private void upItfTblazwgmxqitafj(OrderDetailFile file, String taskno) {
+    public void upItfTblazwgmxqitafj(OrderDetailFile file, String taskno) {
         InstallDetail req = new InstallDetail();
         req.setOrderNo(file.getOrderBaseId());
         req.setId(taskno);
@@ -1764,7 +1764,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         itfTblazwgmxqitafjCJMapper.updateType2(req);
     }
 
-    private Boolean getCJMXDataCj(String cjOrWg, Brand brand, OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls,
+    public Boolean getCJMXDataCj(String cjOrWg, Brand brand, OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls,
                                   OrderInstallDetail item, String mainName, String taskno) {
         /*if (org.apache.commons.lang3.StringUtils.isEmpty(item.getPgwcmxid())){
             item.setPgwcmxid(pgwcmxid);
@@ -1836,7 +1836,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         return Boolean.TRUE;
     }
 
-    private Boolean getItfTblazwgmxjykt(String taskno, ItfTblAzWgmxJyktUpload mxup) {
+    public Boolean getItfTblazwgmxjykt(String taskno, ItfTblAzWgmxJyktUpload mxup) {
         ItfTblazwgmxjykt kt = new ItfTblazwgmxjykt();
         MyBeanUtils.copyProperties(mxup,kt);
         kt.setSynTaskNo(taskno);
@@ -1845,7 +1845,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
     }
 
 
-    private Boolean getItfTblazwgmxsykt(String taskno, ItfTblAzWgmxSyktUpload mxup) {
+    public Boolean getItfTblazwgmxsykt(String taskno, ItfTblAzWgmxSyktUpload mxup) {
         ItfTblazwgmxsykt kt = new ItfTblazwgmxsykt();
         MyBeanUtils.copyProperties(mxup,kt);
         kt.setSynTaskNo(taskno);
@@ -1855,7 +1855,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         return itfTblazwgmxsyktService.save(kt);
     }
 
-    private Boolean getItfTblazwgmxqita(String taskno, ItfTblAzWgmxQitaUpload mxup) {
+    public Boolean getItfTblazwgmxqita(String taskno, ItfTblAzWgmxQitaUpload mxup) {
         ItfTblazwgmxqita ta = new ItfTblazwgmxqita();
         MyBeanUtils.copyProperties(mxup,ta);
         ta.setSynTaskNo(taskno);
@@ -1873,7 +1873,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
     }
 
-    private void upOrderInstallDetailCodeOutId(String orderBaseId) {
+    public void upOrderInstallDetailCodeOutId(String orderBaseId) {
         // 采集条码码 outid统一修改 自生成
         List<OrderInstallDetailCode> codelist = orderInstallDetailCodeService.lambdaQuery()
                 .eq(OrderInstallDetailCode::getOrderBaseId, orderBaseId)
@@ -1920,7 +1920,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         }
     }
 
-    private void upOrderInstallDetailOutId(String orderBaseId) {
+    public void upOrderInstallDetailOutId(String orderBaseId) {
         List<OrderInstallDetail> upList = new ArrayList<>();
         // 查看是否有需要修改的数据
         List<OrderInstallDetail> oids = orderInstallDetailService.lambdaQuery()
@@ -1960,7 +1960,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         }
     }
 
-    private void setJysWdno(OrderBase orderBase, ItfTblAzWgmxJyktUpload mxup) {
+    public void setJysWdno(OrderBase orderBase, ItfTblAzWgmxJyktUpload mxup) {
         WebsitSH websitSH = new WebsitSH();
 
         // 先从售后网点查
@@ -1973,7 +1973,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         mxup.setZjczwdxtbh(websitSH.getBrandSysWebsitNumber());
     }
 
-    private void setParma(Brand brand, OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls, Integer cjstat,
+    public void setParma(Brand brand, OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls, Integer cjstat,
                          ItfTblAzWgmxJyktUpload mxup, OrderInstallDetail detail) {
         WebsitSH websitSH = new WebsitSH();
 
@@ -2036,7 +2036,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
     }
 
-    private void setParm(OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls, Integer cjstat,
+    public void setParm(OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls, Integer cjstat,
                          ItfTblAzWgmxJyktUpload mxup, Brand brand) {
         WebsitSH websitSH = new WebsitSH();
 
@@ -2095,7 +2095,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
     }
 
-    private void setOtherParm(OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls, Integer cjstat,
+    public void setOtherParm(OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls, Integer cjstat,
                               ItfTblAzWgmxQitaUpload mxup, OrderInstallDetail detail, Brand brand) {
         WebsitSH websitSH = new WebsitSH();
 
@@ -2158,7 +2158,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
     }
 
-    private void setSyParm(OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls, Integer cjstat,
+    public void setSyParm(OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls, Integer cjstat,
                            ItfTblAzWgmxSyktUpload mxup, OrderInstallDetail detail, Brand brand) {
         WebsitSH websitSH = new WebsitSH();
 
@@ -2222,7 +2222,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
     }
 
-    private void setSyParm(OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls, Integer cjstat,
+    public void setSyParm(OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls, Integer cjstat,
                            ItfTblAzWgmxSyktUpload mxup, Brand brand) {
         WebsitSH websitSH = new WebsitSH();
 
@@ -2285,7 +2285,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
     }
 
 
-    private void setSyWdno(OrderBase orderBase, ItfTblAzWgmxSyktUpload mxup) {
+    public void setSyWdno(OrderBase orderBase, ItfTblAzWgmxSyktUpload mxup) {
         WebsitSH websitSH = new WebsitSH();
 
         // 售后网点处理
@@ -2297,7 +2297,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
     }
 
 
-    private void setOtherWdno(OrderBase orderBase, ItfTblAzWgmxQitaUpload mxup) {
+    public void setOtherWdno(OrderBase orderBase, ItfTblAzWgmxQitaUpload mxup) {
         // 先从售后网点查
         WebsitSH websitSH = new WebsitSH();
 

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

@@ -1231,7 +1231,7 @@ public class PublicServiceImpl implements PublicService {
             bcs = (Belongcompany) redis.get(RedisConstant.CENTER_CODE + bcp);
         } else {
             bcs = belongcompanyService.lambdaQuery()
-                    .eq(Belongcompany::getBelongCompanyProfession,bcp).one();
+                    .eq(Belongcompany::getBelongCompanyProfession,bcp).last("limit 1").one();
 
             if (bcs != null){
                 redis.set(RedisConstant.CENTER_CODE + bcp, bcs,RedisConstant.CENTER_CODE_TIME_LENGTH);

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

@@ -256,20 +256,23 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
                 .eq(OrderBase::getId, sourceData.getOrderNo())
                 .last("limit 1")
                 .one();
-        if (StringUtils.isEmpty(orderBase.getPgid())){
-            publicService.updateUploadTaskLisError(sourceData,"order_base表pgid为空暂不同步");
-            return;
-        }
 
-        // 修改日志表pgid   getpgid方法已处理
-        // 修改当前ID的 fkid该值通过接口获取的
-        upfkid(sourceData,newDykh);
-        // 修改日志表内部序列outid + 自生成 fkmxguid
-        upOrderRepairOperatingLogOutId(orderBase);
-        // 生成维修单过程反馈数据
-        getItfTblAssignFkmxUpload(brand, taskId, sourceData,orderBase);
-        // 改约或者预约时增加写 itf_tbl_assign_appointment_upload 这里不再处理移动外面单独处理
-        // getItfTblAssignAppointmentUpload(sourceData);
+        if (orderBase !=null && orderBase.getUploadFlag()){
+            if (StringUtils.isEmpty(orderBase.getPgid())){
+                publicService.updateUploadTaskLisError(sourceData,"order_base表pgid为空暂不同步");
+                return;
+            }
+
+            // 修改日志表pgid   getpgid方法已处理
+            // 修改当前ID的 fkid该值通过接口获取的
+            upfkid(sourceData,newDykh);
+            // 修改日志表内部序列outid + 自生成 fkmxguid
+            upOrderRepairOperatingLogOutId(orderBase);
+            // 生成维修单过程反馈数据
+            getItfTblAssignFkmxUpload(brand, taskId, sourceData,orderBase);
+            // 改约或者预约时增加写 itf_tbl_assign_appointment_upload 这里不再处理移动外面单独处理
+            // getItfTblAssignAppointmentUpload(sourceData);
+        }
 
         // 修改数据上传任务表中的状态   这里固定值 68
         publicService.updateUploadTaskListStatus(row.getOrderNo(), row.getSynReqId(),1, uploadTaskType);
@@ -282,7 +285,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
                 .last("limit 1")
                 .one();
 
-        if (orderBase !=null ){
+        if (orderBase !=null  && orderBase.getUploadFlag()){
             // 修改内部序列outid
             upOutId(orderBase);
 
@@ -297,7 +300,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         publicService.updateUploadTaskListStatus(ojtutl.getOrderNo(), ojtutl.getSynReqId(),1, ojtutl.getUploadTaskType());
     }
 
-    private void upOutId(OrderBase orderBase) {
+    public void upOutId(OrderBase orderBase) {
         List<OrderReAppointment> upList = new ArrayList<>();
 
         List<OrderReAppointment> detaillist = orderReAppointmentService.lambdaQuery()
@@ -331,7 +334,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         }
     }
 
-    private void upOrderRepairOperatingLogOutId(OrderBase orderBase) {
+    public void upOrderRepairOperatingLogOutId(OrderBase orderBase) {
         List<OrderRepairOperatingLog> upList = new ArrayList<>();
         List<OrderRepairOperatingLog> upfkmxList = new ArrayList<>();
 
@@ -376,7 +379,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         }
     }
 
-    private void upfkid(OutJiasmToGreeUploadTaskList sourceData,String newDykh) {
+    public void upfkid(OutJiasmToGreeUploadTaskList sourceData,String newDykh) {
         OrderPar request = new OrderPar();
         request.setId(sourceData.getId());
         request.setOrderNo(sourceData.getOrderNo());
@@ -384,7 +387,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         repairLogMapper.upRepairLogFkid(request);
     }
 
-    private void getItfTblAssignAppointmentUpload(OutJiasmToGreeUploadTaskList sourceData) {
+    public void getItfTblAssignAppointmentUpload(OutJiasmToGreeUploadTaskList sourceData) {
         OrderPar req = new OrderPar();
         req.setId(sourceData.getId());
         req.setOrderNo(sourceData.getOrderNo());
@@ -395,7 +398,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
     }
 
     @NotNull
-    private void getItfTblAssignFkmxUpload(Brand brand, Long taskId, OutJiasmToGreeUploadTaskList sourceData, OrderBase orderBase) {
+    public void getItfTblAssignFkmxUpload(Brand brand, Long taskId, OutJiasmToGreeUploadTaskList sourceData, OrderBase orderBase) {
         OrderPar req = new OrderPar();
         WebsitSH websitSH = new WebsitSH();
         req.setId(sourceData.getId());
@@ -453,7 +456,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         publicService.updateUploadTaskListStatus(row.getOrderNo(), row.getSynReqId(),1, uploadTaskType);
     }
 
-    private void upOrderProductOutId(OutJiasmToGreeUploadTaskList sourceData) {
+    public void upOrderProductOutId(OutJiasmToGreeUploadTaskList sourceData) {
         List<OrderProduct> upList = new ArrayList<>();
         List<OrderProduct> oplist = orderProductService.lambdaQuery()
                 .eq(OrderProduct::getOrderBaseId, sourceData.getOrderNo())
@@ -485,7 +488,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         }
     }
 
-    private void getItfTblAssignMxUpload(Brand brand, OutJiasmToGreeUploadTaskList sourceData) {
+    public void getItfTblAssignMxUpload(Brand brand, OutJiasmToGreeUploadTaskList sourceData) {
         OrderPar request = new OrderPar();
         WebsitSH websitSH = new WebsitSH();
         OrderBase orderBase = orderBaseService.lambdaQuery()
@@ -510,7 +513,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         itfTblAssignMxUploadService.save(mx);
     }
 
-    private void upPgmxid(OutJiasmToGreeUploadTaskList row, OutJiasmToGreeUploadTaskList sourceData, String newDykh) {
+    public void upPgmxid(OutJiasmToGreeUploadTaskList row, OutJiasmToGreeUploadTaskList sourceData, String newDykh) {
         OrderPar orderPar = new OrderPar();
         orderPar.setOrderNo(sourceData.getOrderNo());
         orderPar.setPgid(newDykh);
@@ -527,24 +530,27 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         // 提取工单数据
         OrderBase orderBase = orderBaseService.lambdaQuery()
                 .eq(OrderBase::getId, sourceData.getOrderNo()).one();
-        // 删除工单更新被忽略
-        // 修改工单的pgid,pgguid
-        uppare(newDykh, orderBase);
+        if (orderBase !=null && orderBase.getUploadFlag()){
+            // 删除工单更新被忽略
+            // 修改工单的pgid,pgguid
+            uppare(newDykh, orderBase);
 
-        // 如果无附件则忽略结算数据上传处理
-        if (checkFile(row, orderBase)) {
-            return ;
-        }
-        // 生成数据
-        if (generateData(brand, orderBase)) {
-            return ;
+            // 如果无附件则忽略结算数据上传处理
+            if (checkFile(row, orderBase)) {
+                return ;
+            }
+            // 生成数据
+            if (generateData(brand, orderBase)) {
+                return ;
+            }
         }
+
         // 修改数据上传任务表中的状态   这里固定值 661
         publicService.updateUploadTaskListStatus(row.getOrderNo(), row.getSynReqId(),1,661);
         return ;
     }
 
-    private boolean generateData(Brand brand, OrderBase orderBase) {
+    public boolean generateData(Brand brand, OrderBase orderBase) {
         // 工单，采集表id,uuid, TL_fa_order_repair_detail_js
         // j_syn_task_no 统一uuid
         String j_syn_task_no = UUID.randomUUID().toString();
@@ -577,7 +583,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         return false;
     }
 
-    private boolean checkFile(OutJiasmToGreeUploadTaskList row, OrderBase orderBase) {
+    public boolean checkFile(OutJiasmToGreeUploadTaskList row, OrderBase orderBase) {
         // 提取附件数据
         List<OrderDetailFile> files = orderDetailFileService.lambdaQuery()
                 .eq(OrderDetailFile::getOrderBaseId, orderBase.getId()).list();
@@ -595,7 +601,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         return false;
     }
 
-    private void uppare(String newDykh, OrderBase orderBase) {
+    public void uppare(String newDykh, OrderBase orderBase) {
         if (StringUtils.isEmpty(orderBase.getPgid()) || StringUtils.isEmpty(orderBase.getPgguid())){
             OrderBase up = new OrderBase();
             up.setId(orderBase.getId());
@@ -611,7 +617,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         }
     }
 
-    private void generateItfTblWxjsPjmxJyktUploadAndTow(OrderBase orderBase, String j_syn_task_no, OrderRepairDetail item) {
+    public void generateItfTblWxjsPjmxJyktUploadAndTow(OrderBase orderBase, String j_syn_task_no, OrderRepairDetail item) {
         // 提取配置件数据
         List<OrderRepairDetailReason> reasons =  orderRepairDetailReasonService.lambdaQuery()
                 .eq(OrderRepairDetailReason::getOrderRepairDetailId, item.getId()).list();
@@ -624,7 +630,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
     }
 
     @NotNull
-    private ItfTblWxjsPjmxJyktUpload generateItfTblWxjsPjmxJyktUpload(OrderBase orderBase, OrderRepairDetailReason rs) {
+    public ItfTblWxjsPjmxJyktUpload generateItfTblWxjsPjmxJyktUpload(OrderBase orderBase, OrderRepairDetailReason rs) {
         OrderPar request = new OrderPar();
         request.setId(rs.getId());
         ItfTblWxjsPjmxJyktUpload pj = reasonOrderRepairDetailMapper.getItfTblWxjsPjmxJyktUpload(request);
@@ -634,7 +640,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         return pj;
     }
 
-    private void generateItfTblwxjspjmxjykt(String j_syn_task_no, ItfTblWxjsPjmxJyktUpload pj) {
+    public void generateItfTblwxjspjmxjykt(String j_syn_task_no, ItfTblWxjsPjmxJyktUpload pj) {
         ItfTblwxjspjmxjykt pjt = new ItfTblwxjspjmxjykt();
         MyBeanUtils.copyProperties(pj,pjt);
         pjt.setSynTaskNo(j_syn_task_no);
@@ -642,7 +648,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         itfTblwxjspjmxjyktService.save(pjt);
     }
 
-    private boolean generateItfTblWxjsWxxmJyktUploadAndTow(OrderBase orderBase, String j_syn_task_no, OrderRepairDetail item) {
+    public boolean generateItfTblWxjsWxxmJyktUploadAndTow(OrderBase orderBase, String j_syn_task_no, OrderRepairDetail item) {
         // 提取维修项目数据
         List<OrderRepairDetailItem> ordList =  orderRepairDetailItemService.lambdaQuery()
                 .eq(OrderRepairDetailItem::getOrderRepairDetailId, item.getId()).list();
@@ -671,7 +677,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
     }
 
     @NotNull
-    private ItfTblWxjsWxxmJyktUpload generateItfTblWxjsWxxmJyktUpload(OrderBase orderBase, OrderRepairDetailItem ord) {
+    public ItfTblWxjsWxxmJyktUpload generateItfTblWxjsWxxmJyktUpload(OrderBase orderBase, OrderRepairDetailItem ord) {
         OrderPar request = new OrderPar();
         request.setId(ord.getId());
         ItfTblWxjsWxxmJyktUpload wxxm = reasonOrderRepairDetailMapper.getItfTblWxjsWxxmJyktUpload(request);
@@ -681,7 +687,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         return wxxm;
     }
 
-    private void generateItfTblwxjswxxmjykt(String j_syn_task_no, ItfTblWxjsWxxmJyktUpload wxxm) {
+    public void generateItfTblwxjswxxmjykt(String j_syn_task_no, ItfTblWxjsWxxmJyktUpload wxxm) {
         // 查看维修结算2表数据有无插入成功
         ItfTblwxjsjykt jskt = itfTblwxjsjyktService.lambdaQuery()
                 .eq(ItfTblwxjsjykt::getSynTaskNo, j_syn_task_no).one();
@@ -694,7 +700,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         }
     }
 
-    private boolean generateInstallCJDetailFileAndTow(OrderBase orderBase, String j_syn_task_no, OrderRepairDetail item) {
+    public boolean generateInstallCJDetailFileAndTow(OrderBase orderBase, String j_syn_task_no, OrderRepairDetail item) {
         // 提取数据采集附件数据
         List<OrderDetailFile> odfs =  orderDetailFileService.lambdaQuery()
                 .eq(OrderDetailFile::getOrderBaseId, orderBase.getId())
@@ -732,7 +738,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         return false;
     }
 
-    private void generateInstallCJDetailFileTow(String j_syn_task_no, ItfTblWxjsFjJyktUpload fj) {
+    public void generateInstallCJDetailFileTow(String j_syn_task_no, ItfTblWxjsFjJyktUpload fj) {
         ItfTblwxjsfjjykt fjt = new ItfTblwxjsfjjykt();
         MyBeanUtils.copyProperties(fj,fjt);
         fjt.setSynTaskNo(j_syn_task_no);
@@ -746,7 +752,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
     }
 
     @NotNull
-    private ItfTblWxjsFjJyktUpload generateInstallCJDetailFile(OrderBase orderBase, OrderDetailFile file) {
+    public ItfTblWxjsFjJyktUpload generateInstallCJDetailFile(OrderBase orderBase, OrderDetailFile file) {
         InstallCJDetailFile request = new InstallCJDetailFile();
         request.setOrderNo(orderBase.getId());
         request.setId(file.getId());
@@ -757,7 +763,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         return fj;
     }
 
-    private void generateItfTblwxjsxxyyjyktAndTow(String j_syn_task_no, OrderRepairDetail item) {
+    public void generateItfTblwxjsxxyyjyktAndTow(String j_syn_task_no, OrderRepairDetail item) {
         // 维修数据采集故障现象表
         // 提取维修数据采集故障现象数据  数据采集明细表的所有id
         List<OrderRepairDetailReason> reasons =  orderRepairDetailReasonService.lambdaQuery()
@@ -776,7 +782,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         }
     }
 
-    private void generateItfTblwxjsxxyyjykt(String j_syn_task_no, ItfTblWxjsXxyyJyktUpload add) {
+    public void generateItfTblwxjsxxyyjykt(String j_syn_task_no, ItfTblWxjsXxyyJyktUpload add) {
         // 查看维修结算2表数据有无插入成功
         ItfTblwxjsjykt jskt = itfTblwxjsjyktService.lambdaQuery()
                 .eq(ItfTblwxjsjykt::getSynTaskNo, j_syn_task_no).one();
@@ -800,7 +806,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         }
     }
 
-    private void generateJyktDataTow(OrderBase orderBase, OrderRepairDetail item, Long synReqId, String j_syn_task_no) {
+    public void generateJyktDataTow(OrderBase orderBase, OrderRepairDetail item, Long synReqId, String j_syn_task_no) {
         OrderPar request = new OrderPar();
         request.setOrderNo(orderBase.getId());
         request.setId(item.getId());
@@ -812,7 +818,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         itfTblwxjsjyktService.save(jsjy);
     }
 
-    private void setssxcInfo(ItfTblwxjsjykt jsjy) {
+    public void setssxcInfo(ItfTblwxjsjykt jsjy) {
         List<BrandLbsRelate> br;
         // 街道处理
         if (StringUtils.isNotEmpty(jsjy.getXzhen())){
@@ -860,14 +866,14 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         }
     }
 
-    private Long generateJyktData(Brand brand, OrderBase orderBase, OrderRepairDetail item) {
+    public Long generateJyktData(Brand brand, OrderBase orderBase, OrderRepairDetail item) {
         ItfTblWxjsJyktUpload jykt = generateJykt(brand, orderBase, item);
         jykt.setSynStatus(44);
         itfTblWxjsJyktUploadService.save(jykt);
         return jykt.getSynReqId();
     }
 
-    private boolean checkFiles(OrderBase orderBase) {
+    public boolean checkFiles(OrderBase orderBase) {
         // 检查内机条码附件完整性
         InstallCJDetailFile installCJDetailFile = new InstallCJDetailFile();
         installCJDetailFile.setOrderNo(orderBase.getId());
@@ -961,7 +967,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         generateRepairDetailOrReason(brand, orderBase);
     }
 
-    private Boolean dataInit(OutJiasmToGreeUploadTaskList sourceData, String newDykh, OrderBase orderBase) {
+    public Boolean dataInit(OutJiasmToGreeUploadTaskList sourceData, String newDykh, OrderBase orderBase) {
         // 同步工单的pgid,pguuid
         upOrderBasePgid(orderBase, newDykh);
         // 同步维修工单产品信息 pgid
@@ -991,7 +997,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
     }
 
 
-    private Boolean checkOrderDetailFile(String id) {
+    public Boolean checkOrderDetailFile(String id) {
         List<OrderDetailFile> detailFiles = new ArrayList<>();
         Boolean flag = Boolean.TRUE;
         detailFiles = orderDetailFileService.lambdaQuery()
@@ -1014,7 +1020,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         return flag;
     }
 
-    private void updateOrderRepairDetailWxjsguid(String id) {
+    public void updateOrderRepairDetailWxjsguid(String id) {
         List<OrderRepairDetail> upList = new ArrayList<>();
         // 看有无需要修改的数据
         List<OrderRepairDetail> detaillistz = orderRepairDetailService.lambdaQuery()
@@ -1037,7 +1043,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         detaillistz.clear();
     }
 
-    private Boolean checkFile(String orderNo, Long synReqId){
+    public Boolean checkFile(String orderNo, Long synReqId){
         InstallCJDetailFile installCJDetailFile = new InstallCJDetailFile();
         installCJDetailFile.setOrderNo(orderNo);
         List<OrderDetailFile> detailFiles = fileOrderDetailMapper.getIdRe(installCJDetailFile);
@@ -1051,7 +1057,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
     }
 
     // 修改 维修现象主键、维修明细主键
-    private void upOrderRepairDetailReason(String id) {
+    public void upOrderRepairDetailReason(String id) {
         List<OrderRepairDetailReason> ulist = new ArrayList<>();
         // 提取采集的数据
         List<OrderRepairDetail> orderRepairDetails = orderRepairDetailService.lambdaQuery()
@@ -1144,7 +1150,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         }
     }
 
-    private void generatePj(OrderBase orderBase, List<ItfTblWxjsPjmxJyktUpload> pjs, OrderRepairDetail detail) {
+    public void generatePj(OrderBase orderBase, List<ItfTblWxjsPjmxJyktUpload> pjs, OrderRepairDetail detail) {
         // 提取配置件数据
         List<OrderRepairDetailReason> reasons =  orderRepairDetailReasonService.lambdaQuery()
                 .eq(OrderRepairDetailReason::getOrderRepairDetailId, detail.getId()).list();
@@ -1157,7 +1163,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         }
     }
 
-    private void generateFee(OrderBase orderBase, OrderRepairDetail detail,Brand brand,
+    public void generateFee(OrderBase orderBase, OrderRepairDetail detail,Brand brand,
                              List<ItfTblWxjsWxxmJyktUpload> wxxms,
                              List<ItfTblAssignFeeUpload> fees){
         // 提取维修项目数据
@@ -1195,7 +1201,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         }
     }
 
-    private void generateFile(OrderBase orderBase, OrderRepairDetail detail, List<ItfTblWxjsFjJyktUpload> fjs){
+    public void generateFile(OrderBase orderBase, OrderRepairDetail detail, List<ItfTblWxjsFjJyktUpload> fjs){
         // 提取数据采集附件数据
         List<OrderDetailFile> odfs =  orderDetailFileService.lambdaQuery()
                 .eq(OrderDetailFile::getOrderBaseId,orderBase.getId())
@@ -1240,7 +1246,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         }
     }
 
-    private void generateFileInit(OrderBase orderBase) {
+    public void generateFileInit(OrderBase orderBase) {
         // 提取采集的数据
         List<OrderRepairDetail> orderRepairDetails = orderRepairDetailService.lambdaQuery()
                 .eq(OrderRepairDetail::getOrderBaseId, orderBase.getId())
@@ -1261,7 +1267,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
     }
 
 
-    private void OrderDetailFileInit(OrderBase orderBase, OrderRepairDetail detail){
+    public void OrderDetailFileInit(OrderBase orderBase, OrderRepairDetail detail){
         List<OrderDetailFile> upodfs = new ArrayList<>();
         List<OrderDetailFile> odfs = new ArrayList<>();
         // 提取数据采集附件数据
@@ -1291,7 +1297,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         odfs.clear();
     }
 
-    private void OrderDetailFileUpload(OrderBase orderBase, OrderRepairDetail detail){
+    public void OrderDetailFileUpload(OrderBase orderBase, OrderRepairDetail detail){
         String oldFile ="";
         String newFile ="";
         // 提取数据采集附件数据
@@ -1320,7 +1326,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         }
     }
 
-    private Boolean uploadFileexc(String newFile, String oldFile,String wdno,OrderDetailFile file) {
+    public Boolean uploadFileexc(String newFile, String oldFile,String wdno,OrderDetailFile file) {
         try{
             // 1: 获取签名信息
             GreeFileResponseHelper response =  greeLogic.ossGetSignt(wdno,"GET");
@@ -1367,7 +1373,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         }
     }
 
-    private void getSaveFileInfo(String id1, ResultData resultData, Map<String, String> req) {
+    public void getSaveFileInfo(String id1, ResultData resultData, Map<String, String> req) {
         req.put("bizAppId","flydiy-auto-sit-default-front-greeshmerge");
         req.put("bizTable","default");
         req.put("bizType","default");
@@ -1376,7 +1382,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         req.put("name", id1 +".jpeg");
     }
 
-    private void generateReason(List<ItfTblWxjsXxyyJyktUpload> jyktus, OrderRepairDetail detail) {
+    public void generateReason(List<ItfTblWxjsXxyyJyktUpload> jyktus, OrderRepairDetail detail) {
         // 提取维修数据采集故障现象数据  数据采集明细表的所有id
         List<OrderRepairDetailReason> reasons =  orderRepairDetailReasonService.lambdaQuery()
                 .eq(OrderRepairDetailReason::getOrderRepairDetailId, detail.getId()).list();
@@ -1393,7 +1399,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
 
 
 
-    private void generateJyktU(List<ItfTblWxjsXxyyJyktUpload> jyktus, OrderRepairDetail detail, OrderRepairDetailReason r) {
+    public void generateJyktU(List<ItfTblWxjsXxyyJyktUpload> jyktus, OrderRepairDetail detail, OrderRepairDetailReason r) {
         ItfTblWxjsXxyyJyktUpload add = new ItfTblWxjsXxyyJyktUpload();
         add.setWorkerOrderNo(detail.getOrderBaseId());
         add.setFaOrderRepairFaultInfoId(Integer.valueOf(String.valueOf(r.getCreateTime().getTime())));
@@ -1415,7 +1421,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         jyktus.add(add);
     }
 
-    private ItfTblWxjsXxyyJyktUpload generateJyktUT(OrderRepairDetail detail, OrderRepairDetailReason r) {
+    public ItfTblWxjsXxyyJyktUpload generateJyktUT(OrderRepairDetail detail, OrderRepairDetailReason r) {
         ItfTblWxjsXxyyJyktUpload add = new ItfTblWxjsXxyyJyktUpload();
         add.setWorkerOrderNo(detail.getOrderBaseId());
         add.setFaOrderRepairFaultInfoId(Integer.valueOf(String.valueOf(r.getCreateTime().getTime())));
@@ -1439,7 +1445,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         return add;
     }
 
-    private void upxxyyguid(OrderRepairDetailReason r) {
+    public void upxxyyguid(OrderRepairDetailReason r) {
         OrderRepairDetailReason up = new OrderRepairDetailReason();
         up.setId(r.getId());
         if (StringUtils.isEmpty(r.getXxyyguid())){
@@ -1453,7 +1459,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         orderRepairDetailReasonService.updateById(up);
     }
 
-    private ItfTblWxjsJyktUpload generateJykt(Brand brand, OrderBase orderBase, OrderRepairDetail detail) {
+    public ItfTblWxjsJyktUpload generateJykt(Brand brand, OrderBase orderBase, OrderRepairDetail detail) {
         WebsitSH websitSH = new WebsitSH();
 
         /*// 修改序采集单内的序
@@ -1499,7 +1505,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         return jykt;
     }
 
-    private void upOrderRepairDetail(String id) {
+    public void upOrderRepairDetail(String id) {
         List<OrderRepairDetail> upList = new ArrayList<>();
         // 看有无需要修改的数据
         List<OrderRepairDetail> detaillistz = orderRepairDetailService.lambdaQuery()
@@ -1540,7 +1546,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         }
     }
 
-    private void upBrandPgid(OrderBase orderBase) {
+    public void upBrandPgid(OrderBase orderBase) {
         OrderPar request = new OrderPar();
         request.setOrderNo(orderBase.getPgid());
         request.setPgid(orderBase.getPgid());
@@ -1548,7 +1554,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         detailOrderRepairMapper.updatePgid(request);
     }
 
-    private void upBrandWxjsguid(OrderRepairDetail detail) {
+    public void upBrandWxjsguid(OrderRepairDetail detail) {
         if (StringUtils.isEmpty(detail.getBrandWxjsguid())){
             // 修改uuid
             OrderRepairDetail up = new OrderRepairDetail();
@@ -1559,7 +1565,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         }
     }
 
-    private void updateUploadTaskList(Long synReqId,Integer synStatus,String msg) {
+    public void updateUploadTaskList(Long synReqId,Integer synStatus,String msg) {
         OutJiasmToGreeUploadTaskList upoutgultl = new OutJiasmToGreeUploadTaskList();
         upoutgultl.setSynReqId(synReqId);
         upoutgultl.setSynStatus(synStatus);
@@ -1596,7 +1602,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         itfTblAssignUploadService.save(itass);
     }
 
-    private void upOrderProduct(OutJiasmToGreeUploadTaskList sourceData, String newDykh) {
+    public void upOrderProduct(OutJiasmToGreeUploadTaskList sourceData, String newDykh) {
         List<OrderProduct> uops = new ArrayList<>();
         List<OrderProduct> ops = orderProductService.lambdaQuery()
                 .eq(OrderProduct::getOrderBaseId,sourceData.getOrderNo())
@@ -1615,7 +1621,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         uops.clear();
     }
 
-    private void upFaGreeSmsWorker(OutJiasmToGreeUploadTaskList sourceData, String newDykh) {
+    public void upFaGreeSmsWorker(OutJiasmToGreeUploadTaskList sourceData, String newDykh) {
         FaGreeSmsWorker up = new FaGreeSmsWorker();
         up.setFjid(newDykh);
         QueryWrapper upWrapper = new QueryWrapper<FaGreeSmsWorker>()
@@ -1736,7 +1742,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
 
 
 
-    private void getpreparOrderPar(Map<String, List<SysDictRef>> sysDictRefXLMapXq, OrderBase orderBase,
+    public void getpreparOrderPar(Map<String, List<SysDictRef>> sysDictRefXLMapXq, OrderBase orderBase,
                                    ItfTblAssignUpload itass, String orderNo, Brand brand) {
         WebsitSH websitSH = new WebsitSH();
 
@@ -1814,7 +1820,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         }
     }
 
-    private void setYhyyczsj(ItfTblAssignUpload itass, String orderNo) {
+    public void setYhyyczsj(ItfTblAssignUpload itass, String orderNo) {
         List<OrderReAppointment> yys =  orderReAppointmentService.lambdaQuery()
                 .eq(OrderReAppointment::getOrderBaseId, orderNo)
                 .eq(OrderReAppointment::getFlag,0)
@@ -1832,7 +1838,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         }
     }
 
-    private void setssxz(ItfTblAssignUpload itass){
+    public void setssxz(ItfTblAssignUpload itass){
         List<BrandLbsRelate> br;
         // 街道处理
         if (StringUtils.isNotEmpty(itass.getXzhenid())){
@@ -1899,7 +1905,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         }
     }
 
-    private String getpgid(Token token, int uploadTaskType, String srcTabNameForGreekey, String greekeyGetMode,
+    public String getpgid(Token token, int uploadTaskType, String srcTabNameForGreekey, String greekeyGetMode,
                            OutJiasmToGreeUploadTaskList row, String newDykh) throws Exception {
         // 获取方式 Qry=从控制表获取 Ins=插入表获取自增列
         String greeKey;
@@ -2022,7 +2028,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         return newDykh;
     }
 
-    private Map<String, Object> genDataMapFromSource(Long pgid, String taskExtraInfo, int uploadTaskType) {
+    public Map<String, Object> genDataMapFromSource(Long pgid, String taskExtraInfo, int uploadTaskType) {
         Map<String, Object> paramMap = new HashMap<String, Object>();
         paramMap.put(DataUtil.fromDbName2ServiceName("pgid"), pgid);
         if (uploadTaskType == 67) {
@@ -2031,7 +2037,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         return paramMap;
     }
 
-    private void upFaGreeSmsFjid(OutJiasmToGreeUploadTaskList sourceData, String newDykh) {
+    public void upFaGreeSmsFjid(OutJiasmToGreeUploadTaskList sourceData, String newDykh) {
         FaGreeSms up = new FaGreeSms();
         up.setFjid(newDykh);
         QueryWrapper upWrapper = new QueryWrapper<FaGreeSms>()
@@ -2042,7 +2048,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         faGreeSmsService.update(up,upWrapper);
     }
 
-    private void uporderRepairOperatingLogpgid(OutJiasmToGreeUploadTaskList sourceData, String newDykh) {
+    public void uporderRepairOperatingLogpgid(OutJiasmToGreeUploadTaskList sourceData, String newDykh) {
         List<OrderRepairOperatingLog> uops = new ArrayList<>();
         List<OrderRepairOperatingLog> ops = orderRepairOperatingLogService.lambdaQuery()
                 .eq(OrderRepairOperatingLog::getOrderBaseId,sourceData.getOrderNo())
@@ -2061,7 +2067,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         uops.clear();
     }
 
-    private void upOrderBasePgguid(OutJiasmToGreeUploadTaskList sourceData, OrderBase orderBase) {
+    public void upOrderBasePgguid(OutJiasmToGreeUploadTaskList sourceData, OrderBase orderBase) {
         if (StringUtils.isEmpty(orderBase.getPgguid()) || orderBase.getPgguid().equals("0")){
             OrderBase up = new OrderBase();
             up.setPgguid(UUID.randomUUID().toString());
@@ -2074,7 +2080,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         }
     }
 
-    private void upOrderBasePgid(OrderBase orderBase, String newDykh) {
+    public void upOrderBasePgid(OrderBase orderBase, String newDykh) {
         if (StringUtils.isEmpty(orderBase.getPgid()) || orderBase.getPgid().equals("0")){
             orderBase.setPgid(newDykh);
         }
@@ -2085,7 +2091,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         orderBase.updateById();
     }
 
-    private void stopUpload(@NotNull OutJiasmToGreeUploadTaskList ojtutl, String msg) {
+    public void stopUpload(@NotNull OutJiasmToGreeUploadTaskList ojtutl, String msg) {
         OutJiasmToGreeUploadTaskList up = new OutJiasmToGreeUploadTaskList();
         up.setSynReqId(ojtutl.getSynReqId());
         up.setSynStatus(99);

src/main/java/com/zfire/jiasm/syncdata/upload/order/InstallProduceDataUpload.java

@@ -61,7 +61,7 @@ public class InstallProduceDataUpload {
 
 
     @Scheduled(fixedDelayString = "${azuploadysc}")
-    private void produceList(){
+    public void produceList(){
         if (azuploadyscc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }

src/main/java/com/zfire/jiasm/syncdata/upload/order/RepairProduceDataUpload.java

@@ -31,7 +31,7 @@ public class RepairProduceDataUpload {
 
 
     @Scheduled(fixedDelayString = "${wxuploadysc}")
-    private void produceList() throws Exception {
+    public void produceList() throws Exception {
         if (wxuploadyscc.equals(TaskConfigEnum.FALSE.getCode())) {
             return;
         }