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

jyzb-biz/src/main/java/com/junmp/jyzb/entity/OrderNum.java

+package com.junmp.jyzb.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("bussiness_order_num")
+public class OrderNum implements Serializable {
+    @TableId(value = "id",type = IdType.ASSIGN_UUID )
+    private Integer id;
+
+    @TableField("out_in_type")
+    private String outInType;
+
+    @TableField("bussiness_type")
+    private String bussinessType;
+    
+    private Integer num;
+
+    private Integer year;
+
+    @TableField("org_id")
+    private Long orgId;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
+    private Date updateTime;
+
+}

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/OrderNumMapper.java

+package com.junmp.jyzb.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.junmp.jyzb.entity.OrderNum;
+
+public interface OrderNumMapper extends BaseMapper<OrderNum> {
+}

jyzb-biz/src/main/java/com/junmp/jyzb/service/OrderNumService.java

+package com.junmp.jyzb.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.jyzb.entity.OrderLog;
+import com.junmp.jyzb.entity.OrderMain;
+import com.junmp.jyzb.entity.OrderNum;
+
+import java.util.List;
+
+public interface OrderNumService extends IService<OrderNum> {
+
+
+
+
+}

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderNumServiceImpl.java

+package com.junmp.jyzb.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.junmp.jyzb.entity.OrderMain;
+import com.junmp.jyzb.entity.OrderNum;
+import com.junmp.jyzb.mapper.OrderMainMapper;
+import com.junmp.jyzb.mapper.OrderNumMapper;
+import com.junmp.jyzb.service.OrderNumService;
+
+public class OrderNumServiceImpl extends ServiceImpl<OrderNumMapper, OrderNum>  implements OrderNumService {
+}

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

@@ -69,7 +69,7 @@ public class BpmnController  {
     /**
      * 转交
      */
-    @ApiOperation("轉交")
+    @ApiOperation("转交")
     @PutMapping("turn")
     public ApiRes<Boolean> turn(@RequestBody TurnVo turns) {
         if (WorkProcessService.turn(turns))

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

@@ -16,39 +16,48 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+import java.util.Map;
+
+
 @Component
-public class GlobalEndListener extends AbstractFlowableEngineEventListener {
-    protected Logger logger = LoggerFactory.getLogger(this.getClass());
-    /**
-    * @Author: Zhaojw
-    * @Description: 流程结束监听
-    * @DateTime: 2023/6/27 13:21
-    * @Params:
-    * @Return
-    */
-    @SneakyThrows
-    @Override
-    protected void processCompleted(FlowableEngineEntityEvent event) {
-            //流程结束后工作在这里写
-            //得到流程定义id
-            String processDefinitionId = event.getProcessDefinitionId();
-
-            //得到流程实例id
-            String processInstanceId = event.getProcessInstanceId();
-        /**
-         * 生产者不需要绑定队列和交换机，只有生产者才需要
-         *
-         * 建立连接
-         * 建立通道
-         * 推送消息
-         */
-
-        Connection connection = RabbitMQUtils2.getConnection();
-        Channel channel = connection.createChannel();
-        channel.queueDeclare("info",false,false,false,null);
-        channel.basicPublish("", "info", MessageProperties.PERSISTENT_TEXT_PLAIN,("publish").getBytes());
-
-        RabbitMQUtils2.closeChannelAndConnection(connection,channel);
+    public class GlobalEndListener extends AbstractFlowableEngineEventListener {
+        protected Logger logger = LoggerFactory.getLogger(this.getClass());
+
+        @SneakyThrows
+        @Override
+        protected void processCompleted(FlowableEngineEntityEvent event) {
+            if (event.getType() == FlowableEngineEventType.PROCESS_COMPLETED) {
+                // 获取流程实例ID
+                String processInstanceId = event.getProcessInstanceId();
+
+                // 获取流程定义ID
+                String processDefinitionId = event.getProcessDefinitionId();
+
+                // 获取流程实例关联的变量
+                Map<String, Object> processVariables = getProcessVariables(processInstanceId);
+
+                // 获取单据类型
+                String documentType = (String) processVariables.get("documentType");
+
+                // 根据单据类型执行不同的操作
+                if ("equipment".equals(documentType)) {
+                    // 执行装备相关操作
+                    // ...
+                } else if ("personnel".equals(documentType)) {
+                    // 执行人员相关操作
+                    // ...
+                }
+
+            }
+        }
+
+    // 获取流程实例关联的变量
+    private Map<String, Object> getProcessVariables(String processInstanceId) {
+        // 根据 processInstanceId 获取流程实例关联的变量
+        // 这里需要根据你的业务逻辑来实现获取变量的方法
+        // 返回一个包含流程变量的 Map
+        return  null;
+    }
     }
 
-}