bjquanjiang
/
DigitalScholl
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Merge branch '金隅分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 金隅分支

金隅分支
zhangli 3 years ago
parent
9e1704d1c6 61531966c2
commit
5c4dbf4e31
11 changed files with 304 additions and 165 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  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. +98
    -98
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Form.cshtml
  4. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Form.js
  5. +14
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Index.js
  6. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.cshtml
  7. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.js
  8. +14
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Index.js
  9. +5
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_Payroll/EMP_PayrollEntity.cs
  10. +5
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_PayrollOnce/EMP_PayrollOnceEntity.cs
  11. +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 View File

@@ -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 View File

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


+ 98
- 98
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Form.cshtml View File

@@ -3,201 +3,201 @@
Layout = "~/Views/Shared/_Form.cshtml";
}
<div class="lr-form-wrap" id="form">
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">姓名</div>
<input id="SalaryName" type="text" class="form-control" />
<div id="UserId"></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">岗位工资</div>
<input id="PostSalary" type="text" class="form-control" />
<input id="PostSalary" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">薪级工资</div>
<input id="PayWages" type="text" class="form-control" />
<input id="PayWages" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">提高百分之十</div>
<input id="UpTenpercent" type="text" class="form-control" />
<input id="UpTenpercent" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">校内补贴</div>
<input id="SchoolSub" type="text" class="form-control" />
<input id="SchoolSub" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">临时性补贴</div>
<input id="TemporarySub" type="text" class="form-control" />
<input id="TemporarySub" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">职级工资</div>
<input id="RankWage" type="text" class="form-control" />
<input id="RankWage" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">级差补贴</div>
<input id="DifferentialSub" type="text" class="form-control" />
<input id="DifferentialSub" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">绩效工资</div>
<input id="MeritPay" type="text" class="form-control" />
<input id="MeritPay" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">绩效工资减少额</div>
<input id="MeritPayLess" type="text" class="form-control" />
<input id="MeritPayLess" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">月发一次性绩效</div>
<input id="MonthlyoneMerit" type="text" class="form-control" />
<input id="MonthlyoneMerit" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">倾斜</div>
<input id="Tilt" type="text" class="form-control" />
<input id="Tilt" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">课时费</div>
<input id="Classfees" type="text" class="form-control" />
<input id="Classfees" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">超课时</div>
<input id="SuperClass" type="text" class="form-control" />
<input id="SuperClass" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">培训课酬</div>
<input id="TrainingDollars" type="text" class="form-control" />
<input id="TrainingDollars" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">奖金</div>
<input id="Bonus" type="text" class="form-control" />
<input id="Bonus" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">婴补</div>
<input id="BabySubsidies" type="text" class="form-control" />
<input id="BabySubsidies" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">班主任</div>
<input id="ClassTeacher" type="text" class="form-control" />
<input id="ClassTeacher" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">骨干津贴</div>
<input id="KeyBenefits" type="text" class="form-control" />
<input id="KeyBenefits" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">职务补</div>
<input id="PositionFill" type="text" class="form-control" />
<input id="PositionFill" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">加班费</div>
<input id="OvertimePay" type="text" class="form-control" />
<input id="OvertimePay" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">值班费</div>
<input id="OnDutyfee" type="text" class="form-control" />
<input id="OnDutyfee" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">考务费</div>
<input id="ExaminationFee" type="text" class="form-control" />
<input id="ExaminationFee" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">安全绩效</div>
<input id="SecurityPay" type="text" class="form-control" />
<input id="SecurityPay" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">医药费</div>
<input id="MedicalBills" type="text" class="form-control" />
<input id="MedicalBills" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">防暑降温</div>
<input id="CoolingPurposes" type="text" class="form-control" />
<input id="CoolingPurposes" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">房补</div>
<input id="HousSub" type="text" class="form-control" />
<input id="HousSub" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">物业补贴</div>
<input id="PropertySub" type="text" class="form-control" />
<input id="PropertySub" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">采暖补贴</div>
<input id="HeatingSub" type="text" class="form-control" />
<input id="HeatingSub" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">综合补助</div>
<input id="ComprehensiveSub" type="text" class="form-control" />
<input id="ComprehensiveSub" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">综治奖</div>
<input id="ControlSub" type="text" class="form-control" />
<input id="ControlSub" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">补发</div>
<input id="Replacement" type="text" class="form-control" />
<input id="Replacement" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">应发合计</div>
<input id="SendSum" type="text" class="form-control" />
<input id="SendSum" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">失保</div>
<input id="LossInsurance" type="text" class="form-control" />
<input id="LossInsurance" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">养保</div>
<input id="Bartender" type="text" class="form-control" />
<input id="Bartender" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">职业年金</div>
<input id="OcPension" type="text" class="form-control" />
<input id="OcPension" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">房积金</div>
<input id="HousFund" type="text" class="form-control" />
<input id="HousFund" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">医保</div>
<input id="HealthCare" type="text" class="form-control" />
<input id="HealthCare" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">房租</div>
<input id="TheRent" type="text" class="form-control" />
<input id="TheRent" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">网费</div>
<input id="InternetFee" type="text" class="form-control" />
<input id="InternetFee" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">考核扣款</div>
<input id="AssDeductions" type="text" class="form-control" />
<input id="AssDeductions" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">其他扣款</div>
<input id="OtherDeductions" type="text" class="form-control" />
<input id="OtherDeductions" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">代扣个税</div>
<input id="WithBuckletax" type="text" class="form-control" />
<input id="WithBuckletax" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">扣款合计</div>
<input id="DeductionsSum" type="text" class="form-control" />
<input id="DeductionsSum" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">纳税收入</div>
<input id="TaxRevenue" type="text" class="form-control" />
<input id="TaxRevenue" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">免税收入</div>
<input id="TaxIncome" type="text" class="form-control" />
<input id="TaxIncome" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">应发合计</div>
<input id="NetCombined" type="text" class="form-control" />
<input id="NetCombined" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">发放月份</div>
<input id="IssueMonth" type="text" class="form-control" />
<input id="IssueMonth" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll" >
<div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
<div class="lr-form-item-title">发放年份</div>
<input id="IssueYear" type="text" class="form-control" />
<input id="IssueYear" type="text" class="form-control" />
</div>
</div>
@Html.AppendJsFile("/Areas/PersonnelManagement/Views/Emp_Payroll/Form.js")

+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Form.js View File

@@ -15,6 +15,7 @@ var bootstrap = function ($, learun) {
page.initData();
},
bind: function () {
$('#UserId').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_userid', text: 'f_realname' });
},
initData: function () {
if (!!keyValue) {


+ 14
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Index.js View File

@@ -90,7 +90,20 @@ var bootstrap = function ($, learun) {
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/PersonnelManagement/Emp_Payroll/GetPageList',
headData: [
{ label: "姓名", name: "SalaryName", width: 100, align: "left" },
//{ label: "姓名", name: "UserId", width: 100, align: "left" },
{
label: "名称", name: "UserId", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo',
key: value,
keyId: 'f_userid',
callback: function (_data) {
callback(_data['f_realname']);
}
});
}
},
{ label: "岗位工资", name: "PostSalary", width: 100, align: "left", statistics: true },
{ label: "薪级工资", name: "PayWages", width: 100, align: "left", statistics: true },
{ label: "提高百分之十", name: "UpTenpercent", width: 100, align: "left", statistics: true },


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.cshtml View File

@@ -5,7 +5,7 @@
<div class="lr-form-wrap" id="form">
<div class="col-xs-6 lr-form-item" data-table="EMP_PayrollOnce">
<div class="lr-form-item-title">姓名</div>
<input id="SalaryName" type="text" class="form-control" />
<div id="UserId"></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_PayrollOnce">
<div class="lr-form-item-title">发放月份</div>


+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.js View File

@@ -15,6 +15,7 @@ var bootstrap = function ($, learun) {
page.initData();
},
bind: function () {
$('#UserId').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_userid', text: 'f_realname' });
},
initData: function () {
if (!!keyValue) {


+ 14
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Index.js View File

@@ -90,7 +90,20 @@ var bootstrap = function ($, learun) {
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/PersonnelManagement/Emp_PayrollOnce/GetPageList',
headData: [
{ label: "姓名", name: "SalaryName", width: 100, align: "left" },
//{ label: "姓名", name: "UserId", width: 100, align: "left" },
{
label: "名称", name: "UserId", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo',
key: value,
keyId: 'f_userid',
callback: function (_data) {
callback(_data['f_realname']);
}
});
}
},
{ label: "应发金额", name: "TotalPayAmount", width: 100, align: "left", statistics: true },
{ label: "实发金额", name: "FinalPayAmount", width: 100, align: "left", statistics: true },
{ label: "发放月份", name: "IssueMonth", width: 100, align: "left" },


+ 5
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_Payroll/EMP_PayrollEntity.cs View File

@@ -20,6 +20,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
/// </summary>
[Column("SALARYID")]
public string SalaryID { get; set; }
/// <summary>
/// 教师编码
/// </summary>
[Column("USERID")]
public string UserId { get; set; }
/// <summary>
/// SalaryName
/// </summary>


+ 5
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_PayrollOnce/EMP_PayrollOnceEntity.cs View File

@@ -20,6 +20,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
/// </summary>
[Column("SALARYID")]
public string SalaryID { get; set; }
/// <summary>
/// 教师编码
/// </summary>
[Column("USERID")]
public string UserId { get; set; }
/// <summary>
/// 姓名
/// </summary>


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

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

}

}


Write Preview
Loading…
Cancel
Save