yaozhixue 1 年間 前
コミット
1dd756ccc0

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/sendmessage/SendGreeMessage.java

@@ -20,7 +20,7 @@ import java.util.Map;
 
 /**
  * 完工评价短信发送,发给格力总部,由格力总部发送
- * itf_messagehuifangentity
+ * itf_messagehuifangentity 表中字段全部发送
  */
 @Slf4j
 @Component

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

@@ -2171,7 +2171,7 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
 
             // 置能否申诉标识 canappeal=1可申诉 中差评均可申诉
             // 这里以后可能需要,不要删除
-            /*cppjly = getCppjly(s);
+            cppjly = getCppjly(s);
             // 置可申诉标识 当前评价为中差评时看是否有已同步的差评,有不再产生申诉数据
             if (cppjly){
                 OrderAppraise oldoat = orderAppraiseService.lambdaQuery()
@@ -2180,7 +2180,7 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
                 if (oldoat==null){
                     canappeal=1;
                 }
-            }*/
+            }
 
             // 置可生成评价标识 jcaninsert 当前记录为首评且已同步记录表中存在首评时置 jcaninsert = 0 不能再插入首评
             if (s.getSynStatus().equals(0) && s.getSxlx().equals(0)){

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

@@ -505,7 +505,7 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
             ItfTblAzAssignFkmxUpload add = operatingLogOrderInstallMapper.getOperatingLog(que);
             add.setUploadTaskSynReqId(ojtutl.getSynReqId());
 
-            // 反馈人取了网点编号需单独处理 fkren   网点编号+01
+            // 反馈人取了网点编号需单独处理 fkren
             // 反馈网点编号 做同样处理
             WebsitPP resultData = getPPWebsitInfo(add.getFkren(), orderBase);
             add.setFkren(resultData.getWdno()+"01");

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/service/impl/UploadWorkeCertificateServiceImpl.java

@@ -499,7 +499,7 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
             wcgsold.clear();
         }
 
-        // 获取待同步到格力总部师傅的保除证件信息
+        // 获取待同步到格力总部师傅的保除证件信息 WebsitWorker.getInsureStatus=2取已生效的
         wws = getWorkerUploadsBx();
 
         // 测试使用

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

@@ -300,10 +300,10 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
         List<OutWorkerUpload> recs = new ArrayList<>();
 
         // 获取待入驻的新网点师傅数据
-        // recs = getWorkerUploads(1);
+        recs = getWorkerUploads(1);
 
         // 测试用
-        recs = getWorkerUploadstest();
+        // recs = getWorkerUploadstest();
 
         for (OutWorkerUpload item:recs){
             try{
@@ -366,10 +366,10 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
         }
 
         // 获取待入驻的新网点师傅数据
-        // recs = getWorkerUploads(1);
+        recs = getWorkerUploads(1);
 
         // 测试用
-        recs = getWorkerUploadstest();
+        // recs = getWorkerUploadstest();
 
         for (OutWorkerUpload item:recs){
             try{

+ 2 - 5
src/main/java/com/zfire/jiasm/syncdata/upload/worker/UploadWorkBx.java

@@ -13,7 +13,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 
 /**
- * 同步师傅保险证件到格力总部 用于更新已入驻的网点保险证信息   更新到格力总部时由 UploadWorkerTOGree 完成
+ * 同步师傅保险证件到格力总部 为师傅入驻总部网点做准备   更新到格力总部时由 UploadWorkerTOGree 完成
  * WebsitWorker.getInsureStatus=2 && isNotNull(WebsitWorker.getInsureFiles)
  * 网点证件表保存一份供同步师傅信息使用
  *
@@ -28,10 +28,7 @@ public class UploadWorkBx {
     UploadWorkeCertificateService uploadWorkeCertificateService;
 
 
-
-    // 师傅证件照同步到格力总部 这里只上传保险,只上传一次
-
-    /**
+    /** 这里只上传保险证件到总部,为师傅入驻做准备
      * 按师傅所在格力总部网点更新保险证件数据
      * 1:上传到格力总部网点
      * 2:本地保留一份

+ 4 - 4
src/main/java/com/zfire/jiasm/syncdata/upload/worker/UploadWorkeCertificate.java

@@ -11,7 +11,9 @@ import org.springframework.stereotype.Component;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-/** 用于更新已入驻的网点证件照数据
+/**
+ * 师傅证件照同步到格力总部 这里只用于同步证件,为师傅入驻新网点做准备
+ * 用于更新已入驻的网点证件照数据
  * 更新证件到格力总部(师傅已入驻 且平台网点与格力总部网点有对应关系)
  * .in(WorkerCert::getOutSyncStatus,0,99)
  * .lt(WorkerCert::getOutSyncTimes,10)
@@ -27,10 +29,8 @@ public class UploadWorkeCertificate {
     UploadWorkeCertificateService uploadWorkeCertificateService;
 
 
-
-    // 师傅证件照同步到格力总部
-
     /**
+     * 师傅证件照同步到格力总部 这里只用于同步证件,为师傅入驻新网点做准备
      * 按师傅所在格力总部网点同步除保险外的所有证件
      * 1:上传到格力总部网点
      * 2:本地保留一份

+ 3 - 6
src/main/java/com/zfire/jiasm/syncdata/upload/worker/UploadWorkerTOGree.java

@@ -32,15 +32,12 @@ public class UploadWorkerTOGree {
     @Value("${workerrzc}")
     private String workerrzc = "";
 
-
-
-
     @Autowired
     UploadWorkerTOGreeService uploadWorkerTOGreeService;
 
 
 
-    /** 同步更新师傅信息到格力总部 - 更新证件
+    /** 更新师傅证件信息到格力总部 - 更新所有证件
      * 无论新增或是修改-所有证件都必须重新上传一次
      * 师傅所在网点都要上传一次
      */
@@ -59,7 +56,7 @@ public class UploadWorkerTOGree {
         return;
     }
 
-    //师傅入驻格力新网点前先同步证件数据
+    // 师傅入驻格力新网点前 同步证件数据(保险+其他证件照)
     @Scheduled(fixedDelayString = "${workercerupload}")
     public void workAddCertProcess() throws Exception {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -76,7 +73,7 @@ public class UploadWorkerTOGree {
     }
 
 
-    //师傅入驻格力新网点
+    // 师傅入驻格力新网点
     @Scheduled(fixedDelayString = "${workercerupload}")
     public void workAddProcess() throws Exception {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");