修改

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -3,7 +3,9 @@ package com.huaxu.order.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huaxu.client.UserCenterClient;
+import com.huaxu.common.ConvertXY;
 import com.huaxu.common.FileUploadUtil;
+import com.huaxu.common.MyPoint;
 import com.huaxu.entity.Message;
 import com.huaxu.model.AjaxMessage;
 import com.huaxu.model.LoginUser;
@@ -231,7 +233,6 @@ public class WorkOrderManageController {
                             return new AjaxMessage<>(ResultStatus.CHILD_ORDER_ING);
                     }
                 }
-
                 //判断父单完成情况后才可以提交
                 WorkOrderManage parentOrder=workOrderManageService.selectByPrimaryKey(order.getOrderPid());
                 if(parentOrder!=null&&order.getOrderTypeId()==2&&parentOrder.getOrderStatus()!=2&&parentOrder.getOrderStatus()!=3) {
@@ -479,8 +480,8 @@ public class WorkOrderManageController {
 //                planManage.getTaskType());
         //流程查询, 测试参数:(test1 1 1)
         ProcessDefinition processDefinition = workFlowService.findProcessDefinition(
-                "test1",
-                1,
+                loginUser.getTenantId(),
+                loginUser.getCompanyId(),
                 1);
         if(processDefinition == null){
             new AjaxMessage(ResultStatus.ERROR,"没有创建流程，不能派单！");
@@ -530,7 +531,9 @@ public class WorkOrderManageController {
     @GetMapping("/selectOrderUserByOrgId")
     @ApiOperation(value = "查询派单时的用户信息")
     public AjaxMessage<Object> selectOrderUserByOrgId(
-            @ApiParam(value = "机构ID", required = true) @RequestParam(required = true) String ids){
+            @ApiParam(value = "机构ID", required = true) @RequestParam(required = true) String ids,
+            @ApiParam(value = "wkid", required = false) @RequestParam(required = false) String wkid,
+            @ApiParam(value = "偏移量(x,y)", required = false) @RequestParam(required = false) String moveXY){
         List<Map<String,Object>> result = new ArrayList<>();
         AjaxMessage<List<UserEntity>> listAjaxMessage = userCenterClient.findUserIdsByOrgId(String.format("[%s]",ids));
         for(UserEntity userEntity : listAjaxMessage.getData()){
@@ -544,10 +547,20 @@ public class WorkOrderManageController {
                 if (orderStatusMap != null) {
                     map.put("status", orderStatusMap.get("S").toString());
                     map.put("address", orderStatusMap.get("X") + "," + orderStatusMap.get("Y"));
+                    if(!org.apache.commons.lang3.StringUtils.isEmpty(wkid) && wkid.equals("2360")){
+                        MyPoint myPoint= ConvertXY.ConvertXYToXian80(orderStatusMap.get("X").toString(),
+                                orderStatusMap.get("Y").toString(),moveXY);
+                        map.put("coords",myPoint.getX()+","+myPoint.getY());
+                    }else if(!org.apache.commons.lang3.StringUtils.isEmpty(wkid) && wkid.equals("3857")){
+                        MyPoint myPoint= ConvertXY.ConvertXYToMercato(orderStatusMap.get("X").toString(),
+                                orderStatusMap.get("Y").toString(),moveXY);
+                        map.put("coords",myPoint.getX()+","+myPoint.getY());
+                    }
                 }
                 else {
                     map.put("status", "");
                     map.put("address", "");
+                    map.put("coords","");
                 }
                 map.put("distance", "");
                 result.add(map);

operation_manager/src/main/java/com/huaxu/task/controller/PlanManageController.java

@@ -195,8 +195,8 @@ public class PlanManageController {
 //                planManage.getTaskType());
         //流程查询, 测试参数:(test1 1 1)
         ProcessDefinition processDefinition = workFlowService.findProcessDefinition(
-                "test1",
-                1,
+                loginUser.getTenantId(),
+                loginUser.getCompanyId(),
                 2);
         if(processDefinition == null){
             new AjaxMessage(ResultStatus.ERROR,"没有创建流程，不能提交！");