From 432198337fb3d8a99fadb4b7825771d68bb10b9e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 20 八月 2025 19:58:22 +0800
Subject: [PATCH] 去掉mail依赖
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java | 12 ++++++------
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java | 3 ++-
blade-service/blade-mdm/src/main/resources/processesbpmn/dispatch.bpmn20.xml | 7 +++++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/entity/MdmUser.java | 4 ++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java | 21 ++++++++++-----------
5 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/entity/MdmUser.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/entity/MdmUser.java
index 38dff4c..d8a29d3 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/entity/MdmUser.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/entity/MdmUser.java
@@ -22,4 +22,8 @@
* 鐪熷悕
*/
private String realName;
+ /**
+ * 閫楀彿鍒嗛殧鐨勬暟鎹�
+ */
+ private String roleId;
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java
index c744236..d1c55b5 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java
@@ -96,7 +96,8 @@
@GetMapping("flow-user-list")
@ApiOperationSupport(order = 3)
@Operation(summary = "鐢ㄦ埛涓嬫媺鏁版嵁", description = "鐢ㄦ埛涓嬫媺鏁版嵁")
- public R<List<User>> flowUserList(@Parameter(description = "閮ㄩ棬ID") String deptId) {
+ public R<List<User>> flowUserList(@Parameter(description = "閮ㄩ棬ID") String deptId,String taskId) {
+ //userSearchClient.listByRole()
return userSearchClient.listByDept(deptId);
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
index 04274a5..0d495f4 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
@@ -34,8 +34,6 @@
private final RuntimeService runtimeService;
- private final HistoryService historyService;
- private final TaskService taskService;
private final IdentityService identityService;
private final NodeDeptQueryService nodeDeptQueryService;
private final NcNodeService ncNodeService;
@@ -43,7 +41,7 @@
private final FlowProgramFileService flowProgramFileService;
private final ProduceDivisionService produceDivisionService;
private final MachineService machineService;
-
+ private final FlowCommonService flowCommonService;
/**
* 鍚姩鍥哄寲娴佺▼
@@ -84,14 +82,16 @@
vars.put(FlowContants.PRODUCT_MODEL,programPackage.getProductModel());
vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackage.getName());
+ /*
- ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo());
vars.put(FlowContants.PROGRAMMER,div.getProgrammerId());
vars.put(FlowContants.CHECKER,div.getCheckerId());
vars.put(FlowContants.SENIOR,div.getSeniorId());
vars.put(FlowContants.TEAM_LEADER,div.getTeamLeaderId());
-
- vars.put(FlowContants.ASSIGNEE,div.getProgrammerId());
+ */
+ flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),null);
+ //ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo());
+ vars.put(FlowContants.ASSIGNEE,vars.get(FlowContants.PROGRAMMER));
identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
index 5b8613e..478b0da 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
@@ -156,7 +156,6 @@
if(ru.isSuccess()) {
flow.setStartUserName(ru.getData().getName());
}
- ;
List<Comment> comments = lastStepComments(task);//taskService.getTaskComments(task.getId());
if(!comments.isEmpty()){
flow.setComment(comments.get(0).getFullMessage());
@@ -203,15 +202,7 @@
return Collections.emptyList();
}
}
- /**
- * 鑾峰彇鍘嗗彶娴佺▼
- *
- * @param processInstanceId 娴佺▼瀹炰緥id
- * @return HistoricProcessInstance
- */
- private HistoricProcessInstance getHistoricProcessInstance(String processInstanceId) {
- return historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
- }
+
public IPage<FlowVO> selectAllTaskPage(IPage<FlowVO> page, String keyword) {
@@ -377,6 +368,11 @@
vo.setProcessCreateTime(processInstance.getStartTime());
vo.setHistoryTaskEndTime(processInstance.getEndTime());
+ R<User> ru = userClient.userInfoById(Long.valueOf(processInstance.getStartUserId()));
+ if(ru.isSuccess()) {
+ vo.setStartUserName(ru.getData().getName());
+ }
+
vo.setFile(getFileString(processInstance.getId()));
records.add(vo);
}
@@ -442,7 +438,10 @@
vo.setProcessCreateTime(processInstance.getStartTime());
vo.setHistoryTaskEndTime(processInstance.getEndTime());
-
+ R<User> ru = userClient.userInfoById(Long.valueOf(processInstance.getStartUserId()));
+ if(ru.isSuccess()) {
+ vo.setStartUserName(ru.getData().getName());
+ }
vo.setFile(getFileString(processInstance.getId()));
records.add(vo);
}
diff --git a/blade-service/blade-mdm/src/main/resources/processesbpmn/dispatch.bpmn20.xml b/blade-service/blade-mdm/src/main/resources/processesbpmn/dispatch.bpmn20.xml
index 77e7c5b..e8891e2 100644
--- a/blade-service/blade-mdm/src/main/resources/processesbpmn/dispatch.bpmn20.xml
+++ b/blade-service/blade-mdm/src/main/resources/processesbpmn/dispatch.bpmn20.xml
@@ -60,6 +60,9 @@
]]></script>
</scriptTask>
<sequenceFlow id="sid-7f62f3c2-08bf-4007-807d-3403ad831ed5" sourceRef="exceptionHandleTask" targetRef="sid-59124fa5-62ee-4ba5-8bd9-cafc65aa5fcf"/>
+ <sequenceFlow id="programmerEndLine" sourceRef="programmingTask" targetRef="exceptionHandleTask" name="宸ヨ壓鍛樼粨鏉�">
+ <conditionExpression>${approve=='E'}</conditionExpression>
+ </sequenceFlow>
</process>
<bpmndi:BPMNDiagram id="BPMNDiagram_dispatch">
<bpmndi:BPMNPlane bpmnElement="dispatch" id="BPMNPlane_dispatch">
@@ -147,6 +150,10 @@
<omgdi:waypoint x="-300.0" y="-17.5"/>
<omgdi:waypoint x="-295.0" y="37.5"/>
</bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="edge-a96e2c79-7b1b-4eef-9779-c6398a84f2ad" bpmnElement="programmerEndLine">
+ <omgdi:waypoint x="-72.5" y="-92.5"/>
+ <omgdi:waypoint x="-245.0" y="-28.75"/>
+ </bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</definitions>
--
Gitblit v1.9.3