diff --git a/src/main/java/com/xqopen/kehui/flows/util/MyTaskListener.java b/src/main/java/com/xqopen/kehui/flows/util/MyTaskListener.java
index 879462f..ee4cd61 100644
--- a/src/main/java/com/xqopen/kehui/flows/util/MyTaskListener.java
+++ b/src/main/java/com/xqopen/kehui/flows/util/MyTaskListener.java
@@ -129,12 +129,17 @@ public class MyTaskListener implements TaskListener {
int flag=0;//项目立项是否保存当前委托人的标记
String client="";//委托人角色
name = name.equals("office") ? setPostDocumentOffice(aClass, name, flows.getBusinessId()) : name;
+ name = name.equals("branchLeader") ? setBranchLeader(aClass, name, flows.getBusinessId()) : name;
+ if("projectAdmin".equals(name)){
+ client=String.valueOf(name);
+ name="projectAdmin";
+ flag=1;
+ }
if("branchLeaders".equals(name)){
client=String.valueOf(name);
name=setBranchLeaders(aClass, name, flows.getBusinessId());
flag=1;
}
- name = name.equals("branchLeader") ? setBranchLeader(aClass, name, flows.getBusinessId()) : name;
// name = name.equals("branchLeaders") ? setBranchLeaders(aClass, name, flows.getBusinessId()) : name;//项目立项的分管领导，默认是所长/副所长
// name = "MainLeader".equals(name) ? "director" : name;//项目立项主要领导为所长
if("MainLeader".equals(name)){
diff --git a/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java b/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java
index 7b52ce8..7d801cc 100644
--- a/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java
+++ b/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java
@@ -125,7 +125,7 @@ public class ProjectInitListener implements ExecutionListener {
//添加json数据
JSONObject jsonObject = new JSONObject();
jsonObject.put("projectManager", getSystemUserLogin(projectManager).getId());
- jsonObject.put("projectAdmin", getSystemUserLogin(String.valueOf(projectAdmin.get(1))).getId());
+ jsonObject.put("projectAdmin", projectAdmin.get(0));
jsonObject.put("branchLeaders", branchLeaders.get(0));
jsonObject.put("MainLeader", MainLeader.get(0));
// jsonObject.put("branchLeaders",getSystemUserLogin(String.valueOf(branchLeaders.get(1))).getId());
diff --git a/src/main/java/com/xqopen/kehui/flows/util/activitiEnum.java b/src/main/java/com/xqopen/kehui/flows/util/activitiEnum.java
index da0541b..104e192 100644
--- a/src/main/java/com/xqopen/kehui/flows/util/activitiEnum.java
+++ b/src/main/java/com/xqopen/kehui/flows/util/activitiEnum.java
@@ -404,7 +404,10 @@ public class activitiEnum {
@ApiModelProperty("协会副秘书长")
fuSecretaryGeneral("协会副秘书长"),
@ApiModelProperty("协会办公室主任")
- xhOffice("协会办公室主任");
+ xhOffice("协会办公室主任"),
+ @ApiModelProperty("项目管理员")
+ projectAdmin("项目管理员");
+
private String value;
approvelRole(String value) {
@@ -500,8 +503,8 @@ public class activitiEnum {
@ApiModelProperty("请假")
leave("请假"),
- /* @ApiModelProperty("请假")
- leaveXh("请假"),*/
+ /* @ApiModelProperty("请假")
+ leaveXh("请假"),*/
@ApiModelProperty("出国")
abroad("出国"),
@ApiModelProperty("外勤")
@@ -522,7 +525,6 @@ public class activitiEnum {
attendance("考勤"),
-
@ApiModelProperty("项目")
project("项目"),
@ApiModelProperty("申报")
@@ -575,8 +577,6 @@ public class activitiEnum {
materialLibrary("素材库");
-
-
private String value;
activitiClass(String value) {
diff --git a/src/main/java/com/xqopen/kehui/mapper/xml/FlowsConfigurationDao.xml b/src/main/java/com/xqopen/kehui/mapper/xml/FlowsConfigurationDao.xml
index 3fafb12..99badb0 100644
--- a/src/main/java/com/xqopen/kehui/mapper/xml/FlowsConfigurationDao.xml
+++ b/src/main/java/com/xqopen/kehui/mapper/xml/FlowsConfigurationDao.xml
@@ -37,6 +37,7 @@
diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java b/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java
index 796eae9..237d294 100644
--- a/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java
+++ b/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java
@@ -205,7 +205,7 @@ public class ProjectInitComtroller implements ProjectInitApi {
//批量新增项目考核季度表
if (!ObjectUtils.isEmpty(initDto)) {
JSONObject ext = info.getExt();
- String projectAdmin = String.valueOf(((ArrayList) ext.get("projectAdmin")).get(1));
+// String projectAdmin = String.valueOf(((ArrayList) ext.get("projectAdmin")).get(1));
// String branchLeaders = String.valueOf(((ArrayList) ext.get("branchLeaders")).get(1));
// String MainLeader = String.valueOf(((ArrayList) ext.get("MainLeader")).get(1));
String projectManagerData = String.valueOf(((ArrayList) ext.get("projectManagerData")).get(1));
@@ -216,7 +216,7 @@ public class ProjectInitComtroller implements ProjectInitApi {
jsonObject.put("historyExecutor",jsonObject.get("executor"));
jsonObject.put("taskName", "季度审核填报");
jsonObject.put("projectManager", jsonObject.get("executor"));
- jsonObject.put("projectAdmin", getSystemUserLogin(projectAdmin).getId());
+// jsonObject.put("projectAdmin", getSystemUserLogin(projectAdmin).getId());
// jsonObject.put("branchLeaders", getSystemUserLogin(branchLeaders).getId());
// jsonObject.put("MainLeader", getSystemUserLogin(MainLeader).getId());
membersList.forEach(item -> {
@@ -243,10 +243,10 @@ public class ProjectInitComtroller implements ProjectInitApi {
SystemUserLogin systemUserLogin = getSystemUserLogin(map, "projectManagerData");
map.put("projectManagerData", systemUserLogin.getId());
}
- if (!ObjectUtils.isEmpty(map.get("projectAdmin"))) {
- SystemUserLogin systemUserLogin = getSystemUserLogin(map, "projectAdmin");
- map.put("projectAdmin", systemUserLogin.getId());
- }
+// if (!ObjectUtils.isEmpty(map.get("projectAdmin"))) {
+// SystemUserLogin systemUserLogin = getSystemUserLogin(map, "projectAdmin");
+// map.put("projectAdmin", systemUserLogin.getId());
+// }
// if (!ObjectUtils.isEmpty(map.get("branchLeaders"))) {
// SystemUserLogin systemUserLogin = getSystemUserLogin(map, "branchLeaders");
// map.put("branchLeaders", systemUserLogin.getId());
diff --git a/src/main/resources/processes/projectInit.bpmn b/src/main/resources/processes/projectInit.bpmn
index e46223f..d6af312 100644
--- a/src/main/resources/processes/projectInit.bpmn
+++ b/src/main/resources/processes/projectInit.bpmn
@@ -14,7 +14,10 @@
-
+
+
+
+
SequenceFlow_1lquovt