bjquanjiang
/
DigitalScholl
1
0
Forkuj 0
Kod Zgłoszenia 0 Oczekujące zmiany 0 Wydania 0 Wiki Aktywność
Przeglądaj źródła

Pc端 党员评价考核--小组长评分查看页面

yanshi
zhangli 3 lat temu
rodzic
8d7bc1bb3f
commit
08a953e0be
12 zmienionych plików z 406 dodań i 41 usunięć
Widok podzielony
Opcje porównania
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania
  1. +10
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/DT_EvaluationDataController.cs
  2. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluatingIndicator/Form.cshtml
  3. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluatingIndicator/Index.js
  4. +54
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/IndexXZ.cshtml
  5. +149
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/IndexXZ.js
  6. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationDataMain/Index.js
  7. +2
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
  8. +41
    -19
      Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/EvaluatingIndicatorApi.cs
  9. +24
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataBLL.cs
  10. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataIBLL.cs
  11. +113
    -13
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataService.cs
  12. +7
    -4
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationDataMain/DT_EvaluationDataMainService.cs

+ 10
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/DT_EvaluationDataController.cs Wyświetl plik

@@ -37,6 +37,16 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
{
return View();
}
/// <summary>
/// 表单页
/// <summary>
/// <returns></returns>
[HttpGet]
public ActionResult IndexXZ()
{
return View();
}
#endregion

#region 获取数据


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluatingIndicator/Form.cshtml Wyświetl plik

@@ -17,7 +17,7 @@
</div>
<div class="col-xs-12 lr-form-item" data-table="DT_EvaluatingIndicator">
<div class="lr-form-item-title">分值</div>
<input id="Score" type="number" class="form-control" />
<input id="MaxScore" type="number" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item" data-table="DT_EvaluatingIndicator">
<div class="lr-form-item-title">评分标准</div>


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluatingIndicator/Index.js Wyświetl plik

@@ -70,7 +70,7 @@ var bootstrap = function ($, learun) {
},
// 初始化列表
initGird: function () {
$('#gridtable').lrAuthorizeJfGrid({
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/PersonnelManagement/DT_EvaluatingIndicator/GetPageList',
headData: [
{
@@ -87,7 +87,7 @@ var bootstrap = function ($, learun) {
},
{ label: "行为规范要求", name: "ConductRequirements", width: 150, align: "left" },
{ label: "描述", name: "CRRemark", width: 200, align: "left" },
{ label: "分值", name: "Score", width: 100, align: "left" },
{ label: "分值", name: "MaxScore", width: 100, align: "left" },
{ label: "评分标准", name: "ScoringCriteria", width: 200, align: "left" },
{
label: "多选项", name: "ScoringPersonnel", width: 100, align: "left",


+ 54
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/IndexXZ.cshtml Wyświetl plik

@@ -0,0 +1,54 @@
@{
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="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">
<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>
</div>
</div>
</div>
<div class="lr-layout-body" id="gridtable"></div>
</div>
</div>
</div>
@Html.AppendJsFile("/Areas/PersonnelManagement/Views/DT_EvaluationData/Index.js")

+ 149
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/IndexXZ.js Wyświetl plik

@@ -0,0 +1,149 @@
/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
* Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
* 创建人：超级管理员
* 日 期：2021-12-08 12:07
* 描 述：评价考核表
*/
var refreshGirdData;
var MainId = request('MainId');
var ScoreType = request('ScoreType');
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);
//$('#EvaluatingIndicatorId').lrDataSourceSelect({ code: 'PartyMember',value: 'id',text: 'name' });
$('#BeAssessed').lrDataSourceSelect({ code: 'PartyMember', value: 'id', text: 'name' });
//$('#ScoreType').lrDataItemSelect({ code: 'ScoringPersonnel' });

// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
});
// 新增
$('#lr_add').on('click', function () {
learun.layerForm({
id: 'form',
title: '新增',
url: top.$.rootUrl + '/PersonnelManagement/DT_EvaluationData/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_EvaluationData/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_EvaluationData/DeleteForm', { keyValue: keyValue}, function () {
refreshGirdData();
});
}
});
}
});
// 打印
$('#lr_print').on('click', function () {
$('#gridtable').jqprintTable();
});
},
// 初始化列表
initGird: function () {
$('#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: "Assessment", width: 150, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'EvaluationAssessment',
callback: function (_data) {
callback(_data.text);
}
});
}

},
{ 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: "Assessed", 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: "Score", width: 100, align: "left"},
{
label: "类型", name: "ScoreType", width: 100, align: "left",
formatter: function(value, row) {
if (value == '1') {
return '党员自评';
}
else if (value == '2') {
return '党小组长评';
}
}
},
],
mainId:'Id',
isPage: true,
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) });
}
};
refreshGirdData = function () {
$('#gridtable').jfGridSet('reload');
};
page.init();
}

+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationDataMain/Index.js Wyświetl plik

@@ -84,12 +84,12 @@ var bootstrap = function ($, learun) {
// 党小组长评分详情
$('#lr_xzzp').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('Id');
var BeAssessed = $('#gridtable').jfGridValue('BeAssessed');
//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',
url: top.$.rootUrl + '/PersonnelManagement/DT_EvaluationData/IndexXZ?MainId=' + keyValue + '&ScoreType=3',
width: 900,
height: 700,
callBack: function (id) {


+ 2
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj Wyświetl plik

@@ -1523,6 +1523,7 @@
<Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormRemove.js" />
<Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormTerminate.js" />
<Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormRenew.js" />
<Content Include="Areas\PersonnelManagement\Views\DT_EvaluationData\IndexXZ.js" />
<Content Include="Areas\PersonnelManagement\Views\FundExaminer\Form.js" />
<Content Include="Areas\PersonnelManagement\Views\FundExaminer\Index.js" />
<Content Include="Areas\PersonnelManagement\Views\MeetingManagement\FormView.js" />
@@ -7658,6 +7659,7 @@
<Content Include="Areas\CustomFunction\Views\BudgetApply\FormAdjust.cshtml" />
<Content Include="Areas\CustomFunction\Views\ContractStandingBook\IndexZJ.cshtml" />
<Content Include="Areas\CustomFunction\Views\ContractStandingBook\FormZJ.cshtml" />
<Content Include="Areas\PersonnelManagement\Views\DT_EvaluationData\IndexXZ.cshtml" />
<None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
<Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyJoin.cshtml" />
<Content Include="Areas\PersonnelManagement\Views\MeetingSignInRecord\IndexAttendance.cshtml" />


+ 41
- 19
Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/EvaluatingIndicatorApi.cs Wyświetl plik

@@ -9,7 +9,7 @@ using System.IO;
namespace Learun.Application.WebApi.Modules
{
/// <summary>
/// 党员评价审核管理
/// 党员评价考核Api
/// </summary>
public class EvaluatingIndicatorApi : BaseNoAuthentication//BaseApi
{
@@ -23,13 +23,18 @@ namespace Learun.Application.WebApi.Modules

//党员自评返回list
Get["/getevaluationlistforzp"] = GetEvaluationListForZP;
//评价考核 下发评价
Post["/savelist"] = SaveList;
//党员自评 提交/审核
Post["/submitevaluationforzp"] = SubmitEvaluationForZP;

//党小组评 获取党员评分的列表
Get["/getevaluationlistforxz"] = GetEvaluationListForXZ;
//党小组长评分 获取评分题目
Get["/getevaluationdataforxz"] = GetEvaluationDataForXZ;
//党小组长评分 提交/审核
Get["/submitevaluationforxz"] = SubmitEvaluationForXZ;

//党员自评/小组长评分 提交 保存
Post["/savelist"] = SaveList;
}
//党员小组
private DT_PartyMemberGroupIBLL partyMemberGroupIBLL = new DT_PartyMemberGroupBLL();
@@ -106,7 +111,7 @@ namespace Learun.Application.WebApi.Modules
}

/// <summary>
/// 党员自评 保存
/// 党员自评/小组长评分 提交 保存
/// <param name="_"></param>
/// <summary>
/// <returns></returns>
@@ -114,7 +119,11 @@ namespace Learun.Application.WebApi.Modules
{
ReqFormEntity parameter = this.GetReqData<ReqFormEntity>();
List<DT_EvaluationDataEntity> list = parameter.strEntity.ToObject<List<DT_EvaluationDataEntity>>();
dT_EvaluationDataIBLL.SaveList(list);
var res = dT_EvaluationDataIBLL.SaveList(list);
if (!string.IsNullOrEmpty(res))
{
return Fail(res);
}
return Success("保存成功！");
}
/// <summary>
@@ -124,7 +133,7 @@ namespace Learun.Application.WebApi.Modules
/// <returns></returns>
public Response SubmitEvaluationForZP(dynamic _)
{
ReqSubmitEvaluation parameter = this.GetReqData<ReqSubmitEvaluation>();
ReqSubmitEvaluationZP parameter = this.GetReqData<ReqSubmitEvaluationZP>();
dT_EvaluationDataIBLL.UpdateStatusForZP(parameter.Assessed, parameter.Status);
return Success("保存成功！");
}
@@ -154,19 +163,18 @@ namespace Learun.Application.WebApi.Modules
var list = dT_EvaluationDataIBLL.GetEvaluationDataForXZ(parameter.Assessed, parameter.Id);
return Success(list);
}
///// <summary>
///// 党小组长评分 提交题目
///// <param name="_"></param>
///// <summary>
///// <returns></returns>
//public Response SubmitEvaluationForZP(dynamic _)
//{
// ReqSubmitEvaluation parameter = this.GetReqData<ReqSubmitEvaluation>();
// dT_EvaluationDataIBLL.UpdateStatusForZP(parameter.Assessed, parameter.Status);
// return Success("保存成功！");
//}

/// <summary>
/// 党小组长评 提交/审核
/// <param name="_"></param>
/// <summary>
/// <returns></returns>
public Response SubmitEvaluationForXZ(dynamic _)
{
ReqSubmitEvaluationXZ parameter = this.GetReqData<ReqSubmitEvaluationXZ>();
dT_EvaluationDataIBLL.SubmitEvaluationForXZ(parameter.Id, parameter.Status);
return Success("保存成功！");
}

#region 私有类

@@ -189,9 +197,12 @@ namespace Learun.Application.WebApi.Modules
public string strEntity { get; set; }
}

private class ReqSubmitEvaluation
private class ReqSubmitEvaluationZP
{
public string Assessed { get; set; }
/// <summary>
/// 1 提交，2通过，3未通过
/// </summary>
public int Status { get; set; }
}
private class ReqGetEvaluationDataForXZ
@@ -199,6 +210,17 @@ namespace Learun.Application.WebApi.Modules
public string Assessed { get; set; }
public string Id { get; set; }
}
private class ReqSubmitEvaluationXZ
{
/// <summary>
/// Id
/// </summary>
public string Id { get; set; }
/// <summary>
/// 1 提交，2通过，3未通过
/// </summary>
public int Status { get; set; }
}

#endregion
}

+ 24
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataBLL.cs Wyświetl plik

@@ -158,6 +158,30 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
}
}

/// <summary>
///
/// </summary>
/// <param name="Id"></param>
/// <param name="Status"></param>
public void SubmitEvaluationForXZ(string Id, int Status)
{
try
{
dT_EvaluationDataService.SubmitEvaluationForXZ(Id, Status);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}

/// <summary>
/// 保存实体数据（新增、修改）
/// </summary>


+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataIBLL.cs Wyświetl plik

@@ -39,6 +39,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
/// <param name="keyValue">主键</param>
void DeleteEntity(string keyValue);
void UpdateStatusForZP(string Assessed, int Status);
void SubmitEvaluationForXZ(string Id, int Status);
/// <summary>
/// 保存实体数据（新增、修改）
/// </summary>


+ 113
- 13
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataService.cs Wyświetl plik

@@ -112,17 +112,17 @@ join DT_EvaluationDataMain m on t.MainId=m.Id
/// <summary>
/// 党小组长评分 获取评分题目
/// </summary>
/// <param name="Assessed"></param>
/// <param name="Id"></param>
/// <param name="Assessed">党员Id，当前用户</param>
/// <param name="Id">DT_EvaluationDataMain表Id</param>
/// <returns></returns>
public IEnumerable<DT_EvaluationDataEntity> GetEvaluationDataForXZ(string Assessed, string Id)
{
try
{
var data = this.BaseRepository("CollegeMIS").FindEntity<DT_EvaluationDataMainEntity>(x => x.Id == Id);
var data = this.BaseRepository("CollegeMIS").FindEntity<DT_EvaluationDataEntity>(x => x.Id == Id);
var sql = $@"select e.Assessment,e.ConductRequirements,t.* from DT_EvaluationData t
join DT_EvaluatingIndicator e on t.EvaluatingIndicatorId=e.Id
where t.MainId='{Id}' and t.ScoreType='2'
where t.MainId='{data.MainId}' and t.ScoreType='2'
and t.Assessed = '{Assessed}'
order by t.EOrder";
return this.BaseRepository("CollegeMIS").FindList<DT_EvaluationDataEntity>(sql);
@@ -195,12 +195,13 @@ where t.MainId='{Id}' and t.ScoreType='2'
/// 党员自评 提交
/// </summary>
/// <param name="Assessed"></param>
/// <param name="Status"></param>
/// <param name="Status">1 提交，2通过，3未通过</param>
public void UpdateStatusForZP(string Assessed, int Status)
{
var db = this.BaseRepository("CollegeMIS");
try
{
db.BeginTrans();
if (Status == 1)
{
//提交 修改主表自评分值
@@ -226,9 +227,9 @@ where t.MainId='{Id}' and t.ScoreType='2'
}
catch (Exception ex)
{
db.Rollback();
if (ex is ExceptionEx)
{
db.Rollback();
throw;
}
else
@@ -238,6 +239,53 @@ where t.MainId='{Id}' and t.ScoreType='2'
}
}

/// <summary>
/// 党小组长评分
/// </summary>
/// <param name="Id"></param>
/// <param name="Status"></param>
public void SubmitEvaluationForXZ(string Id, int Status)
{
var db = this.BaseRepository("CollegeMIS");
try
{
var entity = db.FindEntity<DT_EvaluationDataEntity>(Id);
db.BeginTrans();
string sql =
$"update DT_EvaluationData set Status='{Status}' where ScoreType=3 and Id='{Id}'";
db.ExecuteBySql(sql);

if (Status == 2)
{
//审核通过，修改主表分数
if (db.FindList<DT_EvaluationDataEntity>(x =>
x.MainId == entity.MainId && x.ScoreType == 3 &&
x.PartyMemberGroupId == entity.PartyMemberGroupId && x.Id != Id && x.Status != 2).Count() ==
0)
{
db.ExecuteBySql($@" update DT_EvaluationDataMain t set t.ScoreXZ=(select Sum(Score) from DT_EvaluationData where ScoreType=3 and MainId='{entity.MainId}')/(select count(1) from DT_EvaluationData where ScoreType=3 and MainId='{entity.MainId}')
where t.Id='{Id}'");
}
}

db.Commit();
}
catch (Exception ex)
{
db.Rollback();
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}


/// <summary>
/// 保存实体数据（新增、修改）
/// </summary>
@@ -272,7 +320,7 @@ where t.MainId='{Id}' and t.ScoreType='2'
}

/// <summary>
/// 保存党员自评评分
/// 保存党员评分 自评/小组长评
/// </summary>
/// <param name="list"></param>
public string SaveList(List<DT_EvaluationDataEntity> list)
@@ -281,6 +329,7 @@ where t.MainId='{Id}' and t.ScoreType='2'
try
{
string str = "";
db.BeginTrans();
foreach (var model in list)
{
string sql_get = $@"select t.*,m.BeAssessed,m.ScoreYear,m.ScoreQuarter,e.Assessment,e.ConductRequirements,e.CRRemark,e.MaxScore,e.ScoringCriteria
@@ -305,14 +354,46 @@ join DT_EvaluationDataMain m on t.MainId=m.Id
}
}
}

if (list.Count > 0)
{
var entity = list.FirstOrDefault();
var Assessed = entity.Assessed;
var type = entity.ScoreType;
//党员自评
if (type == 1)
{
// 修改主表自评分值
string updSql = $@" update DT_EvaluationDataMain set ScoreZP={list.Select(x => x.Score).Sum()}
where BeAssessed = '{Assessed}'";
db.ExecuteBySql(updSql);
}
else if (type == 2)
{
//党小组长评
if (db.FindList<DT_EvaluationDataEntity>(x => x.ScoreType == 3 && x.Assessed == Assessed).Count() <=
0)
{
db.ExecuteBySql(
$@" insert into DT_EvaluationData(Id,MainId,PartyMemberGroupId,Assessed,Score,ScoreType,Status)
values(newid(),'{entity.MainId}','{entity.PartyMemberGroupId}','{Assessed}','{list.Sum(x => x.Score)}',3,0)");
}
else
{
db.ExecuteBySql($@" update DT_EvaluationData set Score={list.Sum(x => x.Score)}
where Assessed='{Assessed}' and ScoreType=3 and PartyMemberGroupId='{entity.PartyMemberGroupId}' and MainId='{entity.MainId}'");
}
}
}

db.Commit();
return str;
}
catch (Exception ex)
{
db.Rollback();
if (ex is ExceptionEx)
{
db.Rollback();
throw;
}
else
@@ -339,8 +420,9 @@ join DT_EvaluationDataMain m on t.MainId=m.Id
string sql = $"select (CAST(GroupLeader as varchar(500))+','+CAST(PartyMember as varchar(500))) as PartyMember,GroupLeader from DT_PartyMemberGroup where Id='{partyMemberGroupId}'";

var partyMemberGroupList = db.FindList<DT_PartyMemberGroupEntity>(sql);
//党小组
var partyMemberGroup = partyMemberGroupList.FirstOrDefault();
//评价指标
//评价指标list
var DT_EvaluatingIndicator = db.FindList<DT_EvaluatingIndicatorEntity>().OrderBy(x => x.EOrder)
.OrderBy(x => x.Assessment);

@@ -374,10 +456,10 @@ join DT_EvaluationDataMain m on t.MainId=m.Id
//考核指标
foreach (var EvaluatingIndicator in DT_EvaluatingIndicator)
{
//********************需要判断是否存在
//********************需要判断是否存在--自评
if (db.FindList<DT_EvaluationDataEntity>(x =>
x.MainId == mainEntity.Id &&
x.ScoreType == 1 && x.Assessed == item)
x.ScoreType == 1 && x.Assessed == item && x.PartyMemberGroupId == partyMemberGroupId)
.Count() <= 0)
{
DT_EvaluationDataEntity entity = new DT_EvaluationDataEntity();
@@ -398,7 +480,7 @@ join DT_EvaluationDataMain m on t.MainId=m.Id
{
if (db.FindList<DT_EvaluationDataEntity>(x =>
x.MainId == mainEntity.Id &&
x.ScoreType == 2 && x.Assessed == groupLeader && x.EvaluatingIndicatorId == EvaluatingIndicator.Id)
x.ScoreType == 2 && x.Assessed == groupLeader && x.EvaluatingIndicatorId == EvaluatingIndicator.Id && x.PartyMemberGroupId == partyMemberGroupId)
.Count() <= 0)
{
DT_EvaluationDataEntity entity1 = new DT_EvaluationDataEntity();
@@ -417,7 +499,25 @@ join DT_EvaluationDataMain m on t.MainId=m.Id

}


if (!groupLeaderList.Contains(item))
{
foreach (var groupLeader in groupLeaderList)
{
if (db.FindList<DT_EvaluationDataEntity>(x =>
x.MainId == mainEntity.Id &&
x.ScoreType == 3 && x.Assessed == groupLeader && x.PartyMemberGroupId == partyMemberGroupId)
.Count() <= 0)
{
DT_EvaluationDataEntity entity1 = new DT_EvaluationDataEntity();
entity1.Create();
entity1.MainId = mainEntity.Id;
entity1.ScoreType = 3;
entity1.Assessed = groupLeader;
entity1.PartyMemberGroupId = partyMemberGroupId;
db.Insert(entity1);
}
}
}
}
db.Commit();
}


+ 7
- 4
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationDataMain/DT_EvaluationDataMainService.cs Wyświetl plik

@@ -68,10 +68,13 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
{
try
{
string sql = $@" select distinct p.name as PartyMemberName,t.*,(case c.Status when -1 then '未打分' when 0 then '草稿' when 1 then '待审核' when 2 then '审核通过' when 3 then '未通过' end) as StatusName from DT_EvaluationDataMain t
join DT_EvaluationData c on t.Id = c.MainId
where charindex(t.BeAssessed, (select distinct PartyMember from DT_PartyMemberGroup where charindex('{Assessed}', GroupLeader)> 0))> 0
and c.ScoreType = 2 and Assessed = '{Assessed}'";
string sql = $@" select p.name as PartyMemberName,t.*,(case t.Status when -1 then '未打分' when 0 then '草稿' when 1 then '待审核' when 2 then '审核通过' when 3 then '未通过' end) as StatusName
from DT_EvaluationData t
join DT_EvaluationDataMain m on t.MainId=m.Id
left join PartyMember p on p.Id=m.BeAssessed
left join DT_EvaluationData c on t.Id = c.MainId
where t.ScoreType=3 and
t.Assessed = '{Assessed}'";
return this.BaseRepository("CollegeMIS").FindList<DT_EvaluationDataMainEntity>(sql);
}
catch (Exception ex)


Napisz Podgląd
Ładowanie…
Anuluj
Zapisz