add

src/main/java/com/zfire/jiasm/syncdata/service/PublicService.java

@@ -84,6 +84,10 @@ public interface PublicService {
 
     // 获取师傅在商户网点账号 平台师傅账号，商户网点编号，集团ID，平台网点ID
     Long getBrandWorkerId(String workerId,String brandWebsitId,String groupCompanyId, String websitId);
+
+    // 获取师傅在商户网点账号
+    String getBrandWorkerNo(String workerId,String brandWebsitId,String groupCompanyId, String websitId);
+
     // 获取师傅信息 平台师傅账号，商户网点编号，集团ID
     WorderInfo getWorkerInfo(String workerId,String brandWebsitId,String groupCompanyId);
 

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

@@ -1227,6 +1227,28 @@ public class PublicServiceImpl implements PublicService {
         return brandWorkerId;
     }
 
+
+    @Override
+    public String getBrandWorkerNo(String workerId,String brandWebsitId,String groupCompanyId, String websitId){
+        String brandWorkerNo ="";
+
+        WorkerBrandAccount wba = workerBrandAccountService.lambdaQuery()
+                .eq(WorkerBrandAccount::getGroupCompanyId,groupCompanyId)
+                .eq(WorkerBrandAccount::getDel,0)
+                .eq(WorkerBrandAccount::getWorkerId,workerId)
+                .eq(WorkerBrandAccount::getBrandWebsitId,brandWebsitId)
+                .eq(WorkerBrandAccount::getWebsitId,websitId)
+                .last("limit 1")
+                .one();
+        if (wba !=null){
+            if (StringUtils.isNotEmpty(wba.getBrandWorkerNumber())){
+                return wba.getBrandWorkerNumber();
+            }
+        }
+
+        return brandWorkerNo;
+    }
+
     @Override
     public WorderInfo getWorkerInfo(String workerId,String brandWebsitId,String groupCompanyId){
         WorderInfo info = new WorderInfo();

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

@@ -180,7 +180,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
                 List<OutJiasmToGreeUploadTaskList> result = outJiasmToGreeUploadTaskListService.lambdaQuery()
                         .eq(OutJiasmToGreeUploadTaskList::getSynStatus,0)
                         .eq(OutJiasmToGreeUploadTaskList::getUploadTaskType,uploadTaskType)
-                        // .eq(OutJiasmToGreeUploadTaskList::getSynReqId,807L)// 测试用
+                        // .eq(OutJiasmToGreeUploadTaskList::getSynReqId,2398L)// 测试用
                         .orderByAsc(OutJiasmToGreeUploadTaskList::getSynReqId).list();
                 // 相同任务类型的数据逐个处理
                 for (OutJiasmToGreeUploadTaskList row: result){
@@ -1775,12 +1775,13 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         // 维修网点即售后网点处理
         jykt.setWxwdno(websitSH.getWdId());
         jykt.setWxwdmc(websitSH.getWdmc());
+
         // 提取安装师傅的账号信息
-        jykt.setCzrid(String.valueOf(publicService.getBrandWorkerId(orderBase.getWorkerId(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId())));
-        jykt.setWxgid(Long.valueOf(jykt.getCzrid()));
+        jykt.setWxgid(publicService.getBrandWorkerId(orderBase.getWorkerId(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId()));
+        // 这里的czrid放师傅所以网点编号
+        jykt.setCzrid(publicService.getBrandWorkerNo(orderBase.getWorkerId(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId()));
         jykt.setWxgdh(orderBase.getWorkerMobile());
 
-
         // 结算网点编号即售后网点处理
         websitSH = publicService.ptshwdToshshwd(jykt.getJswdno(),orderBase.getMainId());
         jykt.setJswdno(websitSH.getWdId());

src/main/resources/bootstrap-prdt.properties

@@ -299,7 +299,7 @@ workercertificatec=FALSE
 workerceruploadc=FALSE
 detaildownc=FALSE
 workercertbxc=FALSE
-workerrzc=TRUE
+workerrzc=FALSE
 #回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表
 recycledownc=FALSE
 recyclefkdownc=FALSE
@@ -394,7 +394,7 @@ tmscc=FALSE
 azuploadyscc=FALSE
 azuploadscc=FALSE
 #维修工单上传  生成需要上传的数据、生成上传任务清单列表
-wxuploadyscc=FALSE
+wxuploadyscc=TRUE
 wxuploadscc=FALSE
 #以旧换新 鉴定单、生成条码、条码上传
 yjhxjddc=FALSE

src/main/resources/mapper/WxjsJyktUploadMapper.xml

@@ -8,7 +8,7 @@
                 wxgdh,wxfy,jtfy,qtfy,zjfy,wxwdno,wxwdmc,beiz,czrid,czrmc,
                 sftb,sffh,gpsdzxx,yddh,zsfy,dzfy,spid,spmc,1120 as stat,cjdt,1 as dnorsj,
                 pgmxid,sjcjjd,sjcjwd,yyjflag,a.wxlx,bwgsj,area_code as qhao,address as yhdz, user_name as yhxm,
-                b.province_id as sfen,b.city_id as cshi,b.area_id as xian,b.street_id as xzhen
+                b.province_id as sfen,b.city as cshi,b.area_id as xian,b.street_id as xzhen
         from itf_tbl_wxjs_jykt_upload a, order_base b
         where a.worker_order_no = #{request.orderNo} and a.fa_order_repair_detail_id = #{request.id}
           and a.worker_order_no = b.id and syn_req_id = #{request.synReqId}