From 1bc8939482175c132ff3d95b7920aed09af6f9a4 Mon Sep 17 00:00:00 2001
From: zty <1048209592@qq.com>
Date: Thu, 1 Aug 2024 16:01:28 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=85=AC=E5=85=B1=E6=9E=9A=E4=B8=BE=E7=B1=BB?=
=?UTF-8?q?=E8=A7=92=E8=89=B2=E6=96=B0=E5=A2=9E=E9=A1=B9=E7=9B=AE=E7=AE=A1?=
=?UTF-8?q?=E7=90=86=E5=91=98=202.=E6=B5=81=E7=A8=8B=E8=AE=BE=E7=BD=AE?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=A7=92=E8=89=B2=20case=E6=96=B0=E5=A2=9Epr?=
=?UTF-8?q?ojectAdmin=E4=B8=BA=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E5=91=98=203.=E5=85=AC=E5=85=B1=E7=9B=91=E6=8E=A7=E5=99=A8?=
=?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=8A=82=E7=82=B9=E5=90=8D=E7=A7=B0?=
=?UTF-8?q?=E4=B8=BA=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E5=91=98=E8=8E=B7?=
=?UTF-8?q?=E5=8F=96=E5=BD=93=E5=89=8D=E6=89=A7=E8=A1=8C=E4=BA=BA=204.?=
=?UTF-8?q?=E7=BB=93=E9=A1=B9=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F=E5=9B=9E?=
=?UTF-8?q?=E9=80=80=205.=E6=B5=81=E7=A8=8B=E5=9B=BE=E3=80=81=E6=8E=A7?=
=?UTF-8?q?=E5=88=B6=E5=99=A8=E5=8E=BB=E6=8E=89=E4=BB=8E=E5=89=8D=E7=AB=AF?=
=?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E5=91=98?=
=?UTF-8?q?=206.=E4=BF=AE=E6=94=B9=E7=AB=8B=E9=A1=B9=E7=BB=93=E6=9D=9F?=
=?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=99=A8=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=A1=B9?=
=?UTF-8?q?=E7=9B=AE=E7=AE=A1=E7=90=86=E5=91=98=E5=AD=97=E6=AE=B5=E7=9A=84?=
=?UTF-8?q?=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/xqopen/kehui/flows/util/MyTaskListener.java | 7 ++++++-
.../xqopen/kehui/flows/util/ProjectInitListener.java | 2 +-
.../com/xqopen/kehui/flows/util/activitiEnum.java | 12 ++++++------
.../kehui/mapper/xml/FlowsConfigurationDao.xml | 1 +
.../com/xqopen/kehui/mapper/xml/ProjectInfoDao.xml | 8 +-------
.../kehui/project/action/ProjectInitComtroller.java | 12 ++++++------
src/main/resources/processes/projectInit.bpmn | 5 ++++-
7 files changed, 25 insertions(+), 22 deletions(-)
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