add

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

@@ -128,6 +128,8 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
     ItfTblAzWgmxQitaTmmxUploadService itfTblAzWgmxQitaTmmxUploadService;
     @Resource
     ItfTblAzWgmxJyktTmmxUploadService itfTblAzWgmxJyktTmmxUploadService;
+    @Resource
+    WorkerService workerService;
 
 
 
@@ -1836,6 +1838,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         if (org.apache.commons.lang3.StringUtils.isEmpty(mainName) ||
                 mainName.equals("家用空调") || mainName.equals("家用空气能热水器") || mainName.equals("驻车空调")){
             // 家用空调 完工明细 数据生成(完工采集数据)
+            // 先放主师傅ID mxup.getAzren()
             ItfTblAzWgmxJyktUpload mxup = detailOrderInstallMapper.getOrderInstallUploadCj(request);
             if (mxup != null){
                 // 部分参数单独处理
@@ -2041,8 +2044,14 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         mxup.setCzwd(websitSH.getWdId());
 
         // 提取安装师傅的账号信息
-        mxup.setAzrenid(publicService.getBrandWorkerId(orderBase.getWorkerId(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId()));
-
+        // mxup.setAzrenid(publicService.getBrandWorkerId(orderBase.getWorkerId(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId()));
+        mxup.setAzrenid(publicService.getBrandWorkerId(mxup.getAzren(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId()));
+        // 获取师傅名称
+        Worker wk = workerService.lambdaQuery()
+                .eq(Worker::getWorkerId,mxup.getAzren()).one();
+        if (wk !=null){
+            mxup.setAzren(wk.getWorkerName());
+        }
         mxup.setStat(cjstat);
         /*if (cjstat.equals(1120)){
             if (orderBase.getOverTime()!=null){
@@ -2111,7 +2120,14 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         mxup.setZjczwdxtbh(websitSH.getBrandSysWebsitNumber());
 
         // 提取安装师傅的账号信息
-        mxup.setAzrenid(publicService.getBrandWorkerId(orderBase.getWorkerId(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId()));
+        //mxup.setAzrenid(publicService.getBrandWorkerId(orderBase.getWorkerId(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId()));
+        mxup.setAzrenid(publicService.getBrandWorkerId(mxup.getAzren(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId()));
+        // 获取师傅名称
+        Worker wk = workerService.lambdaQuery()
+                .eq(Worker::getWorkerId,mxup.getAzren()).one();
+        if (wk !=null){
+            mxup.setAzren(wk.getWorkerName());
+        }
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -2161,7 +2177,14 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         }
 
         // 提取安装师傅的账号信息
-        mxup.setAzrenid(publicService.getBrandWorkerId(orderBase.getWorkerId(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId()));
+        // mxup.setAzrenid(publicService.getBrandWorkerId(orderBase.getWorkerId(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId()));
+        mxup.setAzrenid(publicService.getBrandWorkerId(mxup.getAzren(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId()));
+        // 获取师傅名称
+        Worker wk = workerService.lambdaQuery()
+                .eq(Worker::getWorkerId,mxup.getAzren()).one();
+        if (wk !=null){
+            mxup.setAzren(wk.getWorkerName());
+        }
 
         mxup.setStat(cjstat);
         /*if (cjstat.equals(1120)){
@@ -2213,7 +2236,14 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         mxup.setCzwd(websitSH.getWdId());
 
         // 提取安装师傅的账号信息
-        mxup.setAzrenid(publicService.getBrandWorkerId(orderBase.getWorkerId(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId()));
+        // mxup.setAzrenid(publicService.getBrandWorkerId(orderBase.getWorkerId(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId()));
+        mxup.setAzrenid(publicService.getBrandWorkerId(mxup.getAzren(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId()));
+        // 获取师傅名称
+        Worker wk = workerService.lambdaQuery()
+                .eq(Worker::getWorkerId,mxup.getAzren()).one();
+        if (wk !=null){
+            mxup.setAzren(wk.getWorkerName());
+        }
 
         mxup.setStat(cjstat);
         /*if (cjstat.equals(1120)){
@@ -2282,7 +2312,14 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         mxup.setCzwd(websitSH.getWdId());
 
         // 提取安装师傅的账号信息
-        mxup.setAzrenid(publicService.getBrandWorkerId(orderBase.getWorkerId(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId()));
+        //mxup.setAzrenid(publicService.getBrandWorkerId(orderBase.getWorkerId(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId()));
+        mxup.setAzrenid(publicService.getBrandWorkerId(mxup.getAzren(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId()));
+        // 获取师傅名称
+        Worker wk = workerService.lambdaQuery()
+                .eq(Worker::getWorkerId,mxup.getAzren()).one();
+        if (wk !=null){
+            mxup.setAzren(wk.getWorkerName());
+        }
 
         mxup.setStat(cjstat);
         /*if (cjstat.equals(1120)){

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

@@ -401,7 +401,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
         recs = getWorkerUploads(1);
 
         // 测试用
-        // recs = getWorkerUploadstest();
+        recs = getWorkerUploadstest();
 
         for (OutWorkerUpload item:recs){
             try{

src/main/resources/mapper/DetailOrderInstallMapper.xml

@@ -19,7 +19,7 @@
                if(a.first_time is null,a.update_time,a.first_time) as dqjdsj,
                if(a.first_time is null,a.update_time,a.first_time) as zjczsj,
                if(a.first_time is null,a.update_time,a.first_time) as cjdt,
-               a.worker_name as azren,
+               a.main_worker_id as azren,
                case a.source when 'MOBILE' then 2 else 1 end as dnorsj,a.settle_websit_id as jsdwxtbh,
                if(a.first_time is null,a.update_time,a.first_time) as scazsj,
                a.settle_amount as azfy,a.settle_amount as jsfy,
@@ -55,7 +55,7 @@
                if(a.first_time is null,a.update_time,a.first_time) as dqjdsj,
                if(a.first_time is null,a.update_time,a.first_time) as zjczsj,
                if(a.first_time is null,a.update_time,a.first_time) as cjdt,
-               a.worker_name as azren,
+               a.main_worker_id as azren,
                case a.source when 'MOBILE' then 2 else 1 end as dnorsj,a.settle_websit_id as jsdwxtbh,
                if(a.first_time is null,a.update_time,a.first_time) as scazsj,
                a.settle_amount as azfy,a.settle_amount as jsfy,
@@ -92,7 +92,7 @@
                if(a.first_time is null,a.update_time,a.first_time) as dqjdsj,
                if(a.first_time is null,a.update_time,a.first_time) as zjczsj,
                if(a.first_time is null,a.update_time,a.first_time) as cjdt,
-               a.worker_name as azren,
+               a.main_worker_id as azren,
                case a.source when 'MOBILE' then 2 else 1 end as dnorsj,a.settle_websit_id as jsdwxtbh,
                if(a.first_time is null,a.update_time,a.first_time) as scazsj,
                a.settle_amount as azfy,a.settle_amount as jsfy,
@@ -128,7 +128,7 @@
                if(a.first_time is null,a.update_time,a.first_time) as dqjdsj,
                if(a.first_time is null,a.update_time,a.first_time) as zjczsj,
                if(a.first_time is null,a.update_time,a.first_time) as cjdt,
-               a.worker_name as azren,
+               a.main_worker_id as azren,
                case a.source when 'MOBILE' then 2 else 1 end as dnorsj,a.settle_websit_id as jsdwxtbh,
                if(a.first_time is null,a.update_time,a.first_time) as scazsj,
                a.settle_amount as azfy,a.settle_amount as jsfy,
@@ -164,7 +164,7 @@
                if(a.first_time is null,a.update_time,a.first_time) as dqjdsj,
                if(a.first_time is null,a.update_time,a.first_time) as zjczsj,
                if(a.first_time is null,a.update_time,a.first_time) as cjdt,
-               a.worker_name as azren,
+               a.main_worker_id as azren,
                case a.source when 'MOBILE' then 2 else 1 end as dnorsj,a.settle_websit_id as jsdwxtbh,
                if(a.first_time is null,a.update_time,a.first_time) as scazsj,
                a.settle_amount as azfy,a.settle_amount as jsfy,
@@ -200,7 +200,7 @@
                if(a.first_time is null,a.update_time,a.first_time) as dqjdsj,
                if(a.first_time is null,a.update_time,a.first_time) as zjczsj,
                if(a.first_time is null,a.update_time,a.first_time) as cjdt,
-               a.worker_name as azren,
+               a.main_worker_id as azren,
                case a.source when 'MOBILE' then 2 else 1 end as dnorsj,a.settle_websit_id as jsdwxtbh,
                if(a.first_time is null,a.update_time,a.first_time) as scazsj,
                a.settle_amount as azfy,a.settle_amount as jsfy,