From c007f0ca1785db093d48f4846cda82fe8e955765 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 27 五月 2020 09:59:29 +0800
Subject: [PATCH] merage
---
src/main/java/com/highdatas/mdm/service/impl/FlowsServiceImpl.java | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/service/impl/FlowsServiceImpl.java b/src/main/java/com/highdatas/mdm/service/impl/FlowsServiceImpl.java
index 4c22f10..1ed36ab 100644
--- a/src/main/java/com/highdatas/mdm/service/impl/FlowsServiceImpl.java
+++ b/src/main/java/com/highdatas/mdm/service/impl/FlowsServiceImpl.java
@@ -38,8 +38,6 @@
@Autowired
SysFieldMapper fieldMapper;
@Autowired
- ITUserRoleService userRoleService;
- @Autowired
IMasterModifiedService masterModifiedService;
@Autowired
IMaintainService maintainService;
@@ -52,6 +50,16 @@
@Autowired
ISysMenuService menuService;
+ /**
+ *
+ * @description: 鍒涘缓鏂板瓧娈电増鏈�
+ * @param userId 鐢ㄦ埛id
+ * @param maintainId 鏁版嵁鐗堟湰id
+ * @param tableName 琛ㄥ悕
+ *
+ * @return: maintainfielid 瀛楁鐗堟湰瀵硅薄
+ *
+ */
@Override
public MaintainField createNowVerion(String tableName, String maintainId, String userId) {
MaintainField nowMaintain = maintainFieldService.getNextMaintain(tableName, userId);
@@ -70,7 +78,13 @@
return nowMaintain;
}
-
+ /**
+ *
+ * @description: 閫氳繃涓氬姟id鑾峰彇瀹℃壒鐘舵��
+ * @param businessId 涓氬姟id
+ * @return: status
+ *
+ */
@Override
public ActivitiStatus getStatusByBusinessId(String businessId) {
Flows flows = selectOne(new EntityWrapper<Flows>().eq("business_id", businessId).orderBy("create_time desc"));
@@ -79,7 +93,14 @@
}
return flows.getStatus();
}
-
+ /**
+ *
+ * @description: 鍒ゆ柇鏄惁涓轰笅涓�鑺傜偣瀹℃壒浜�
+ * @param flows 娴佺▼
+ * @param userId 鐢ㄦ埛id
+ * @return: status
+ *
+ */
@Override
public boolean isNextAudit(Flows flows, String userId) {
NextTaskUserInfo nestTaskAssignee = taskService.getNestTaskAssignee(flows.getWorkflowId());
@@ -108,6 +129,13 @@
}
}
+ /**
+ *
+ * @description: 娴佺▼瀹屾垚鍚庣殑鎿嶄綔
+ * @param flows 娴佺▼瀹炰緥
+ *
+ */
+
@Override
public void aduitFinish(Flows flows) {
// 鏂板绾跨▼
@@ -116,8 +144,8 @@
if (flows.getBusinessType().equals(ActivitiBusinessType.maintain)){
String maintainId = flows.getBusinessId();
log.info("flow-maintain:" + maintainId);
- //masterModifiedService.dealFlow(maintainId, flows.getStatus());
- //log.info("flow-masterModifiedService end");
+ masterModifiedService.dealFlow(maintainId, flows.getStatus());
+ log.info("flow-masterModifiedService end");
maintainService.dealFlow(maintainId, flows.getStatus());
log.info("flow-maintainService end");
viewService.dealFlow(maintainId, flows.getStatus());
--
Gitblit v1.8.0