Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh

jyzb-process/src/main/java/com/junmp/junmpProcess/controller/OrgUserAndDeptController.java

-package com.junmp.junmpProcess.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import com.junmp.junmpProcess.service.Bussiness.OrgUserAndDeptService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * @author : willian fu
- * @version : 1.0
- */
-@RestController
-@RequestMapping("/OrgUserAndDept")
-@Api(tags = "和用户组织机构有关的接口")
-public class OrgUserAndDeptController {
-
-    @Resource
-    private OrgUserAndDeptService orgService;
-
-    /**
-     * 查询组织架构树
-     *
-     * @param deptId 部门id
-     * @return 组织架构树数据
-     */
-    @ApiOperation("查询组织架构树")
-    @GetMapping("tree")
-//    @PermissionData(pageComponent = "jeecg/JeecgDemoList")
-    public Object getOrgTreeData(@RequestParam(defaultValue = "0") Integer deptId,
-                                 @RequestParam(defaultValue = "user") String type
-    ) {
-        return orgService.getOrgTreeData(deptId, type);
-    }
-
-    /**
-     * 模糊搜索用户
-     *
-     * @param userName 用户名/拼音/首字母
-     * @return 匹配到的用户
-     */
-    @ApiOperation("模糊搜索用户")
-    @GetMapping("tree/search")
-    public Object getOrgTreeUser(@RequestParam String userName) {
-        return orgService.getOrgTreeUser(userName.trim());
-    }
-
-}
+//package com.junmp.junmpProcess.controller;
+//
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import com.junmp.junmpProcess.service.Bussiness.OrgUserAndDeptService;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RequestParam;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import javax.annotation.Resource;
+//
+///**
+// * @author : willian fu
+// * @version : 1.0
+// */
+//@RestController
+//@RequestMapping("/OrgUserAndDept")
+//@Api(tags = "和用户组织机构有关的接口")
+//public class OrgUserAndDeptController {
+//
+//    @Resource
+//    private OrgUserAndDeptService orgService;
+//
+//    /**
+//     * 查询组织架构树
+//     *
+//     * @param deptId 部门id
+//     * @return 组织架构树数据
+//     */
+//    @ApiOperation("查询组织架构树")
+//    @GetMapping("tree")
+////    @PermissionData(pageComponent = "jeecg/JeecgDemoList")
+//    public Object getOrgTreeData(@RequestParam(defaultValue = "0") Integer deptId,
+//                                 @RequestParam(defaultValue = "user") String type
+//    ) {
+//        return orgService.getOrgTreeData(deptId, type);
+//    }
+//
+//    /**
+//     * 模糊搜索用户
+//     *
+//     * @param userName 用户名/拼音/首字母
+//     * @return 匹配到的用户
+//     */
+//    @ApiOperation("模糊搜索用户")
+//    @GetMapping("tree/search")
+//    public Object getOrgTreeUser(@RequestParam String userName) {
+//        return orgService.getOrgTreeUser(userName.trim());
+//    }
+//
+//}

jyzb-process/src/main/java/com/junmp/junmpProcess/listener/GlobalEndListener.java

 package com.junmp.junmpProcess.listener;
 
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.junmp.junmpProcess.dto.json.ChildNode;
 import com.junmp.junmpProcess.utils.RabbitMQUtils2;
 //import com.rabbitmq.client.Channel;
 //import com.rabbitmq.client.Connection;
+import com.junmp.jyzb.api.bean.req.UpdateOrderReq;
+import com.junmp.jyzb.service.OrderMainService;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.MessageProperties;
@@ -16,6 +21,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
@@ -23,7 +29,8 @@ import java.util.Map;
 @Component
     public class GlobalEndListener extends AbstractFlowableEngineEventListener {
         protected Logger logger = LoggerFactory.getLogger(this.getClass());
-
+    @Resource
+    public OrderMainService orderMainService;
         @SneakyThrows
         @Override
         protected void processCompleted(FlowableEngineEntityEvent event) {
@@ -39,11 +46,14 @@ import java.util.Map;
 
                 // 获取单据类型
                 String documentType = (String) processVariables.get("documentType");
-
+                UpdateOrderReq updateOrderReq = JSONObject.parseObject(documentType, new TypeReference<UpdateOrderReq>() {
+                });
+                // 获取单据类型
+                String orderReq = (String) processVariables.get("orderReq");
                 // 根据单据类型执行不同的操作
                 if ("equipment".equals(documentType)) {
                     // 执行装备相关操作
-                    // ...
+                    orderMainService.AddOrder(updateOrderReq);
                 } else if ("personnel".equals(documentType)) {
                     // 执行人员相关操作
                     // ...