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

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

@@ -121,6 +121,8 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         {
             StartProcessInstanceDTO startProcessInstanceDTO=new StartProcessInstanceDTO();
             startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());
+            startProcessInstanceDTO.setOrderId(id);
+            startProcessInstanceDTO.setOrderType("workOrder");
             String ProcessInstanceId= WorkProcessService.start(startProcessInstanceDTO);
             order.setProcessId(ProcessInstanceId);
         }

jyzb-process/src/main/java/com/junmp/junmpProcess/common/CommonConstants.java

@@ -12,6 +12,8 @@ public interface CommonConstants {
     String FORM_VAR="formData";
     String PROCESS_STATUS="processStatus";
     String START_USER_INFO="startUser";
+    String ORDER_ID="orderId";
+    String ORDER_TYPE="orderType";
     String BUSINESS_STATUS_1="正在处理"; //正在处理
     String BUSINESS_STATUS_2="撤销";//撤销
     String BUSINESS_STATUS_3="驳回";//驳回

jyzb-process/src/main/java/com/junmp/junmpProcess/dto/StartProcessInstanceDTO.java

@@ -17,4 +17,6 @@ import java.util.Map;
 public class StartProcessInstanceDTO {
     private String processDefinitionId;
     private JSONObject formData;
+    private String orderId;
+    private String orderType;
 }

jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl.java

@@ -641,14 +641,16 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
         try {
 
             LoginUser StartUser=new LoginUser();
-//            StartUser.setUserId(Long.valueOf("1694954953210986498"));
+            StartUser.setUserId(Long.valueOf("1694954953210986498"));
 
-            StartUser= LoginContext.getContext().getLoginUser();
+//            StartUser= LoginContext.getContext().getLoginUser();
 
             JSONObject formData = processInstanceDto.getFormData();
             Authentication.setAuthenticatedUserId(StartUser.getUserId().toString());
             Map<String,Object> processVariables= new HashMap<>();
             processVariables.put(FORM_VAR,formData);
+            processVariables.put(ORDER_ID,processInstanceDto.getOrderId());
+            processVariables.put(ORDER_TYPE,processInstanceDto.getOrderType());
             processVariables.put(START_USER_INFO,JSONObject.toJSONString(StartUser));
             processVariables.put(PROCESS_STATUS,BUSINESS_STATUS_1);
             ArrayList<LoginUser> userInfos = CollUtil.newArrayList(StartUser);
@@ -807,7 +809,8 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
             BpmnModel bpmnModel = repositoryService.getBpmnModel(historicProcessInstance.getProcessDefinitionId());
 
             String Name= bpmnModel.getMainProcess().getName();
-
+            historyProcessInstanceVO.setOrderID(MapUtil.getStr(processVariables, ORDER_ID));
+            historyProcessInstanceVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE));
             historyProcessInstanceVO.setProcessDefinitionName(historicProcessInstance.getProcessDefinitionName());
             historyProcessInstanceVO.setStartUser(JSONObject.parseObject(MapUtil.getStr(processVariables, START_USER_INFO), new TypeReference<UserInfo>() {
             }));
@@ -874,6 +877,8 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
             UserInfo user=new UserInfo();
             user.setId(startUserId);
             taskVO.setStartUser(user);
+            taskVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID));
+            taskVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE));
             taskVO.setStartTime(processInstance.getStartTime());
             taskVO.setCurrentActivityName(getCurrentName(processInstance.getId(),false,processInstance.getProcessDefinitionId()));
 
@@ -944,6 +949,8 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
 
             taskVO.setStartUser(JSONObject.parseObject(MapUtil.getStr(processVariables, START_USER_INFO), new TypeReference<UserInfo>() {
             }));
+            taskVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID));
+            taskVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE));
             taskVO.setStartTime(historicProcessInstance.getStartTime());
             taskVO.setCurrentActivityName(getCurrentName(task.getProcessInstanceId(), flag, task.getProcessDefinitionId()));
             taskVO.setBusinessStatus(MapUtil.getStr(processVariables, PROCESS_STATUS));

jyzb-process/src/main/java/com/junmp/junmpProcess/vo/HistoryProcessInstanceVO.java

@@ -20,6 +20,10 @@ public class HistoryProcessInstanceVO {
     private String processDefinitionName;
     @ApiModelProperty("发起人")
     private UserInfo startUser;
+    @ApiModelProperty("单据ID")
+    private String orderID;
+    @ApiModelProperty("单据类型")
+    private String orderType;
     @ApiModelProperty("提交时间")
     private Date startTime;
     @ApiModelProperty("结束时间")

jyzb-process/src/main/java/com/junmp/junmpProcess/vo/TaskVO.java

@@ -19,6 +19,10 @@ public class TaskVO {
     private String taskId;
     @ApiModelProperty("任务id")
     private String processInstanceId;
+    @ApiModelProperty("订单表ID")
+    private String orderId;
+    @ApiModelProperty("订单类型")
+    private String orderType;
     @ApiModelProperty("审批类型")
     private String processDefinitionName;
     @ApiModelProperty("发起人")