xh/kehui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.公共枚举类角色新增项目管理员

Browse Source 
2.流程设置查询角色 case新增projectAdmin为项目管理员
3.公共监控器，增加节点名称为项目管理员获取当前执行人
4.结项列表排序回退
5.流程图、控制器去掉从前端获取项目管理员
6.修改立项结束监控器，修改项目管理员字段的获取
This commit is contained in:
zty 2024-08-01 16:01:28 +08:00
parent 20194daf2b
commit 1bc8939482
7 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/xqopen/kehui/flows/util/MyTaskListener.java
View File

@ -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)){

2
src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java
View File

@ -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());

8
src/main/java/com/xqopen/kehui/flows/util/activitiEnum.java
View File

@ -404,7 +404,10 @@ public class activitiEnum {
@ApiModelProperty("协会副秘书长")
fuSecretaryGeneral("协会副秘书长"),
@ApiModelProperty("协会办公室主任")
xhOffice("协会办公室主任");
xhOffice("协会办公室主任"),
@ApiModelProperty("项目管理员")
projectAdmin("项目管理员");
private String value;
approvelRole(String value) {
@ -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) {

1
src/main/java/com/xqopen/kehui/mapper/xml/FlowsConfigurationDao.xml
View File

@ -37,6 +37,7 @@
<select id="getConfigurationList" resultMap="returnConfiguration">
SELECT fc.*,
CASE fc.approved_role
when 'projectAdmin' then '项目管理员'
WHEN 'director' THEN '所长'
WHEN 'depDirector' THEN '副所长'
WHEN 'laborManager' THEN '工会干事'

8
src/main/java/com/xqopen/kehui/mapper/xml/ProjectInfoDao.xml
View File

@ -177,13 +177,7 @@
<if test="projectInfo.id!=null">
and pi.id_=#{projectInfo.id}
</if>
-- order by pi.created_at desc
<!-- select * from project_info-->
<!-- <where>-->
<!-- is_deleted=false-->
<!-- and created_by=#{userId}-->
<!-- and ext_->>'taskName' !='结项完成'-->
<!-- </where>-->
order by pi.created_at desc
</select>
<sql id="com">

12
src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java
View File

@ -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());

5
src/main/resources/processes/projectInit.bpmn
View File

@ -14,7 +14,10 @@
</extensionElements>
</userTask>
<sequenceFlow id="SequenceFlow_0ssey7t" sourceRef="projectAdmin" targetRef="branchLeaders" />
<userTask id="projectAdmin" name="所项目管理员" activiti:assignee="${projectAdmin}">
<userTask id="projectAdmin" name="所项目管理员" >
<extensionElements>
<activiti:taskListener class="com.xqopen.kehui.flows.util.MyTaskListener" event="create" />
</extensionElements>
<incoming>SequenceFlow_1lquovt</incoming>
</userTask>
<sequenceFlow id="SequenceFlow_0884cd5" sourceRef="branchLeaders" targetRef="MainLeader" />