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

新增 考核评价主表 分值表

yanshi
zhangli 3 years ago
parent
e0d84cb1a0
commit
1a7d0fb14b
19 changed files with 1022 additions and 124 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +117
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/DT_EvaluationDataMainController.cs
  2. +23
    -23
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/Index.cshtml
  3. +18
    -14
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/Index.js
  4. +23
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationDataMain/Form.cshtml
  5. +52
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationDataMain/Form.js
  6. +39
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationDataMain/Index.cshtml
  7. +158
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationDataMain/Index.js
  8. +5
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
  9. +9
    -8
      Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/EvaluatingIndicatorApi.cs
  10. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj
  11. +29
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/DT_EvaluationDataMainMap.cs
  12. +55
    -45
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM
  13. +4
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj
  14. +46
    -21
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataEntity.cs
  15. +29
    -13
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataService.cs
  16. +125
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationDataMain/DT_EvaluationDataMainBLL.cs
  17. +92
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationDataMain/DT_EvaluationDataMainEntity.cs
  18. +48
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationDataMain/DT_EvaluationDataMainIBLL.cs
  19. +149
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationDataMain/DT_EvaluationDataMainService.cs

+ 117
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/DT_EvaluationDataMainController.cs View File

@@ -0,0 +1,117 @@
using Learun.Util;
using System.Data;
using Learun.Application.TwoDevelopment.PersonnelManagement;
using System.Web.Mvc;
using System.Collections.Generic;

namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
{
/// <summary>
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
/// 创 建：超级管理员
/// 日 期：2021-12-09 16:16
/// 描 述：党员评价考核主表
/// </summary>
public class DT_EvaluationDataMainController : MvcControllerBase
{
private DT_EvaluationDataMainIBLL dT_EvaluationDataMainIBLL = new DT_EvaluationDataMainBLL();

#region 视图功能

/// <summary>
/// 主页面
/// <summary>
/// <returns></returns>
[HttpGet]
public ActionResult Index()
{
return View();
}
/// <summary>
/// 表单页
/// <summary>
/// <returns></returns>
[HttpGet]
public ActionResult Form()
{
return View();
}
#endregion

#region 获取数据

/// <summary>
/// 获取页面显示列表数据
/// </summary>
/// <param name="pagination">分页参数</param>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
[HttpGet]
[AjaxOnly]
public ActionResult GetPageList(string pagination, string queryJson)
{
Pagination paginationobj = pagination.ToObject<Pagination>();
var data = dT_EvaluationDataMainIBLL.GetPageList(paginationobj, queryJson);
var jsonData = new
{
rows = data,
total = paginationobj.total,
page = paginationobj.page,
records = paginationobj.records
};
return Success(jsonData);
}
/// <summary>
/// 获取表单数据
/// </summary>
/// <param name="keyValue">主键</param>
/// <returns></returns>
[HttpGet]
[AjaxOnly]
public ActionResult GetFormData(string keyValue)
{
var DT_EvaluationDataMainData = dT_EvaluationDataMainIBLL.GetDT_EvaluationDataMainEntity( keyValue );
var jsonData = new {
DT_EvaluationDataMain = DT_EvaluationDataMainData,
};
return Success(jsonData);
}
#endregion

#region 提交数据

/// <summary>
/// 删除实体数据
/// </summary>
/// <param name="keyValue">主键</param>
/// <returns></returns>
[HttpPost]
[AjaxOnly]
public ActionResult DeleteForm(string keyValue)
{
dT_EvaluationDataMainIBLL.DeleteEntity(keyValue);
return Success("删除成功！");
}
/// <summary>
/// 保存实体数据（新增、修改）
/// </summary>
/// <param name="keyValue">主键</param>
/// <param name="strEntity">实体</param>
/// <returns></returns>
[HttpPost]
[ValidateAntiForgeryToken]
[AjaxOnly]
public ActionResult SaveForm(string keyValue, string strEntity)
{
DT_EvaluationDataMainEntity entity = strEntity.ToObject<DT_EvaluationDataMainEntity>();
dT_EvaluationDataMainIBLL.SaveEntity(keyValue,entity);
if (string.IsNullOrEmpty(keyValue))
{
}
return Success("保存成功！");
}
#endregion

}
}

+ 23
- 23
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/Index.cshtml View File

@@ -8,31 +8,31 @@
<div class="lr-layout-tool">
<div class="lr-layout-tool-left">
<div class="lr-layout-tool-item">
<div id="multiple_condition_query">
@*<div id="multiple_condition_query">
<div class="lr-query-formcontent">
@*<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">考核内容</div>
<div id="Assessment"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">行为标准</div>
<div id="ConductRequirements"></div>
</div>*@
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">被考核党员</div>
<div id="BeAssessed"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">类型</div>
<select id="ScoreType" class="form-control">
<option value="">==请选择==</option>
<option value="1">党员自评</option>
<option value="2">党小组长评</option>
</select>
<div></div>
</div>
</div>
</div>
<div class="lr-form-item-title">考核内容</div>
<div id="Assessment"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">行为标准</div>
<div id="ConductRequirements"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">被考核党员</div>
<div id="BeAssessed"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">类型</div>
<select id="ScoreType" class="form-control">
<option value="">==请选择==</option>
<option value="1">党员自评</option>
<option value="2">党小组长评</option>
</select>
<div></div>
</div>
</div>
</div>*@
</div>
</div>
<div class="lr-layout-tool-right">


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

@@ -5,6 +5,8 @@
* 描 述：评价考核表
*/
var refreshGirdData;
var MainId = request('MainId');
var ScoreType = request('ScoreType');
var bootstrap = function ($, learun) {
"use strict";
var page = {
@@ -76,8 +78,8 @@ var bootstrap = function ($, learun) {
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/PersonnelManagement/DT_EvaluationData/GetPageList',
headData: [
{ label: "年度", name: "ScoreYear", width: 100, align: "left" },
{ label: "季度", name: "ScoreQuarter", width: 100, align: "left" },
//{ label: "年度", name: "ScoreYear", width: 100, align: "left" },
//{ label: "季度", name: "ScoreQuarter", width: 100, align: "left" },
{
label: "考核内容", name: "Assessment", width: 150, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
@@ -92,17 +94,17 @@ var bootstrap = function ($, learun) {

},
{ label: "行为规范要求", name: "ConductRequirements", width: 200, align: "left" },
{ label: "被考核党员", name: "BeAssessed", width: 100, align: "left",
formatterAsync: function (callback, value, row, op,$cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'PartyMember',
key: value,
keyId: 'id',
callback: function (_data) {
callback(_data['name']);
}
});
}},
//{ label: "被考核党员", name: "BeAssessed", width: 100, align: "left",
// formatterAsync: function (callback, value, row, op,$cell) {
// learun.clientdata.getAsync('custmerData', {
// url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'PartyMember',
// key: value,
// keyId: 'id',
// callback: function (_data) {
// callback(_data['name']);
// }
// });
// }},
{ label: "打分人", name: "Assessed", width: 100, align: "left",
formatterAsync: function (callback, value, row, op,$cell) {
learun.clientdata.getAsync('custmerData', {
@@ -129,12 +131,14 @@ var bootstrap = function ($, learun) {
],
mainId:'Id',
isPage: true,
sidx: 'BeAssessed Asc,ScoreType ASC,Assessed ASC,EOrder Asc',
sidx: 'ScoreType ASC,Assessed ASC,EOrder Asc',
});
page.search();
},
search: function (param) {
param = param || {};
param.MainId = MainId;
param.ScoreType = ScoreType;
$('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
}
};


+ 23
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationDataMain/Form.cshtml View File

@@ -0,0 +1,23 @@
@{
ViewBag.Title = "党员评价考核主表";
Layout = "~/Views/Shared/_Form.cshtml";
}
<div class="lr-form-wrap" id="form">
<div class="col-xs-12 lr-form-item" data-table="DT_EvaluationDataMain" >
<div class="lr-form-item-title">党员小组<font face="宋体">*</font></div>
<div id="PartyMemberGroupId" isvalid="yes" checkexpession="NotNull" ></div>
</div>
<div class="col-xs-12 lr-form-item" data-table="DT_EvaluationDataMain" >
<div class="lr-form-item-title">被考核党员</div>
<div id="BeAssessed" ></div>
</div>
<div class="col-xs-12 lr-form-item" data-table="DT_EvaluationDataMain" >
<div class="lr-form-item-title">自评总分</div>
<input id="ScoreZP" type="text" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item" data-table="DT_EvaluationDataMain" >
<div class="lr-form-item-title">小组长评总分</div>
<input id="ScoreXZ" type="text" class="form-control" />
</div>
</div>
@Html.AppendJsFile("/Areas/PersonnelManagement/Views/DT_EvaluationDataMain/Form.js")

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

@@ -0,0 +1,52 @@
/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
* Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
* 创建人：超级管理员
* 日 期：2021-12-09 16:16
* 描 述：党员评价考核主表
*/
var acceptClick;
var keyValue = request('keyValue');
var bootstrap = function ($, learun) {
"use strict";
var page = {
init: function () {
$('.lr-form-wrap').lrscroll();
page.bind();
page.initData();
},
bind: function () {
$('#PartyMemberGroupId').lrDataSourceSelect({ code: 'PartyMember',value: 'id',text: 'name' });
$('#BeAssessed').lrDataSourceSelect({ code: 'PartyMember',value: 'id',text: 'name' });
},
initData: function () {
if (!!keyValue) {
$.lrSetForm(top.$.rootUrl + '/PersonnelManagement/DT_EvaluationDataMain/GetFormData?keyValue=' + keyValue, function (data) {
for (var id in data) {
if (!!data[id].length && data[id].length > 0) {
$('#' + id ).jfGridSet('refreshdata', data[id]);
}
else {
$('[data-table="' + id + '"]').lrSetFormData(data[id]);
}
}
});
}
}
};
// 保存数据
acceptClick = function (callBack) {
if (!$('body').lrValidform()) {
return false;
}
var postData = {
strEntity: JSON.stringify($('body').lrGetFormData())
};
$.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/DT_EvaluationDataMain/SaveForm?keyValue=' + keyValue, postData, function (res) {
// 保存成功后才回调
if (!!callBack) {
callBack();
}
});
};
page.init();
}

+ 39
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationDataMain/Index.cshtml View File

@@ -0,0 +1,39 @@
@{
ViewBag.Title = "党员评价考核主表";
Layout = "~/Views/Shared/_Index.cshtml";
}
<div class="lr-layout " >
<div class="lr-layout-center">
<div class="lr-layout-wrap lr-layout-wrap-notitle ">
<div class="lr-layout-tool">
<div class="lr-layout-tool-left">
<div class="lr-layout-tool-item">
<div id="multiple_condition_query">
<div class="lr-query-formcontent">
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">被考核党员</div>
<div id="BeAssessed"></div>
</div>
</div>
</div>
</div>
</div>
<div class="lr-layout-tool-right">
<div class=" btn-group btn-group-sm">
<a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
</div>
<div class=" btn-group btn-group-sm" learun-authorize="yes">
<a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
<a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
<a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
<a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
<a id="lr_dyzp" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;党员自评</a>
<a id="lr_xzzp" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;党小组长评分</a>
</div>
</div>
</div>
<div class="lr-layout-body" id="gridtable"></div>
</div>
</div>
</div>
@Html.AppendJsFile("/Areas/PersonnelManagement/Views/DT_EvaluationDataMain/Index.js")

+ 158
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationDataMain/Index.js View File

@@ -0,0 +1,158 @@
/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
* Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
* 创建人：超级管理员
* 日 期：2021-12-09 16:16
* 描 述：党员评价考核主表
*/
var refreshGirdData;
var bootstrap = function ($, learun) {
"use strict";
var page = {
init: function () {
page.initGird();
page.bind();
},
bind: function () {
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson);
}, 220, 400);
$('#BeAssessed').lrDataSourceSelect({ code: 'PartyMember', value: 'id', text: 'name' });
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
});
// 新增
$('#lr_add').on('click', function () {
learun.layerForm({
id: 'form',
title: '新增',
url: top.$.rootUrl + '/PersonnelManagement/DT_EvaluationDataMain/Form',
width: 600,
height: 400,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
}
});
});
// 编辑
$('#lr_edit').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('Id');
if (learun.checkrow(keyValue)) {
learun.layerForm({
id: 'form',
title: '编辑',
url: top.$.rootUrl + '/PersonnelManagement/DT_EvaluationDataMain/Form?keyValue=' + keyValue,
width: 600,
height: 400,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
}
});
}
});
// 删除
$('#lr_delete').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('Id');
if (learun.checkrow(keyValue)) {
learun.layerConfirm('是否确认删除该项！', function (res) {
if (res) {
learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/DT_EvaluationDataMain/DeleteForm', { keyValue: keyValue }, function () {
refreshGirdData();
});
}
});
}
});

// 党员自评详情
$('#lr_dyzp').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('Id');
var BeAssessed = $('#gridtable').jfGridValue('BeAssessed');
if (learun.checkrow(keyValue)) {
learun.layerForm({
id: 'form',
title: '党员自评详情',
url: top.$.rootUrl + '/PersonnelManagement/DT_EvaluationData/Index?MainId=' + keyValue + '&ScoreType=1',
width: 900,
height: 700,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
}
});
}
});
// 党小组长评分详情
$('#lr_xzzp').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('Id');
var BeAssessed = $('#gridtable').jfGridValue('BeAssessed');
if (learun.checkrow(keyValue)) {
learun.layerForm({
id: 'form',
title: '党小组长评分详情',
url: top.$.rootUrl + '/PersonnelManagement/DT_EvaluationData/Index?MainId=' + keyValue + '&ScoreType=2',
width: 600,
height: 400,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
}
});
}
});
// 打印
$('#lr_print').on('click', function () {
$('#gridtable').jqprintTable();
});
},
// 初始化列表
initGird: function () {
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/PersonnelManagement/DT_EvaluationDataMain/GetPageList',
headData: [
{ label: "年度", name: "ScoreYear", width: 100, align: "left" },
{ label: "季度", name: "ScoreQuarter", width: 100, align: "left" },
{
label: "党员小组", name: "PartyMemberGroupId", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DT_PartyMemberGroup',
key: value,
keyId: 'id',
callback: function (_data) {
callback(_data['name']);
}
});
}
},
{
label: "被考核党员", name: "BeAssessed", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'PartyMember',
key: value,
keyId: 'id',
callback: function (_data) {
callback(_data['name']);
}
});
}
},
{ label: "自评分值", name: "ScoreZP", width: 100, align: "left" },
{ label: "小组长评分值", name: "ScoreXZ", width: 100, align: "left" },
],
mainId: 'Id',
isPage: true,
sidx: 'CreateTime',
sord: 'DESC',
});
page.search();
},
search: function (param) {
param = param || {};
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
refreshGirdData = function () {
$('#gridtable').jfGridSet('reload');
};
page.init();
}

+ 5
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj View File

@@ -876,6 +876,7 @@
<Compile Include="Areas\PersonnelManagement\Controllers\DT_PartyMemberGroupController.cs" />
<Compile Include="Areas\PersonnelManagement\Controllers\DT_EvaluatingIndicatorController.cs" />
<Compile Include="Areas\PersonnelManagement\Controllers\DT_EvaluationDataController.cs" />
<Compile Include="Areas\PersonnelManagement\Controllers\DT_EvaluationDataMainController.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -6754,6 +6755,10 @@
<Content Include="Areas\PersonnelManagement\Views\DT_EvaluationData\Index.js" />
<Content Include="Areas\PersonnelManagement\Views\DT_EvaluationData\Form.cshtml" />
<Content Include="Areas\PersonnelManagement\Views\DT_EvaluationData\Form.js" />
<Content Include="Areas\PersonnelManagement\Views\DT_EvaluationDataMain\Index.cshtml" />
<Content Include="Areas\PersonnelManagement\Views\DT_EvaluationDataMain\Index.js" />
<Content Include="Areas\PersonnelManagement\Views\DT_EvaluationDataMain\Form.cshtml" />
<Content Include="Areas\PersonnelManagement\Views\DT_EvaluationDataMain\Form.js" />
</ItemGroup>
<ItemGroup>
<Folder Include="Areas\LR_Desktop\Models\" />


+ 9
- 8
Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/EvaluatingIndicatorApi.cs View File

@@ -49,18 +49,18 @@ namespace Learun.Application.WebApi.Modules
/// <returns></returns>
public Response AddEvaluationData(dynamic _)
{
AddEvaluationEntity parameter = this.GetReqData<AddEvaluationEntity>();
if (parameter == null)
{
return Fail("参数不可空！");
}
//AddEvaluationEntity parameter = this.GetReqData<AddEvaluationEntity>();
//if (parameter == null)
//{
// return Fail("参数不可空！");
//}

//年度
string scoreYear = parameter.ScoreYear;//"2021";//
string scoreYear = "2021";//parameter.ScoreYear;//
//季度
string scoreQuarter = parameter.ScoreQuarter;//"4";//
string scoreQuarter = "4";// parameter.ScoreQuarter;//
//小组Id
string partyMemberGroupId = parameter.PartyMemberGroupId;//"f4f8df5e-021b-4739-b006-6c25f04c2723";//
string partyMemberGroupId = "f4f8df5e-021b-4739-b006-6c25f04c2723";//parameter.PartyMemberGroupId;//

if (string.IsNullOrEmpty(scoreYear))
{
@@ -103,6 +103,7 @@ namespace Learun.Application.WebApi.Modules
var list = dT_EvaluationDataIBLL.GetListByWhere(where);
return Success(list);
}

/// <summary>
/// 保存实体数据（新增、修改）
/// <param name="_"></param>


+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj View File

@@ -625,6 +625,7 @@
<Compile Include="PersonnelManagement\DT_PartyMemberGroupMap.cs" />
<Compile Include="PersonnelManagement\DT_EvaluatingIndicatorMap.cs" />
<Compile Include="PersonnelManagement\DT_EvaluationDataMap.cs" />
<Compile Include="PersonnelManagement\DT_EvaluationDataMainMap.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">


+ 29
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/DT_EvaluationDataMainMap.cs View File

@@ -0,0 +1,29 @@
using Learun.Application.TwoDevelopment.PersonnelManagement;
using System.Data.Entity.ModelConfiguration;

namespace Learun.Application.Mapping
{
/// <summary>
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
/// 创 建：超级管理员
/// 日 期：2021-12-09 16:16
/// 描 述：党员评价考核主表
/// </summary>
public class DT_EvaluationDataMainMap : EntityTypeConfiguration<DT_EvaluationDataMainEntity>
{
public DT_EvaluationDataMainMap()
{
#region 表、主键
//表
this.ToTable("DT_EVALUATIONDATAMAIN");
//主键
this.HasKey(t => t.Id);
#endregion

#region 配置关系
#endregion
}
}
}


+ 55
- 45
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1639036861" Name="Physical Data Model 1" Objects="3909" Symbols="436" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1639038717" Name="Physical Data Model 1" Objects="3910" Symbols="436" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<!-- do not edit this file -->

<Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -55605,11 +55605,11 @@ B9AF
</o:Column>
<o:Column Id="o3755">
<a:ObjectID>14D0548F-44A3-49F8-8E89-318CB337A8A9</a:ObjectID>
<a:Name>PartyMemberGroupId</a:Name>
<a:Code>PartyMemberGroupId</a:Code>
<a:Name>PartyMemberGroupId-------------</a:Name>
<a:Code>PartyMemberGroupId-------------</a:Code>
<a:CreationDate>1638943834</a:CreationDate>
<a:Creator>edy</a:Creator>
<a:ModificationDate>1638943859</a:ModificationDate>
<a:ModificationDate>1639038717</a:ModificationDate>
<a:Modifier>edy</a:Modifier>
<a:Comment>党员小组Id</a:Comment>
<a:DataType>nvarchar(50)</a:DataType>
@@ -55617,11 +55617,11 @@ B9AF
</o:Column>
<o:Column Id="o3756">
<a:ObjectID>1FC97445-9D19-4577-8E16-5F2DD09DD2FE</a:ObjectID>
<a:Name>BeAssessed</a:Name>
<a:Code>BeAssessed</a:Code>
<a:Name>BeAssessed------------</a:Name>
<a:Code>BeAssessed------------</a:Code>
<a:CreationDate>1586611865</a:CreationDate>
<a:Creator>edy</a:Creator>
<a:ModificationDate>1638934194</a:ModificationDate>
<a:ModificationDate>1639038717</a:ModificationDate>
<a:Modifier>edy</a:Modifier>
<a:Comment>被考核党员</a:Comment>
<a:DataType>nvarchar(100)</a:DataType>
@@ -55633,11 +55633,11 @@ B9AF
<a:Code>Assessed</a:Code>
<a:CreationDate>1586611865</a:CreationDate>
<a:Creator>edy</a:Creator>
<a:ModificationDate>1638934194</a:ModificationDate>
<a:ModificationDate>1639037096</a:ModificationDate>
<a:Modifier>edy</a:Modifier>
<a:Comment>打分人（自己或党组长）</a:Comment>
<a:DataType>nvarchar(100)</a:DataType>
<a:Length>100</a:Length>
<a:DataType>nvarchar(500)</a:DataType>
<a:Length>500</a:Length>
</o:Column>
<o:Column Id="o3758">
<a:ObjectID>6B52B587-4698-453B-96D2-4BD7940BB028</a:ObjectID>
@@ -55663,22 +55663,22 @@ B9AF
</o:Column>
<o:Column Id="o3760">
<a:ObjectID>A6AD45A2-DBBA-4C40-B40B-A7E2E1DDD269</a:ObjectID>
<a:Name>ScoreYear</a:Name>
<a:Code>ScoreYear</a:Code>
<a:Name>ScoreYear----------------</a:Name>
<a:Code>ScoreYear----------------</a:Code>
<a:CreationDate>1586611838</a:CreationDate>
<a:Creator>edy</a:Creator>
<a:ModificationDate>1638934194</a:ModificationDate>
<a:ModificationDate>1639038717</a:ModificationDate>
<a:Modifier>edy</a:Modifier>
<a:Comment>打分年度</a:Comment>
<a:DataType>int</a:DataType>
</o:Column>
<o:Column Id="o3761">
<a:ObjectID>EB4FF1DC-26F3-4998-829A-7E9A6162E299</a:ObjectID>
<a:Name>ScoreQuarter</a:Name>
<a:Code>ScoreQuarter</a:Code>
<a:Name>ScoreQuarter--------------</a:Name>
<a:Code>ScoreQuarter--------------</a:Code>
<a:CreationDate>1586611838</a:CreationDate>
<a:Creator>edy</a:Creator>
<a:ModificationDate>1638934194</a:ModificationDate>
<a:ModificationDate>1639038717</a:ModificationDate>
<a:Modifier>edy</a:Modifier>
<a:Comment>打分季度</a:Comment>
<a:DataType>int</a:DataType>
@@ -55757,7 +55757,7 @@ B9AF
<a:Code>DT_EvaluationDataMain</a:Code>
<a:CreationDate>1586611688</a:CreationDate>
<a:Creator>edy</a:Creator>
<a:ModificationDate>1639036689</a:ModificationDate>
<a:ModificationDate>1639037696</a:ModificationDate>
<a:Modifier>edy</a:Modifier>
<a:Comment>评价主表</a:Comment>
<a:TotalSavingCurrency/>
@@ -55800,18 +55800,6 @@ B9AF
<a:Length>100</a:Length>
</o:Column>
<o:Column Id="o3770">
<a:ObjectID>8BEB1879-2054-474A-A77F-96BF0091A7A1</a:ObjectID>
<a:Name>Assessed</a:Name>
<a:Code>Assessed</a:Code>
<a:CreationDate>1586611865</a:CreationDate>
<a:Creator>edy</a:Creator>
<a:ModificationDate>1639036689</a:ModificationDate>
<a:Modifier>edy</a:Modifier>
<a:Comment>打分人（自己或党组长）</a:Comment>
<a:DataType>nvarchar(100)</a:DataType>
<a:Length>100</a:Length>
</o:Column>
<o:Column Id="o3771">
<a:ObjectID>A0A825FD-99D3-4320-A397-F36FFA054AFC</a:ObjectID>
<a:Name>ScoreZP</a:Name>
<a:Code>ScoreZP</a:Code>
@@ -55824,7 +55812,7 @@ B9AF
<a:Length>18</a:Length>
<a:Precision>1</a:Precision>
</o:Column>
<o:Column Id="o3772">
<o:Column Id="o3771">
<a:ObjectID>9AA1A880-5082-42FE-8A1B-D513BB426E93</a:ObjectID>
<a:Name>ScoreXZ</a:Name>
<a:Code>ScoreXZ</a:Code>
@@ -55837,7 +55825,7 @@ B9AF
<a:Length>18</a:Length>
<a:Precision>1</a:Precision>
</o:Column>
<o:Column Id="o3773">
<o:Column Id="o3772">
<a:ObjectID>1DCE7522-C8E9-446E-A14F-DE642C0F9B7A</a:ObjectID>
<a:Name>Remark</a:Name>
<a:Code>Remark</a:Code>
@@ -55849,7 +55837,29 @@ B9AF
<a:DataType>nvarchar(50)</a:DataType>
<a:Length>50</a:Length>
</o:Column>
<o:Column Id="o3773">
<a:ObjectID>290E7C63-4445-4CDC-917D-47B432931104</a:ObjectID>
<a:Name>ScoreYear</a:Name>
<a:Code>ScoreYear</a:Code>
<a:CreationDate>1586611838</a:CreationDate>
<a:Creator>edy</a:Creator>
<a:ModificationDate>1639037696</a:ModificationDate>
<a:Modifier>edy</a:Modifier>
<a:Comment>打分年度</a:Comment>
<a:DataType>int</a:DataType>
</o:Column>
<o:Column Id="o3774">
<a:ObjectID>AFD02C65-E08A-4165-B0A7-4392F789E837</a:ObjectID>
<a:Name>ScoreQuarter</a:Name>
<a:Code>ScoreQuarter</a:Code>
<a:CreationDate>1586611838</a:CreationDate>
<a:Creator>edy</a:Creator>
<a:ModificationDate>1639037696</a:ModificationDate>
<a:Modifier>edy</a:Modifier>
<a:Comment>打分季度</a:Comment>
<a:DataType>int</a:DataType>
</o:Column>
<o:Column Id="o3775">
<a:ObjectID>98234711-3A4E-4A1F-852A-B90BB54CFFDA</a:ObjectID>
<a:Name>CreateTime</a:Name>
<a:Code>CreateTime</a:Code>
@@ -55860,7 +55870,7 @@ B9AF
<a:Comment>创建时间</a:Comment>
<a:DataType>DateTime</a:DataType>
</o:Column>
<o:Column Id="o3775">
<o:Column Id="o3776">
<a:ObjectID>8A7B0EE8-EB4D-4305-9048-0540DF725ECF</a:ObjectID>
<a:Name>CreateUserId</a:Name>
<a:Code>CreateUserId</a:Code>
@@ -55874,7 +55884,7 @@ B9AF
</o:Column>
</c:Columns>
<c:Keys>
<o:Key Id="o3776">
<o:Key Id="o3777">
<a:ObjectID>4A0077ED-0AAF-4336-A2E1-A06A02B8B1DC</a:ObjectID>
<a:Name>Key_1</a:Name>
<a:Code>Key_1</a:Code>
@@ -55888,10 +55898,10 @@ B9AF
</o:Key>
</c:Keys>
<c:PrimaryKey>
<o:Key Ref="o3776"/>
<o:Key Ref="o3777"/>
</c:PrimaryKey>
<c:ClusterObject>
<o:Key Ref="o3776"/>
<o:Key Ref="o3777"/>
</c:ClusterObject>
</o:Table>
</c:Tables>
@@ -55916,7 +55926,7 @@ B9AF
<o:Key Ref="o758"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o3777">
<o:ReferenceJoin Id="o3778">
<a:ObjectID>14D78C43-17A2-48F0-83B4-3DF757D5ABE8</a:ObjectID>
<a:CreationDate>1552635393</a:CreationDate>
<a:Creator>l</a:Creator>
@@ -55951,7 +55961,7 @@ B9AF
<o:Key Ref="o854"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o3778">
<o:ReferenceJoin Id="o3779">
<a:ObjectID>FEAECB7B-8E2A-4492-A530-B0062E1511B8</a:ObjectID>
<a:CreationDate>1552635777</a:CreationDate>
<a:Creator>l</a:Creator>
@@ -55986,7 +55996,7 @@ B9AF
<o:Key Ref="o882"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o3779">
<o:ReferenceJoin Id="o3780">
<a:ObjectID>81527A47-E565-49C2-AAA7-F0555E81CE72</a:ObjectID>
<a:CreationDate>1553245426</a:CreationDate>
<a:Creator>l</a:Creator>
@@ -56021,7 +56031,7 @@ B9AF
<o:Key Ref="o893"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o3780">
<o:ReferenceJoin Id="o3781">
<a:ObjectID>A3225D9D-069C-4A67-ABF0-43DC2FA55CF0</a:ObjectID>
<a:CreationDate>1553247802</a:CreationDate>
<a:Creator>l</a:Creator>
@@ -56055,7 +56065,7 @@ B9AF
<o:Key Ref="o790"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o3781">
<o:ReferenceJoin Id="o3782">
<a:ObjectID>B458081F-CEE1-4251-9E7A-5E9CC93519D5</a:ObjectID>
<a:CreationDate>1553248376</a:CreationDate>
<a:Creator>l</a:Creator>
@@ -56090,7 +56100,7 @@ B9AF
<o:Key Ref="o871"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o3782">
<o:ReferenceJoin Id="o3783">
<a:ObjectID>8397C4F6-A728-4D3F-B2F8-FAC56886462B</a:ObjectID>
<a:CreationDate>1553248622</a:CreationDate>
<a:Creator>l</a:Creator>
@@ -56124,7 +56134,7 @@ B9AF
<o:Key Ref="o931"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o3783">
<o:ReferenceJoin Id="o3784">
<a:ObjectID>2F8BC700-F31E-41CC-9DA8-9505EAC5DA85</a:ObjectID>
<a:CreationDate>1553483161</a:CreationDate>
<a:Creator>l</a:Creator>
@@ -56158,7 +56168,7 @@ B9AF
<o:Key Ref="o964"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o3784">
<o:ReferenceJoin Id="o3785">
<a:ObjectID>0E2D2049-564F-4247-9F5B-B0AA82F9BE96</a:ObjectID>
<a:CreationDate>1555404296</a:CreationDate>
<a:Creator>admin</a:Creator>
@@ -56175,7 +56185,7 @@ B9AF
</o:Reference>
</c:References>
<c:DefaultGroups>
<o:Group Id="o3785">
<o:Group Id="o3786">
<a:ObjectID>46EC3E2A-6CBF-421A-9DA8-6BCCEDEC7DF5</a:ObjectID>
<a:Name>PUBLIC</a:Name>
<a:Code>PUBLIC</a:Code>
@@ -56438,7 +56448,7 @@ B9AF
</o:ExtendedDependency>
</c:ChildTraceabilityLinks>
<c:TargetModels>
<o:TargetModel Id="o3786">
<o:TargetModel Id="o3787">
<a:ObjectID>B1BAD530-6C69-4A9D-BD41-F62F564CA348</a:ObjectID>
<a:Name>Microsoft SQL Server 2008</a:Name>
<a:Code>MSSQLSRV2008</a:Code>


+ 4
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj View File

@@ -1919,6 +1919,10 @@
<Compile Include="PersonnelManagement\DT_EvaluationData\DT_EvaluationDataService.cs" />
<Compile Include="PersonnelManagement\DT_EvaluationData\DT_EvaluationDataBLL.cs" />
<Compile Include="PersonnelManagement\DT_EvaluationData\DT_EvaluationDataIBLL.cs" />
<Compile Include="PersonnelManagement\DT_EvaluationDataMain\DT_EvaluationDataMainEntity.cs" />
<Compile Include="PersonnelManagement\DT_EvaluationDataMain\DT_EvaluationDataMainService.cs" />
<Compile Include="PersonnelManagement\DT_EvaluationDataMain\DT_EvaluationDataMainBLL.cs" />
<Compile Include="PersonnelManagement\DT_EvaluationDataMain\DT_EvaluationDataMainIBLL.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">


+ 46
- 21
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataEntity.cs View File

@@ -20,15 +20,20 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
[Column("ID")]
public string Id { get; set; }
/// <summary>
/// MainId
/// </summary>
[Column("MAINID")]
public string MainId { get; set; }
/// <summary>
/// 考核指标项
/// </summary>
[Column("EVALUATINGINDICATORID")]
public string EvaluatingIndicatorId { get; set; }
/// <summary>
/// 被考核党员
/// </summary>
[Column("BEASSESSED")]
public string BeAssessed { get; set; }
///// <summary>
///// 被考核党员
///// </summary>
//[Column("BEASSESSED")]
//public string BeAssessed { get; set; }
/// <summary>
/// 打分人（自己或党组长）
/// </summary>
@@ -44,21 +49,21 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
/// </summary>
[Column("SCORETYPE")]
public int? ScoreType { get; set; }
/// <summary>
/// 打分年度
/// </summary>
[Column("SCOREYEAR")]
public int? ScoreYear { get; set; }
/// <summary>
/// 打分季度
/// </summary>
[Column("SCOREQUARTER")]
public int? ScoreQuarter { get; set; }
/// <summary>
/// 党员小组Id
/// </summary>
[Column("PARTYMEMBERGROUPID")]
public string PartyMemberGroupId { get; set; }
///// <summary>
///// 打分年度
///// </summary>
//[Column("SCOREYEAR")]
//public int? ScoreYear { get; set; }
///// <summary>
///// 打分季度
///// </summary>
//[Column("SCOREQUARTER")]
//public int? ScoreQuarter { get; set; }
///// <summary>
///// 党员小组Id
///// </summary>
//[Column("PARTYMEMBERGROUPID")]
//public string PartyMemberGroupId { get; set; }
/// <summary>
/// 备注
/// </summary>
@@ -90,7 +95,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
{
this.Id = Guid.NewGuid().ToString();
this.CreateTime=DateTime.Now;
this.CreateUserId = LoginUserInfo.Get().userId;
//this.CreateUserId = LoginUserInfo.Get().userId;
}
/// <summary>
/// 编辑调用
@@ -103,6 +108,26 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
#endregion
#region 扩展字段
/// <summary>
/// 党小组Id
/// </summary>
[NotMapped]
public string PartyMemberGroupId { get; set; }
/// <summary>
/// 被考核党员
/// </summary>
[NotMapped]
public string BeAssessed { get; set; }
/// <summary>
/// 打分年度
/// </summary>
[NotMapped]
public string ScoreYear { get; set; }
/// <summary>
/// 打分季度
/// </summary>
[NotMapped]
public string ScoreQuarter { get; set; }
/// <summary>
/// 指标项内容
/// </summary>
[NotMapped]


+ 29
- 13
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataService.cs View File

@@ -52,10 +52,15 @@ e.Assessment as Assessment,e.ConductRequirements as ConductRequirements
dp.Add("BeAssessed", queryParam["BeAssessed"].ToString(), DbType.String);
strSql.Append(" AND t.BeAssessed = @BeAssessed ");
}
if (!queryParam["MainId"].IsEmpty())
{
dp.Add("MainId", queryParam["MainId"].ToString(), DbType.String);
strSql.Append(" AND t.MainId = @MainId ");
}
if (!queryParam["ScoreType"].IsEmpty())
{
dp.Add("ScoreType", "%" + queryParam["ScoreType"].ToString() + "%", DbType.String);
strSql.Append(" AND t.ScoreType Like @ScoreType ");
dp.Add("ScoreType", queryParam["ScoreType"].ToString(), DbType.String);
strSql.Append(" AND t.ScoreType=@ScoreType ");
}
return this.BaseRepository("CollegeMIS").FindList<DT_EvaluationDataEntity>(strSql.ToString(), dp, pagination);
}
@@ -81,9 +86,11 @@ e.Assessment as Assessment,e.ConductRequirements as ConductRequirements
{
try
{
string sql = "select t.*,e.Assessment,e.ConductRequirements,e.CRRemark,e.MaxScore,e.ScoringCriteria FROM DT_EvaluationData t join DT_EvaluatingIndicator e on t.EvaluatingIndicatorId=e.Id where 1=1 ";

sql += $" and t.ScoreType='{where.ScoreType}' and t.BeAssessed='{where.beAssessed}' and t.ScoreYear='{where.scoreYear}' and t.ScoreQuarter='{where.scoreQuarter}'";
string sql = @"select t.*,m.PartyMemberGroupId,m.BeAssessed,m.ScoreYear,m.ScoreQuarter,e.Assessment,e.ConductRequirements,e.CRRemark,e.MaxScore,e.ScoringCriteria
FROM DT_EvaluationData t join DT_EvaluatingIndicator e on t.EvaluatingIndicatorId=e.Id
join DT_EvaluationDataMain m on t.MainId=m.Id
where 1=1 ";
sql += $" and t.ScoreType='{where.ScoreType}' and m.BeAssessed='{where.beAssessed}' and m.ScoreYear='{where.scoreYear}' and m.ScoreQuarter='{where.scoreQuarter}'";

return this.BaseRepository("CollegeMIS").FindList<DT_EvaluationDataEntity>(sql).OrderBy(x => x.EOrder);
}
@@ -247,19 +254,27 @@ e.Assessment as Assessment,e.ConductRequirements as ConductRequirements

foreach (var item in partyMemberList)
{
DT_EvaluationDataMainEntity mainEntity=new DT_EvaluationDataMainEntity();
mainEntity.Create();
mainEntity.BeAssessed = item;
mainEntity.ScoreYear = Convert.ToInt32(scoreYear);
mainEntity.ScoreQuarter = Convert.ToInt32(scoreQuarter);
mainEntity.PartyMemberGroupId = partyMemberGroupId;
db.Insert(mainEntity);
//考核指标
foreach (var EvaluatingIndicator in DT_EvaluatingIndicator)
{
DT_EvaluationDataEntity entity = new DT_EvaluationDataEntity();
entity.Create();
entity.MainId = mainEntity.Id;
entity.EvaluatingIndicatorId = EvaluatingIndicator.Id;
entity.EOrder = EvaluatingIndicator.EOrder;
entity.BeAssessed = item;
//entity.BeAssessed = item;
entity.Assessed = item;//自评
entity.ScoreType = 1;
entity.ScoreYear = Convert.ToInt32(scoreYear);
entity.ScoreQuarter = Convert.ToInt32(scoreQuarter);
entity.PartyMemberGroupId = partyMemberGroupId;
//entity.ScoreYear = Convert.ToInt32(scoreYear);
//entity.ScoreQuarter = Convert.ToInt32(scoreQuarter);
//entity.PartyMemberGroupId = partyMemberGroupId;
db.Insert(entity);

//组长评
@@ -269,14 +284,15 @@ e.Assessment as Assessment,e.ConductRequirements as ConductRequirements
{
DT_EvaluationDataEntity entity1 = new DT_EvaluationDataEntity();
entity1.Create();
entity1.MainId = mainEntity.Id;
entity1.ScoreType = 2;
entity1.Assessed = groupLeader;
entity1.EvaluatingIndicatorId = EvaluatingIndicator.Id;
entity1.EOrder = EvaluatingIndicator.EOrder;
entity1.BeAssessed = item;
entity1.ScoreYear = Convert.ToInt32(scoreYear);
entity1.ScoreQuarter = Convert.ToInt32(scoreQuarter);
entity1.PartyMemberGroupId = partyMemberGroupId;
//entity1.BeAssessed = item;
//entity1.ScoreYear = Convert.ToInt32(scoreYear);
//entity1.ScoreQuarter = Convert.ToInt32(scoreQuarter);
//entity1.PartyMemberGroupId = partyMemberGroupId;

db.Insert(entity1);
}


+ 125
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationDataMain/DT_EvaluationDataMainBLL.cs View File

@@ -0,0 +1,125 @@
using Learun.Util;
using System;
using System.Data;
using System.Collections.Generic;

namespace Learun.Application.TwoDevelopment.PersonnelManagement
{
/// <summary>
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
/// 创 建：超级管理员
/// 日 期：2021-12-09 16:16
/// 描 述：党员评价考核主表
/// </summary>
public class DT_EvaluationDataMainBLL : DT_EvaluationDataMainIBLL
{
private DT_EvaluationDataMainService dT_EvaluationDataMainService = new DT_EvaluationDataMainService();

#region 获取数据

/// <summary>
/// 获取页面显示列表数据
/// </summary>
/// <param name="pagination">分页参数</param>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
public IEnumerable<DT_EvaluationDataMainEntity> GetPageList(Pagination pagination, string queryJson)
{
try
{
return dT_EvaluationDataMainService.GetPageList(pagination, queryJson);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}

/// <summary>
/// 获取DT_EvaluationDataMain表实体数据
/// </summary>
/// <param name="keyValue">主键</param>
/// <returns></returns>
public DT_EvaluationDataMainEntity GetDT_EvaluationDataMainEntity(string keyValue)
{
try
{
return dT_EvaluationDataMainService.GetDT_EvaluationDataMainEntity(keyValue);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}

#endregion

#region 提交数据

/// <summary>
/// 删除实体数据
/// </summary>
/// <param name="keyValue">主键</param>
public void DeleteEntity(string keyValue)
{
try
{
dT_EvaluationDataMainService.DeleteEntity(keyValue);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}

/// <summary>
/// 保存实体数据（新增、修改）
/// </summary>
/// <param name="keyValue">主键</param>
/// <param name="entity">实体</param>
/// <returns></returns>
public void SaveEntity(string keyValue, DT_EvaluationDataMainEntity entity)
{
try
{
dT_EvaluationDataMainService.SaveEntity(keyValue, entity);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}

#endregion

}
}

+ 92
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationDataMain/DT_EvaluationDataMainEntity.cs View File

@@ -0,0 +1,92 @@
using Learun.Util;
using System;
using System.ComponentModel.DataAnnotations.Schema;

namespace Learun.Application.TwoDevelopment.PersonnelManagement
{
/// <summary>
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
/// 创 建：超级管理员
/// 日 期：2021-12-09 16:16
/// 描 述：党员评价考核主表
/// </summary>
public class DT_EvaluationDataMainEntity
{
#region 实体成员
/// <summary>
/// Id
/// </summary>
[Column("ID")]
public string Id { get; set; }
/// <summary>
/// 党员小组Id
/// </summary>
[Column("PARTYMEMBERGROUPID")]
public string PartyMemberGroupId { get; set; }
/// <summary>
/// 被考核党员
/// </summary>
[Column("BEASSESSED")]
public string BeAssessed { get; set; }
/// <summary>
/// 党员自评分值
/// </summary>
[Column("SCOREZP")]
public decimal? ScoreZP { get; set; }
/// <summary>
/// 党小组评分
/// </summary>
[Column("SCOREXZ")]
public decimal? ScoreXZ { get; set; }
/// <summary>
/// 备注
/// </summary>
[Column("REMARK")]
public string Remark { get; set; }
/// <summary>
/// 打分年度
/// </summary>
[Column("SCOREYEAR")]
public int? ScoreYear { get; set; }
/// <summary>
/// 打分季度
/// </summary>
[Column("SCOREQUARTER")]
public int? ScoreQuarter { get; set; }
/// <summary>
/// 创建时间
/// </summary>
[Column("CREATETIME")]
public DateTime? CreateTime { get; set; }
/// <summary>
/// 创建人
/// </summary>
[Column("CREATEUSERID")]
public string CreateUserId { get; set; }
#endregion

#region 扩展操作
/// <summary>
/// 新增调用
/// </summary>
public void Create()
{
this.Id = Guid.NewGuid().ToString();
this.CreateTime=DateTime.Now;
//this.CreateUserId = LoginUserInfo.Get().userId;
}
/// <summary>
/// 编辑调用
/// </summary>
/// <param name="keyValue"></param>
public void Modify(string keyValue)
{
this.Id = keyValue;
}
#endregion
#region 扩展字段
#endregion
}
}


+ 48
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationDataMain/DT_EvaluationDataMainIBLL.cs View File

@@ -0,0 +1,48 @@
using Learun.Util;
using System.Data;
using System.Collections.Generic;

namespace Learun.Application.TwoDevelopment.PersonnelManagement
{
/// <summary>
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
/// 创 建：超级管理员
/// 日 期：2021-12-09 16:16
/// 描 述：党员评价考核主表
/// </summary>
public interface DT_EvaluationDataMainIBLL
{
#region 获取数据

/// <summary>
/// 获取页面显示列表数据
/// </summary>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
IEnumerable<DT_EvaluationDataMainEntity> GetPageList(Pagination pagination, string queryJson);
/// <summary>
/// 获取DT_EvaluationDataMain表实体数据
/// </summary>
/// <param name="keyValue">主键</param>
/// <returns></returns>
DT_EvaluationDataMainEntity GetDT_EvaluationDataMainEntity(string keyValue);
#endregion

#region 提交数据

/// <summary>
/// 删除实体数据
/// </summary>
/// <param name="keyValue">主键</param>
void DeleteEntity(string keyValue);
/// <summary>
/// 保存实体数据（新增、修改）
/// </summary>
/// <param name="keyValue">主键</param>
/// <param name="entity">实体</param>
void SaveEntity(string keyValue, DT_EvaluationDataMainEntity entity);
#endregion

}
}

+ 149
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationDataMain/DT_EvaluationDataMainService.cs View File

@@ -0,0 +1,149 @@
using Dapper;
using Learun.DataBase.Repository;
using Learun.Util;
using System;
using System.Collections.Generic;
using System.Data;
using System.Text;

namespace Learun.Application.TwoDevelopment.PersonnelManagement
{
/// <summary>
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
/// 创 建：超级管理员
/// 日 期：2021-12-09 16:16
/// 描 述：党员评价考核主表
/// </summary>
public class DT_EvaluationDataMainService : RepositoryFactory
{
#region 获取数据

/// <summary>
/// 获取页面显示列表数据
/// </summary>
/// <param name="pagination">查询参数</param>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
public IEnumerable<DT_EvaluationDataMainEntity> GetPageList(Pagination pagination, string queryJson)
{
try
{
var strSql = new StringBuilder();
strSql.Append("SELECT ");
strSql.Append(@"
t.*
");
strSql.Append(" FROM DT_EvaluationDataMain t ");
strSql.Append(" WHERE 1=1 ");
var queryParam = queryJson.ToJObject();
// 虚拟参数
var dp = new DynamicParameters(new { });
if (!queryParam["BeAssessed"].IsEmpty())
{
dp.Add("BeAssessed",queryParam["BeAssessed"].ToString(), DbType.String);
strSql.Append(" AND t.BeAssessed = @BeAssessed ");
}
return this.BaseRepository("CollegeMIS").FindList<DT_EvaluationDataMainEntity>(strSql.ToString(),dp, pagination);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}

/// <summary>
/// 获取DT_EvaluationDataMain表实体数据
/// </summary>
/// <param name="keyValue">主键</param>
/// <returns></returns>
public DT_EvaluationDataMainEntity GetDT_EvaluationDataMainEntity(string keyValue)
{
try
{
return this.BaseRepository("CollegeMIS").FindEntity<DT_EvaluationDataMainEntity>(keyValue);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}

#endregion

#region 提交数据

/// <summary>
/// 删除实体数据
/// </summary>
/// <param name="keyValue">主键</param>
public void DeleteEntity(string keyValue)
{
try
{
this.BaseRepository("CollegeMIS").Delete<DT_EvaluationDataMainEntity>(t=>t.Id == keyValue);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}

/// <summary>
/// 保存实体数据（新增、修改）
/// </summary>
/// <param name="keyValue">主键</param>
/// <param name="entity">实体</param>
public void SaveEntity(string keyValue, DT_EvaluationDataMainEntity entity)
{
try
{
if (!string.IsNullOrEmpty(keyValue))
{
entity.Modify(keyValue);
this.BaseRepository("CollegeMIS").Update(entity);
}
else
{
entity.Create();
this.BaseRepository("CollegeMIS").Insert(entity);
}
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}

#endregion

}
}

Write Preview
Loading…
Cancel
Save