bjquanjiang
/
DigitalScholl
1
0
Vork 0
Code Kwesties 0 Pull-aanvragen 0 Publicaties 0 Wiki Activiteit
Bladeren bron

Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl

master
edy 3 jaren geleden
bovenliggende
ee2a45bd2f 262388aed6
commit
0740a9e3ff
3 gewijzigde bestanden met toevoegingen van 165 en 64 verwijderingen
Zij-aan-zij weergave
Diff opties
Statistieken weergeven Download Patch-bestand Download Diff-bestand
  1. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/NodeForm.cshtml
  2. +16
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/NodeForm.js
  3. +148
    -64
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessBLL.cs

+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/NodeForm.cshtml Bestand weergeven

@@ -199,6 +199,7 @@
<a id="lr_node_auditor" class="btn btn-warning"><i class="fa fa-user"></i>&nbsp;添加节点执行人</a>
<a id="lr_form_auditor" class="btn btn-success"><i class="fa fa-user"></i>&nbsp;添加表字段</a>
<a id="lr_form_schoolmaster" class="btn btn-success"><i class="fa fa-user"></i>&nbsp;添加分管校长</a>
<a id="lr_form_deptmaster" class="btn btn-warning"><i class="fa fa-user"></i>&nbsp;添加部门负责人</a>
<a id="lr_delete_auditor" class="btn btn-danger"><i class="fa fa-trash-o"></i>&nbsp;移除</a>
</div>
</div>


+ 16
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/NodeForm.js Bestand weergeven

@@ -185,6 +185,9 @@ var bootstrap = function ($, learun) {
case '7':
return '分管校长';
break;
case '8':
return '部门负责人';
break;
}
}
},
@@ -350,6 +353,19 @@ var bootstrap = function ($, learun) {
}
});
});
//添加部门负责人
$('#lr_form_deptmaster').on('click', function () {
learun.layerConfirm('是否确认增加部门负责人？', function (res) {
if (res) {
var data = { auditorId: 'bmfzrid', type: '8', auditorName: '部门负责人' };
if (!isRepeat(data.auditorId)) {
data.id = learun.newGuid();
auditors.push(data);
$('#auditor_girdtable').jfGridSet('refreshdata', auditors);
}
}
});
});

/*表单添加*/
$('#workform_girdtable').jfGrid({


+ 148
- 64
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessBLL.cs Bestand weergeven

@@ -534,7 +534,7 @@ namespace Learun.Application.WorkFlow
foreach (var item in nodeAuditorList)
{
switch (item.type)//1.岗位2.角色3.用户4.上下级5.表单指定字段6.某一个节点执行人
//liang 20200813 新增type=7 分管校长
//liang 20200813 新增type=7 分管校长 20210706增加部门负责人type=8
{
case 1:// 岗位
var userRelationList = userRelationIBLL.GetUserIdList(item.auditorId);
@@ -547,17 +547,35 @@ namespace Learun.Application.WorkFlow
{
if (userEntity.F_DepartmentId == paramConfig.CreateUser.DepartmentId)
{
list.Add(new NWFUserInfo()
if (!list.Exists(m => m.Id == userEntity.F_UserId))
{
Id = userEntity.F_UserId,
Account = userEntity.F_Account,
Name = userEntity.F_RealName
});
list.Add(new NWFUserInfo()
{
Id = userEntity.F_UserId,
Account = userEntity.F_Account,
Name = userEntity.F_RealName
});
}
}
}
else if (item.condition == 2)
{
if (userEntity.F_CompanyId == paramConfig.CreateUser.CompanyId)
{
if (!list.Exists(m => m.Id == userEntity.F_UserId))
{
list.Add(new NWFUserInfo()
{
Id = userEntity.F_UserId,
Account = userEntity.F_Account,
Name = userEntity.F_RealName
});
}
}
}
else
{
if (!list.Exists(m => m.Id == userEntity.F_UserId))
{
list.Add(new NWFUserInfo()
{
@@ -567,15 +585,6 @@ namespace Learun.Application.WorkFlow
});
}
}
else
{
list.Add(new NWFUserInfo()
{
Id = userEntity.F_UserId,
Account = userEntity.F_Account,
Name = userEntity.F_RealName
});
}
}
}
break;
@@ -591,24 +600,30 @@ namespace Learun.Application.WorkFlow
{
if (userEntity.F_DepartmentId == paramConfig.CreateUser.DepartmentId)
{
list.Add(new NWFUserInfo()
if (!list.Exists(m => m.Id == userEntity.F_UserId))
{
Id = userEntity.F_UserId,
Account = userEntity.F_Account,
Name = userEntity.F_RealName
});
list.Add(new NWFUserInfo()
{
Id = userEntity.F_UserId,
Account = userEntity.F_Account,
Name = userEntity.F_RealName
});
}
}
}
else if (item.condition == 2)
{
if (userEntity.F_CompanyId == paramConfig.CreateUser.CompanyId)
{
list.Add(new NWFUserInfo()
if (!list.Exists(m => m.Id == userEntity.F_UserId))
{
Id = userEntity.F_UserId,
Account = userEntity.F_Account,
Name = userEntity.F_RealName
});
list.Add(new NWFUserInfo()
{
Id = userEntity.F_UserId,
Account = userEntity.F_Account,
Name = userEntity.F_RealName
});
}
}
}
else if (item.condition == 3) // 需要存在上级关系
@@ -619,12 +634,15 @@ namespace Learun.Application.WorkFlow

if (postIBLL.IsUp(postList1, postList2))
{
list.Add(new NWFUserInfo()
if (!list.Exists(m => m.Id == userEntity.F_UserId))
{
Id = userEntity.F_UserId,
Account = userEntity.F_Account,
Name = userEntity.F_RealName
});
list.Add(new NWFUserInfo()
{
Id = userEntity.F_UserId,
Account = userEntity.F_Account,
Name = userEntity.F_RealName
});
}
}
}
else if (item.condition == 4) // 需要存在下级关系
@@ -634,6 +652,21 @@ namespace Learun.Application.WorkFlow
var postList2 = userRelationIBLL.GetObjectIds(userEntity.F_UserId, 2);// 节点审核人岗位

if (postIBLL.IsDown(postList1, postList2))
{
if (!list.Exists(m => m.Id == userEntity.F_UserId))
{
list.Add(new NWFUserInfo()
{
Id = userEntity.F_UserId,
Account = userEntity.F_Account,
Name = userEntity.F_RealName
});
}
}
}
else
{
if (!list.Exists(m => m.Id == userEntity.F_UserId))
{
list.Add(new NWFUserInfo()
{
@@ -643,15 +676,6 @@ namespace Learun.Application.WorkFlow
});
}
}
else
{
list.Add(new NWFUserInfo()
{
Id = userEntity.F_UserId,
Account = userEntity.F_Account,
Name = userEntity.F_RealName
});
}
}
}
break;
@@ -664,12 +688,15 @@ namespace Learun.Application.WorkFlow
var userEntity3 = userIBLL.GetEntityByUserId(userItem);
if (userEntity3 != null)
{
list.Add(new NWFUserInfo()
if (!list.Exists(m => m.Id == userEntity3.F_UserId))
{
Id = userEntity3.F_UserId,
Account = userEntity3.F_Account,
Name = userEntity3.F_RealName
});
list.Add(new NWFUserInfo()
{
Id = userEntity3.F_UserId,
Account = userEntity3.F_Account,
Name = userEntity3.F_RealName
});
}
}
}
}
@@ -695,12 +722,15 @@ namespace Learun.Application.WorkFlow
var userEntity = userIBLL.GetEntityByUserId(userRelationItem.F_UserId);
if (userEntity != null)
{
list.Add(new NWFUserInfo()
if (!list.Exists(m => m.Id == userEntity.F_UserId))
{
Id = userEntity.F_UserId,
Account = userEntity.F_Account,
Name = userEntity.F_RealName
});
list.Add(new NWFUserInfo()
{
Id = userEntity.F_UserId,
Account = userEntity.F_Account,
Name = userEntity.F_RealName
});
}
}
}
break;
@@ -723,12 +753,15 @@ namespace Learun.Application.WorkFlow
var userEntity5 = userIBLL.GetEntityByUserId(row[0].ToString());
if (userEntity5 != null)
{
list.Add(new NWFUserInfo()
if (!list.Exists(m => m.Id == userEntity5.F_UserId))
{
Id = userEntity5.F_UserId,
Account = userEntity5.F_Account,
Name = userEntity5.F_RealName
});
list.Add(new NWFUserInfo()
{
Id = userEntity5.F_UserId,
Account = userEntity5.F_Account,
Name = userEntity5.F_RealName
});
}
}
}
}
@@ -741,12 +774,15 @@ namespace Learun.Application.WorkFlow
var userEntity6 = userIBLL.GetEntityByUserId(task.F_CreateUserId);
if (userEntity6 != null)
{
list.Add(new NWFUserInfo()
if (!list.Exists(m => m.Id == userEntity6.F_UserId))
{
Id = userEntity6.F_UserId,
Account = userEntity6.F_Account,
Name = userEntity6.F_RealName
});
list.Add(new NWFUserInfo()
{
Id = userEntity6.F_UserId,
Account = userEntity6.F_Account,
Name = userEntity6.F_RealName
});
}
}
}
break;
@@ -782,12 +818,60 @@ namespace Learun.Application.WorkFlow

if (null != userEntity7)
{
list.Add(new NWFUserInfo()
if (!list.Exists(m => m.Id == userEntity7.F_UserId))
{
Id = userEntity7.F_UserId,
Account = userEntity7.F_Account,
Name = userEntity7.F_RealName
});
list.Add(new NWFUserInfo()
{
Id = userEntity7.F_UserId,
Account = userEntity7.F_Account,
Name = userEntity7.F_RealName
});
}
}
}
break;
case 8://liang 20210706新增部门负责人判断
//获取流程创建用户的分管领导
//判断用户所在部门是否有上级部门：如果有，找到上级部门的负责人；如果没有，找本部门的分管校长；
string deptMasterId = "";
var selfDepart2 = departmentIBLL.GetEntity(paramConfig.CreateUser.DepartmentId);
if (selfDepart2 != null)
{
//本部门存在部门负责人
if (!string.IsNullOrEmpty(selfDepart2.F_Manager))
{
deptMasterId = selfDepart2.F_Manager;
}
else
{
//本部门不存在就找上级部门
var parentDepart = departmentIBLL.GetEntity(selfDepart2.F_ParentId);
if (parentDepart != null)
{
if (!string.IsNullOrEmpty(selfDepart2.F_Manager))
{
deptMasterId = parentDepart.F_Manager;
}
}
}
}
//找到部门负责人就增加审批人
if (!string.IsNullOrEmpty(deptMasterId))
{
var userEntity7 = userIBLL.GetEntityByUserId(deptMasterId);

if (null != userEntity7)
{
if (!list.Exists(m => m.Id == userEntity7.F_UserId))
{
list.Add(new NWFUserInfo()
{
Id = userEntity7.F_UserId,
Account = userEntity7.F_Account,
Name = userEntity7.F_RealName
});
}

}

}


Schrijf Voorbeeld
Laden…
Annuleren
Opslaan