add

src/main/java/com/zfire/jiasm/syncdata/dao/mapper/SendGreeSmsMapper.java

@@ -8,4 +8,5 @@ import java.util.List;
 
 public interface SendGreeSmsMapper extends BaseMapper<FaGreeSms> {
     List<FaOrderSms> getData();
+    List<FaOrderSms> getDataTest();
 }

src/main/java/com/zfire/jiasm/syncdata/sendmessage/SMSWorkerSend.java → src/main/java/com/zfire/jiasm/syncdata/sendmessage/SMSFaGreeSmsWorker.java

@@ -25,7 +25,7 @@ import java.util.*;
  */
 @Slf4j
 @Component
-public class SMSWorkerSend {
+public class SMSFaGreeSmsWorker {
 	@Autowired
 	private TokenCenter tokenCenter;
 	@Value("${installTopicName}")

src/main/java/com/zfire/jiasm/syncdata/sendmessage/SendGreeSms.java → src/main/java/com/zfire/jiasm/syncdata/sendmessage/SendFaGreeSms.java

@@ -25,7 +25,7 @@ import java.util.Map;
  */
 @Slf4j
 @Component
-public class SendGreeSms {
+public class SendFaGreeSms {
     @Value("${greesmsc}")
     private String greesmsc = "";
     @Value("${installTopicName}")

src/main/java/com/zfire/jiasm/syncdata/sendmessage/SendGreeMessage.java → src/main/java/com/zfire/jiasm/syncdata/sendmessage/SendGreeMessageHuiFangen.java

@@ -26,7 +26,7 @@ import java.util.Map;
  */
 @Slf4j
 @Component
-public class SendGreeMessage {
+public class SendGreeMessageHuiFangen {
     @Value("${installTopicName}")
     private String installTopicName;
     @Value("${repaireMessageFinishTopicName}")

src/main/java/com/zfire/jiasm/syncdata/sendmessage/SendMessage.java → src/main/java/com/zfire/jiasm/syncdata/sendmessage/SendMessageFaOrderSms.java

@@ -16,6 +16,7 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -25,7 +26,7 @@ import java.util.List;
  */
 @Slf4j
 @Component
-public class SendMessage {
+public class SendMessageFaOrderSms {
     @Value("${SMSSelf_templateId}")
     private String templateId;
     @Value("${zjgdmsgsendc}")
@@ -51,8 +52,12 @@ public class SendMessage {
         }
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        // 提取数据
-        List<FaOrderSms> records = sendGreeSmsMapper.getData();
+        List<FaOrderSms> records = new ArrayList<>();
+                // 提取数据
+        records = sendGreeSmsMapper.getData();
+        // 测试用
+        // records = sendGreeSmsMapper.getDataTest();
+
         log.info("开始自建工单短信发送: \uF0B7{}",sdf.format(new Date()));
         for (FaOrderSms item : records){
             Integer synTimes = item.getSynTimes();
@@ -72,7 +77,7 @@ public class SendMessage {
                 // 用户手机号，？，自生成主键，随机发送码，发送的内容
                 smsSelfManager.templateSMS(item.getSjid(), templateId,item.getSynTaskNo(),
                         item.getFsma(), datas);
-                // sendSuccess(item);
+                sendSuccess(item);
                 publicService.upSmsRecordSendTime(item.getSynTaskNo(),item.getSjid(),new Date());
             } catch (Exception ex) {
                 log.error("自建工单短信发送失败[syn_task_no=" + item.getSynTaskNo() + "]", ex);

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

@@ -1660,6 +1660,12 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
     }
 
     private void revertFun(OrderBase old, ItfTblAzAssignLcLsDownload item, OrderBase upInfo) {
+        // 提取网点师傅ID
+        WebsitWorker ww = publicService.getOrderWebsitWorker(old.getWorkerId(),old.getWebsitId());
+        if (ww !=null ){
+            old.setWorkerId(ww.getWebsitWorkerId());
+        }
+
         // 本地订单已关闭 且总部的最后修改时间在本地数据修改时间之前 不可修改
         if (old.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G10.getCode()) &&
                 (old.getUpdateTime()==null || item.getLastModifiedDate().compareTo(old.getUpdateTime())<0)){
@@ -3213,14 +3219,6 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         // 赋值接收师傅信息
         Worker worker= publicService.getInstallOrderWorker(item.getAzrenid());
         if (worker !=null){
-            // 提取网点师傅ID
-            /*WebsitWorker ww = publicService.getOrderWebsitWorker(worker.getWorkerId(),orderBase.getWebsitId());
-            if (ww !=null ){
-                orderBase.setWorkerId(ww.getWebsitWorkerId());
-                orderBase.setWorkerName(worker.getWorkerName());
-                orderBase.setWorkerMobile(worker.getMobile());
-                orderBase.setWorkerIdcard(worker.getIdcard());
-            }*/
             orderBase.setWorkerId(worker.getWorkerId());
             orderBase.setWorkerName(worker.getWorkerName());
             orderBase.setWorkerMobile(worker.getMobile());

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

@@ -749,6 +749,12 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
     }
 
     private void modifyOrderBaseWebsit(ItfTblAssignDownload item,OrderBase oldOrder,OrderBase upOrder) {
+        // 提取网点师傅ID
+        WebsitWorker ww = publicService.getOrderWebsitWorker(oldOrder.getWorkerId(),oldOrder.getWebsitId());
+        if (ww !=null ){
+            oldOrder.setWorkerId(ww.getWebsitWorkerId());
+        }
+
         // 批量关闭的工单 同步下载无需再修改
         if (oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G13.getCode())){
             return;

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

@@ -1649,6 +1649,12 @@ public class PublicServiceImpl implements PublicService {
 
     @Override
     public void revertFun(OrderBase order,ItfTblAzAssignLcLsDownload lcls){
+        // 提取网点师傅ID
+        WebsitWorker ww = publicService.getOrderWebsitWorker(order.getWorkerId(),order.getWebsitId());
+        if (ww !=null ){
+            order.setWorkerId(ww.getWebsitWorkerId());
+        }
+
         // 安装网点
         order.setWebsitId("");
         order.setWebsitName("");
@@ -1712,6 +1718,13 @@ public class PublicServiceImpl implements PublicService {
 
     @Override
     public void revertRepairFun(OrderBase order,ItfTblAssignDownload lcls){
+        // 提取网点师傅ID
+        WebsitWorker ww = publicService.getOrderWebsitWorker(order.getWorkerId(),order.getWebsitId());
+        if (ww !=null ){
+            order.setWorkerId(ww.getWebsitWorkerId());
+        }
+
+
         // 安装网点
         order.setWebsitId("");
         order.setWebsitName("");

src/main/resources/mapper/SendGreeSmsMapper.xml

@@ -7,5 +7,9 @@
         order by syn_req_time
     </select>
 
+    <select id="getDataTest"  resultType="com.zfire.jiasm.syncdata.plus.entity.FaOrderSms">
+        SELECT * FROM fa_order_sms where where worker_order_no='B473682316009797'
+    </select>
+
 
 </mapper>