[fix] 未完成工单推送任务bug修复

src/main/java/vion/controller/ServiceOrderController.java

@@ -33,7 +33,6 @@ public class ServiceOrderController {
     private final IDictionaryService dictionaryService;
     private final IDictionaryService dictionaryService;
     private final Converter converter;
     private final Converter converter;
 
 
-
     @GetMapping("/orders")
     @GetMapping("/orders")
     @SaCheckPermission(value = "order:list", orRole = "admin")
     @SaCheckPermission(value = "order:list", orRole = "admin")
     public Page<ServiceOrderVO> getServiceOrderList(ServiceOrderDTO data) {
     public Page<ServiceOrderVO> getServiceOrderList(ServiceOrderDTO data) {

src/main/java/vion/controller/StoreController.java

@@ -38,7 +38,6 @@ public class StoreController {
     private final IStoreLogService storeLogService;
     private final IStoreLogService storeLogService;
     private final Converter converter;
     private final Converter converter;
 
 
-
     @GetMapping("/stores")
     @GetMapping("/stores")
     @SaCheckPermission(value = "store:list", orRole = "admin")
     @SaCheckPermission(value = "store:list", orRole = "admin")
     public Page<StoreVO> getStoreList(StoreDTO data) {
     public Page<StoreVO> getStoreList(StoreDTO data) {

src/main/java/vion/cron/TaskRunner.java

@@ -60,8 +60,7 @@ public class TaskRunner {
         JSONArray jsonArray = JSONUtil.ofArray()
         JSONArray jsonArray = JSONUtil.ofArray()
                 .put(JSONUtil.ofObj().set("title", "查看详情")
                 .put(JSONUtil.ofObj().set("title", "查看详情")
                         .set("action_url", """
                         .set("action_url", """
-                                        https://oapi.dingtalk.com/connect/oauth2/sns_authorize?appid=dingkrzwks0jpi2di3uo&response_type=code&scope=snsapi_auth&state=STATE&redirect_uri=https%3A%2F%2Fyunwei.vionyun.com%3A8443%2Fyunwei%2Fapi%2Fding%2Fcallback%2Finside%3FuserId%3D
-                                        """ + user.getId()));
+                                        https://oapi.dingtalk.com/connect/oauth2/sns_authorize?appid=dingkrzwks0jpi2di3uo&response_type=code&scope=snsapi_auth&state=STATE&redirect_uri=https%3A%2F%2Fyunwei.vionyun.com%3A8443%2Fyunwei%2Fapi%2Fding%2Fcallback%2Finside%3FuserId%3D""" + user.getId()));
         content.set("btn_json_list", jsonArray);
         content.set("btn_json_list", jsonArray);
 
 
         msg.set("msgtype", "action_card").set("action_card", content);
         msg.set("msgtype", "action_card").set("action_card", content);

src/main/java/vion/service/impl/StoreServiceImpl.java

@@ -66,6 +66,7 @@ public class StoreServiceImpl extends MPJBaseServiceImpl<StoreMapper, Store> imp
     private final IRStoreTagService storeTagService;
     private final IRStoreTagService storeTagService;
     private final IRStoreUserService storeUserService;
     private final IRStoreUserService storeUserService;
     private final IStoreLogService storeLogService;
     private final IStoreLogService storeLogService;
+    private final ITaskTempService taskTempService;
     private final Converter converter;
     private final Converter converter;
     private final DingMod dingMod;
     private final DingMod dingMod;
     // 引入 taskService 会循环依赖
     // 引入 taskService 会循环依赖
@@ -369,6 +370,7 @@ public class StoreServiceImpl extends MPJBaseServiceImpl<StoreMapper, Store> imp
 
 
         // 工单相关合并
         // 工单相关合并
         taskMapper.update(new Task(), Wrappers.lambdaUpdate(Task.class).set(Task::getStoreId, sourceId).eq(Task::getStoreId, targetId));
         taskMapper.update(new Task(), Wrappers.lambdaUpdate(Task.class).set(Task::getStoreId, sourceId).eq(Task::getStoreId, targetId));
+        taskTempService.lambdaUpdate().set(TaskTemp::getStoreId, sourceId).eq(TaskTemp::getStoreId, targetId).update();
         fileService.lambdaUpdate().set(FileInfo::getStoreId, sourceId).eq(FileInfo::getStoreId, targetId).eq(FileInfo::getSourceType, 3).update();
         fileService.lambdaUpdate().set(FileInfo::getStoreId, sourceId).eq(FileInfo::getStoreId, targetId).eq(FileInfo::getSourceType, 3).update();
         faultLogService.lambdaUpdate().set(FaultLog::getStoreId, sourceId).eq(FaultLog::getStoreId, targetId).update();
         faultLogService.lambdaUpdate().set(FaultLog::getStoreId, sourceId).eq(FaultLog::getStoreId, targetId).update();
         formService.lambdaUpdate().set(Form::getStoreId, sourceId).set(Form::getAccountId, store.getAccountId()).eq(Form::getStoreId, targetId).update(new Form());
         formService.lambdaUpdate().set(Form::getStoreId, sourceId).set(Form::getAccountId, store.getAccountId()).eq(Form::getStoreId, targetId).update(new Form());