zhangli 3 лет назад
Родитель
Сommit
c9d5c4d4e0
13 измененных файлов: 372 добавлений и 185 удалений
  1. +15
    -15
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationDataMain/Index.js
  2. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_PartyMemberGroup/Index.js
  3. +71
    -24
      Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/EvaluatingIndicatorApi.cs
  4. +45
    -80
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM
  5. +22
    -3
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataBLL.cs
  6. +21
    -16
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataEntity.cs
  7. +3
    -2
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataIBLL.cs
  8. +127
    -41
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataService.cs
  9. +24
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationDataMain/DT_EvaluationDataMainBLL.cs
  10. +6
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationDataMain/DT_EvaluationDataMainEntity.cs
  11. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationDataMain/DT_EvaluationDataMainIBLL.cs
  12. +28
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationDataMain/DT_EvaluationDataMainService.cs
  13. +7
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/PartyMember/PartyMemberService.cs

+ 15
- 15
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationDataMain/Index.js Просмотреть файл

@@ -90,8 +90,8 @@ var bootstrap = function ($, learun) {
id: 'form',
title: '党小组长评分详情',
url: top.$.rootUrl + '/PersonnelManagement/DT_EvaluationData/Index?MainId=' + keyValue + '&ScoreType=2',
width: 600,
height: 400,
width: 900,
height: 700,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
}
@@ -110,19 +110,19 @@ var bootstrap = function ($, learun) {
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: "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) {


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_PartyMemberGroup/Index.js Просмотреть файл

@@ -75,7 +75,7 @@ var bootstrap = function ($, learun) {
{ label: "名称", name: "Name", width: 100, align: "left" },
{ label: "编号", name: "EnCode", width: 100, align: "left" },
{
label: "组长", name: "GroupLeader", width: 100, align: "left",
label: "组长", name: "GroupLeader", width: 200, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
if (value.indexOf(',') != -1) {
var content = '';
@@ -106,7 +106,7 @@ var bootstrap = function ($, learun) {
}
},
{
label: "组员", name: "PartyMember", width: 100, align: "left",
label: "组员", name: "PartyMember", width: 200, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
if (value.indexOf(',') != -1) {
var content = '';


+ 71
- 24
Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/EvaluatingIndicatorApi.cs Просмотреть файл

@@ -25,11 +25,17 @@ namespace Learun.Application.WebApi.Modules
Get["/getevaluationlistforzp"] = GetEvaluationListForZP;
//评价考核 下发评价
Post["/savelist"] = SaveList;
//党员自评 提交/审核
Post["/submitevaluationforzp"] = SubmitEvaluationForZP;

//党小组评 获取党员评分的列表
Get["/getevaluationlistforxz"] = GetEvaluationListForXZ;
}
//党员小组
private DT_PartyMemberGroupIBLL partyMemberGroupIBLL = new DT_PartyMemberGroupBLL();
//评价考核表
private DT_EvaluationDataIBLL dT_EvaluationDataIBLL = new DT_EvaluationDataBLL();
private DT_EvaluationDataMainIBLL dT_EvaluationDataMainIBLL = new DT_EvaluationDataMainBLL();

/// <summary>
/// 获取党员小组列表
@@ -49,24 +55,24 @@ 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 = "2021";//parameter.ScoreYear;//
int scoreYear = parameter.ScoreYear;// 2021;//
//季度
string scoreQuarter = "4";// parameter.ScoreQuarter;//
int scoreQuarter = parameter.ScoreQuarter;//4;//
//小组Id
string partyMemberGroupId = "f4f8df5e-021b-4739-b006-6c25f04c2723";//parameter.PartyMemberGroupId;//
string partyMemberGroupId = parameter.PartyMemberGroupId;//"2e329d08-e9ae-4c54-8fdb-00d80498d05e";//

if (string.IsNullOrEmpty(scoreYear))
if (scoreYear == null || scoreYear <= 0)
{
return Fail("年度不可空!");
}
else if (string.IsNullOrEmpty(scoreQuarter))
else if (scoreQuarter == null || scoreQuarter <= 0)
{
return Fail("季度不可空!");
}
@@ -87,25 +93,18 @@ namespace Learun.Application.WebApi.Modules
/// <returns></returns>
public Response GetEvaluationListForZP(dynamic _)
{
dynamic parameter = this.GetReqData<dynamic>();
DT_EvaluationDataWhere parameter = this.GetReqData<DT_EvaluationDataWhere>();
if (parameter == null)
{
return Fail("参数不可空!");
}

DT_EvaluationDataWhere where = new DT_EvaluationDataWhere();
//被考核党员Id
where.beAssessed = parameter.BeAssessed;
//年份 季度
where.scoreYear = parameter.ScoreYear;
where.scoreQuarter = parameter.ScoreQuarter;
where.ScoreType = 1;
var list = dT_EvaluationDataIBLL.GetListByWhere(where);
parameter.ScoreType = 1;
var list = dT_EvaluationDataIBLL.GetListByWhere(parameter);
return Success(list);
}

/// <summary>
/// 保存实体数据(新增、修改)
/// 党员自评 保存
/// <param name="_"></param>
/// <summary>
/// <returns></returns>
@@ -116,16 +115,52 @@ namespace Learun.Application.WebApi.Modules
dT_EvaluationDataIBLL.SaveList(list);
return Success("保存成功!");
}
/// <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>
/// 党小组长评分 获取党员评分的列表
/// </summary>
/// <param name="_"></param>
/// <returns></returns>
public Response GetEvaluationListForXZ(dynamic _)
{
string Assessed = this.GetReqData();
var list = dT_EvaluationDataMainIBLL.GetEvaluationListForXZ(Assessed);
return Success(list);
}

/// <summary>
/// 党小组长评分 获取评分题目
/// </summary>
/// <param name="_"></param>
/// <returns></returns>
public Response GetEvaluationDataForXZ(dynamic _)
{
ReqGetEvaluationDataForXZ parameter = this.GetReqData<ReqGetEvaluationDataForXZ>();
//var list = dT_EvaluationDataIBLL.GetEvaluationDataForXZ(parameter.Assessed, parameter.Id);
//return Success(list);
return "";
}
#region 私有类

/// <summary>
/// 表单实体类
/// 下发评价
/// <summary>
private class AddEvaluationEntity
{
public string ScoreYear { get; set; }
public string ScoreQuarter { get; set; }
public int ScoreYear { get; set; }
public int ScoreQuarter { get; set; }
public string PartyMemberGroupId { get; set; }
}

@@ -137,6 +172,18 @@ namespace Learun.Application.WebApi.Modules
//public string keyValue { get; set; }
public string strEntity { get; set; }
}

private class ReqSubmitEvaluation
{
public string Assessed { get; set; }
public int Status { get; set; }
}
private class ReqGetEvaluationDataForXZ
{
public string Assessed { get; set; }
public int Id { get; set; }
}

#endregion
}
}

+ 45
- 80
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM Просмотреть файл

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?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"?>
<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1639130489" Name="Physical Data Model 1" Objects="3912" 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">
@@ -13156,9 +13156,9 @@ LABL 0 新宋体,8,N</a:FontList>
</o:TableSymbol>
<o:TableSymbol Id="o715">
<a:CreationDate>1639036439</a:CreationDate>
<a:ModificationDate>1639036442</a:ModificationDate>
<a:ModificationDate>1639128183</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-13420,205469), (1856,217291))</a:Rect>
<a:Rect>((-13420,205020), (1856,217290))</a:Rect>
<a:AutoAdjustToText>0</a:AutoAdjustToText>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
@@ -55561,7 +55561,7 @@ B9AF
<a:Code>DT_EvaluationData</a:Code>
<a:CreationDate>1586611688</a:CreationDate>
<a:Creator>edy</a:Creator>
<a:ModificationDate>1639036861</a:ModificationDate>
<a:ModificationDate>1639118553</a:ModificationDate>
<a:Modifier>edy</a:Modifier>
<a:Comment>评价考核表</a:Comment>
<a:TotalSavingCurrency/>
@@ -55605,29 +55605,17 @@ 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>1639038717</a:ModificationDate>
<a:ModificationDate>1639045487</a:ModificationDate>
<a:Modifier>edy</a:Modifier>
<a:Comment>党员小组Id</a:Comment>
<a:DataType>nvarchar(50)</a:DataType>
<a:Length>50</a:Length>
</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:CreationDate>1586611865</a:CreationDate>
<a:Creator>edy</a:Creator>
<a:ModificationDate>1639038717</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="o3757">
<a:ObjectID>D3E4B805-A3A5-405B-888A-42F71AC8D15E</a:ObjectID>
<a:Name>Assessed</a:Name>
<a:Code>Assessed</a:Code>
@@ -55639,7 +55627,7 @@ B9AF
<a:DataType>nvarchar(500)</a:DataType>
<a:Length>500</a:Length>
</o:Column>
<o:Column Id="o3758">
<o:Column Id="o3757">
<a:ObjectID>6B52B587-4698-453B-96D2-4BD7940BB028</a:ObjectID>
<a:Name>Score</a:Name>
<a:Code>Score</a:Code>
@@ -55650,7 +55638,7 @@ B9AF
<a:Comment>分值</a:Comment>
<a:DataType>int</a:DataType>
</o:Column>
<o:Column Id="o3759">
<o:Column Id="o3758">
<a:ObjectID>029C6080-F16F-4229-98F2-3E9BEB6EF7EB</a:ObjectID>
<a:Name>ScoreType</a:Name>
<a:Code>ScoreType</a:Code>
@@ -55661,29 +55649,18 @@ B9AF
<a:Comment>类型(1:党员自评,2:党小组长评)</a:Comment>
<a:DataType>int</a:DataType>
</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:CreationDate>1586611838</a:CreationDate>
<a:Creator>edy</a:Creator>
<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">
<o:Column Id="o3759">
<a:ObjectID>EB4FF1DC-26F3-4998-829A-7E9A6162E299</a:ObjectID>
<a:Name>ScoreQuarter--------------</a:Name>
<a:Code>ScoreQuarter--------------</a:Code>
<a:Name>Status</a:Name>
<a:Code>Status</a:Code>
<a:CreationDate>1586611838</a:CreationDate>
<a:Creator>edy</a:Creator>
<a:ModificationDate>1639038717</a:ModificationDate>
<a:ModificationDate>1639118553</a:ModificationDate>
<a:Modifier>edy</a:Modifier>
<a:Comment>打分季度</a:Comment>
<a:Comment>状态</a:Comment>
<a:DataType>int</a:DataType>
</o:Column>
<o:Column Id="o3762">
<o:Column Id="o3760">
<a:ObjectID>42919921-7BCD-4C19-815B-2ADD335D23E7</a:ObjectID>
<a:Name>Remark</a:Name>
<a:Code>Remark</a:Code>
@@ -55695,7 +55672,7 @@ B9AF
<a:DataType>nvarchar(50)</a:DataType>
<a:Length>50</a:Length>
</o:Column>
<o:Column Id="o3763">
<o:Column Id="o3761">
<a:ObjectID>558D0FAE-5D3E-49B2-9DA7-560B6127FFC7</a:ObjectID>
<a:Name>EOrder</a:Name>
<a:Code>EOrder</a:Code>
@@ -55706,7 +55683,7 @@ B9AF
<a:Comment>排序</a:Comment>
<a:DataType>int</a:DataType>
</o:Column>
<o:Column Id="o3764">
<o:Column Id="o3762">
<a:ObjectID>06C6B77A-1370-48B3-82CF-1EB43C330513</a:ObjectID>
<a:Name>CreateTime</a:Name>
<a:Code>CreateTime</a:Code>
@@ -55717,7 +55694,7 @@ B9AF
<a:Comment>创建时间</a:Comment>
<a:DataType>DateTime</a:DataType>
</o:Column>
<o:Column Id="o3765">
<o:Column Id="o3763">
<a:ObjectID>C7621A34-8243-45F9-9CE3-86B1344B21F0</a:ObjectID>
<a:Name>CreateUserId</a:Name>
<a:Code>CreateUserId</a:Code>
@@ -55731,7 +55708,7 @@ B9AF
</o:Column>
</c:Columns>
<c:Keys>
<o:Key Id="o3766">
<o:Key Id="o3764">
<a:ObjectID>6B3EBE9A-4B47-406F-B35A-1F5BDB9AD0C6</a:ObjectID>
<a:Name>Key_1</a:Name>
<a:Code>Key_1</a:Code>
@@ -55745,10 +55722,10 @@ B9AF
</o:Key>
</c:Keys>
<c:PrimaryKey>
<o:Key Ref="o3766"/>
<o:Key Ref="o3764"/>
</c:PrimaryKey>
<c:ClusterObject>
<o:Key Ref="o3766"/>
<o:Key Ref="o3764"/>
</c:ClusterObject>
</o:Table>
<o:Table Id="o716">
@@ -55757,12 +55734,12 @@ B9AF
<a:Code>DT_EvaluationDataMain</a:Code>
<a:CreationDate>1586611688</a:CreationDate>
<a:Creator>edy</a:Creator>
<a:ModificationDate>1639037696</a:ModificationDate>
<a:ModificationDate>1639130489</a:ModificationDate>
<a:Modifier>edy</a:Modifier>
<a:Comment>评价主表</a:Comment>
<a:TotalSavingCurrency/>
<c:Columns>
<o:Column Id="o3767">
<o:Column Id="o3765">
<a:ObjectID>173CBABF-C3E9-4247-A10E-56EBC1171305</a:ObjectID>
<a:Name>Id</a:Name>
<a:Code>Id</a:Code>
@@ -55775,19 +55752,7 @@ B9AF
<a:Length>50</a:Length>
<a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column>
<o:Column Id="o3768">
<a:ObjectID>5CA80D17-BA58-4479-8FE6-65B99611BAD4</a:ObjectID>
<a:Name>PartyMemberGroupId</a:Name>
<a:Code>PartyMemberGroupId</a:Code>
<a:CreationDate>1638943834</a:CreationDate>
<a:Creator>edy</a:Creator>
<a:ModificationDate>1639036689</a:ModificationDate>
<a:Modifier>edy</a:Modifier>
<a:Comment>党员小组Id</a:Comment>
<a:DataType>nvarchar(50)</a:DataType>
<a:Length>50</a:Length>
</o:Column>
<o:Column Id="o3769">
<o:Column Id="o3766">
<a:ObjectID>E66151E0-DDF8-46AD-86C3-ACEB5101E669</a:ObjectID>
<a:Name>BeAssessed</a:Name>
<a:Code>BeAssessed</a:Code>
@@ -55799,7 +55764,7 @@ B9AF
<a:DataType>nvarchar(100)</a:DataType>
<a:Length>100</a:Length>
</o:Column>
<o:Column Id="o3770">
<o:Column Id="o3767">
<a:ObjectID>A0A825FD-99D3-4320-A397-F36FFA054AFC</a:ObjectID>
<a:Name>ScoreZP</a:Name>
<a:Code>ScoreZP</a:Code>
@@ -55812,7 +55777,7 @@ B9AF
<a:Length>18</a:Length>
<a:Precision>1</a:Precision>
</o:Column>
<o:Column Id="o3771">
<o:Column Id="o3768">
<a:ObjectID>9AA1A880-5082-42FE-8A1B-D513BB426E93</a:ObjectID>
<a:Name>ScoreXZ</a:Name>
<a:Code>ScoreXZ</a:Code>
@@ -55825,7 +55790,7 @@ B9AF
<a:Length>18</a:Length>
<a:Precision>1</a:Precision>
</o:Column>
<o:Column Id="o3772">
<o:Column Id="o3769">
<a:ObjectID>1DCE7522-C8E9-446E-A14F-DE642C0F9B7A</a:ObjectID>
<a:Name>Remark</a:Name>
<a:Code>Remark</a:Code>
@@ -55837,7 +55802,7 @@ B9AF
<a:DataType>nvarchar(50)</a:DataType>
<a:Length>50</a:Length>
</o:Column>
<o:Column Id="o3773">
<o:Column Id="o3770">
<a:ObjectID>290E7C63-4445-4CDC-917D-47B432931104</a:ObjectID>
<a:Name>ScoreYear</a:Name>
<a:Code>ScoreYear</a:Code>
@@ -55848,7 +55813,7 @@ B9AF
<a:Comment>打分年度</a:Comment>
<a:DataType>int</a:DataType>
</o:Column>
<o:Column Id="o3774">
<o:Column Id="o3771">
<a:ObjectID>AFD02C65-E08A-4165-B0A7-4392F789E837</a:ObjectID>
<a:Name>ScoreQuarter</a:Name>
<a:Code>ScoreQuarter</a:Code>
@@ -55859,7 +55824,7 @@ B9AF
<a:Comment>打分季度</a:Comment>
<a:DataType>int</a:DataType>
</o:Column>
<o:Column Id="o3775">
<o:Column Id="o3772">
<a:ObjectID>98234711-3A4E-4A1F-852A-B90BB54CFFDA</a:ObjectID>
<a:Name>CreateTime</a:Name>
<a:Code>CreateTime</a:Code>
@@ -55870,7 +55835,7 @@ B9AF
<a:Comment>创建时间</a:Comment>
<a:DataType>DateTime</a:DataType>
</o:Column>
<o:Column Id="o3776">
<o:Column Id="o3773">
<a:ObjectID>8A7B0EE8-EB4D-4305-9048-0540DF725ECF</a:ObjectID>
<a:Name>CreateUserId</a:Name>
<a:Code>CreateUserId</a:Code>
@@ -55884,7 +55849,7 @@ B9AF
</o:Column>
</c:Columns>
<c:Keys>
<o:Key Id="o3777">
<o:Key Id="o3774">
<a:ObjectID>4A0077ED-0AAF-4336-A2E1-A06A02B8B1DC</a:ObjectID>
<a:Name>Key_1</a:Name>
<a:Code>Key_1</a:Code>
@@ -55893,15 +55858,15 @@ B9AF
<a:ModificationDate>1639036439</a:ModificationDate>
<a:Modifier>edy</a:Modifier>
<c:Key.Columns>
<o:Column Ref="o3767"/>
<o:Column Ref="o3765"/>
</c:Key.Columns>
</o:Key>
</c:Keys>
<c:PrimaryKey>
<o:Key Ref="o3777"/>
<o:Key Ref="o3774"/>
</c:PrimaryKey>
<c:ClusterObject>
<o:Key Ref="o3777"/>
<o:Key Ref="o3774"/>
</c:ClusterObject>
</o:Table>
</c:Tables>
@@ -55926,7 +55891,7 @@ B9AF
<o:Key Ref="o758"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o3778">
<o:ReferenceJoin Id="o3775">
<a:ObjectID>14D78C43-17A2-48F0-83B4-3DF757D5ABE8</a:ObjectID>
<a:CreationDate>1552635393</a:CreationDate>
<a:Creator>l</a:Creator>
@@ -55961,7 +55926,7 @@ B9AF
<o:Key Ref="o854"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o3779">
<o:ReferenceJoin Id="o3776">
<a:ObjectID>FEAECB7B-8E2A-4492-A530-B0062E1511B8</a:ObjectID>
<a:CreationDate>1552635777</a:CreationDate>
<a:Creator>l</a:Creator>
@@ -55996,7 +55961,7 @@ B9AF
<o:Key Ref="o882"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o3780">
<o:ReferenceJoin Id="o3777">
<a:ObjectID>81527A47-E565-49C2-AAA7-F0555E81CE72</a:ObjectID>
<a:CreationDate>1553245426</a:CreationDate>
<a:Creator>l</a:Creator>
@@ -56031,7 +55996,7 @@ B9AF
<o:Key Ref="o893"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o3781">
<o:ReferenceJoin Id="o3778">
<a:ObjectID>A3225D9D-069C-4A67-ABF0-43DC2FA55CF0</a:ObjectID>
<a:CreationDate>1553247802</a:CreationDate>
<a:Creator>l</a:Creator>
@@ -56065,7 +56030,7 @@ B9AF
<o:Key Ref="o790"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o3782">
<o:ReferenceJoin Id="o3779">
<a:ObjectID>B458081F-CEE1-4251-9E7A-5E9CC93519D5</a:ObjectID>
<a:CreationDate>1553248376</a:CreationDate>
<a:Creator>l</a:Creator>
@@ -56100,7 +56065,7 @@ B9AF
<o:Key Ref="o871"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o3783">
<o:ReferenceJoin Id="o3780">
<a:ObjectID>8397C4F6-A728-4D3F-B2F8-FAC56886462B</a:ObjectID>
<a:CreationDate>1553248622</a:CreationDate>
<a:Creator>l</a:Creator>
@@ -56134,7 +56099,7 @@ B9AF
<o:Key Ref="o931"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o3784">
<o:ReferenceJoin Id="o3781">
<a:ObjectID>2F8BC700-F31E-41CC-9DA8-9505EAC5DA85</a:ObjectID>
<a:CreationDate>1553483161</a:CreationDate>
<a:Creator>l</a:Creator>
@@ -56168,7 +56133,7 @@ B9AF
<o:Key Ref="o964"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o3785">
<o:ReferenceJoin Id="o3782">
<a:ObjectID>0E2D2049-564F-4247-9F5B-B0AA82F9BE96</a:ObjectID>
<a:CreationDate>1555404296</a:CreationDate>
<a:Creator>admin</a:Creator>
@@ -56185,7 +56150,7 @@ B9AF
</o:Reference>
</c:References>
<c:DefaultGroups>
<o:Group Id="o3786">
<o:Group Id="o3783">
<a:ObjectID>46EC3E2A-6CBF-421A-9DA8-6BCCEDEC7DF5</a:ObjectID>
<a:Name>PUBLIC</a:Name>
<a:Code>PUBLIC</a:Code>
@@ -56448,7 +56413,7 @@ B9AF
</o:ExtendedDependency>
</c:ChildTraceabilityLinks>
<c:TargetModels>
<o:TargetModel Id="o3787">
<o:TargetModel Id="o3784">
<a:ObjectID>B1BAD530-6C69-4A9D-BD41-F62F564CA348</a:ObjectID>
<a:Name>Microsoft SQL Server 2008</a:Name>
<a:Code>MSSQLSRV2008</a:Code>


+ 22
- 3
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataBLL.cs Просмотреть файл

@@ -119,6 +119,25 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
}
}

public void UpdateStatusForZP(string Assessed, int Status)
{
try
{
dT_EvaluationDataService.UpdateStatusForZP(Assessed, Status);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}

/// <summary>
/// 保存实体数据(新增、修改)
/// </summary>
@@ -144,11 +163,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
}
}

public void SaveList(List<DT_EvaluationDataEntity> list)
public string SaveList(List<DT_EvaluationDataEntity> list)
{
try
{
dT_EvaluationDataService.SaveList(list);
return dT_EvaluationDataService.SaveList(list);
}
catch (Exception ex)
{
@@ -170,7 +189,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
/// <param name="scoreQuarter">季度</param>
/// <param name="partyMemberGroupId">小组Id</param>
/// <returns></returns>
public void AddEvaluationData(string scoreYear, string scoreQuarter, string partyMemberGroupId)
public void AddEvaluationData(int scoreYear, int scoreQuarter, string partyMemberGroupId)
{
try
{


+ 21
- 16
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataEntity.cs Просмотреть файл

@@ -59,11 +59,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
///// </summary>
//[Column("SCOREQUARTER")]
//public int? ScoreQuarter { get; set; }
///// <summary>
///// 党员小组Id
///// </summary>
//[Column("PARTYMEMBERGROUPID")]
//public string PartyMemberGroupId { get; set; }
/// <summary>
/// 党员小组Id
/// </summary>
[Column("PARTYMEMBERGROUPID")]
public string PartyMemberGroupId { get; set; }
/// <summary>
/// 备注
/// </summary>
@@ -74,7 +74,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
/// </summary>
[Column("EORDER")]
public int? EOrder { get; set; }

/// <summary>
/// 状态 -1 未打分,0 草稿,1 已提交,2 审核通过,3 未通过
/// </summary>
[Column("STATUS")]
public int? Status { get; set; }
/// <summary>
/// 创建时间
/// </summary>
@@ -94,8 +99,9 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
public void Create()
{
this.Id = Guid.NewGuid().ToString();
this.Status = -1;
this.CreateTime=DateTime.Now;
//this.CreateUserId = LoginUserInfo.Get().userId;
this.CreateUserId = LoginUserInfo.Get().userId;
}
/// <summary>
/// 编辑调用
@@ -107,11 +113,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
}
#endregion
#region 扩展字段
/// <summary>
/// 党小组Id
/// </summary>
[NotMapped]
public string PartyMemberGroupId { get; set; }
/// <summary>
/// 被考核党员
/// </summary>
@@ -156,27 +158,30 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
#endregion
}


/// <summary>
/// 获取自评数据
/// </summary>
public class DT_EvaluationDataWhere
{
/// <summary>
/// 被考核党员
/// </summary>
public string beAssessed { get; set; }
public string BeAssessed { get; set; }

/// <summary>
/// 年度
/// </summary>
public int scoreYear { get; set; }
public int ScoreYear { get; set; }
/// <summary>
/// 季度
/// </summary>
public int scoreQuarter { get; set; }
public int ScoreQuarter { get; set; }
/// <summary>
/// 类型 1党员自评 2 党小组长
/// </summary>
public int ScoreType { get; set; }

}

}


+ 3
- 2
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataIBLL.cs Просмотреть файл

@@ -37,13 +37,14 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
/// </summary>
/// <param name="keyValue">主键</param>
void DeleteEntity(string keyValue);
void UpdateStatusForZP(string Assessed, int Status);
/// <summary>
/// 保存实体数据(新增、修改)
/// </summary>
/// <param name="keyValue">主键</param>
/// <param name="entity">实体</param>
void SaveEntity(string keyValue, DT_EvaluationDataEntity entity);
void SaveList(List<DT_EvaluationDataEntity> list);
string SaveList(List<DT_EvaluationDataEntity> list);

/// <summary>
/// 下发评价
@@ -52,7 +53,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
/// <param name="scoreQuarter">季度</param>
/// <param name="partyMemberGroupId">小组Id</param>
/// <returns></returns>
void AddEvaluationData(string scoreYear,string scoreQuarter,string partyMemberGroupId);
void AddEvaluationData(int scoreYear,int scoreQuarter,string partyMemberGroupId);

#endregion



+ 127
- 41
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataService.cs Просмотреть файл

@@ -86,11 +86,13 @@ e.Assessment as Assessment,e.ConductRequirements as ConductRequirements
{
try
{
string sql = @"select t.*,m.PartyMemberGroupId,m.BeAssessed,m.ScoreYear,m.ScoreQuarter,e.Assessment,e.ConductRequirements,e.CRRemark,e.MaxScore,e.ScoringCriteria
string sql = @"select t.*,
(case t.Status when -1 then '未打分' when 0 then '草稿' when 1 then '待审核' when 2 then '审核通过' when 3 then '未通过' end) as StatusName,
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}'";
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);
}
@@ -158,6 +160,53 @@ join DT_EvaluationDataMain m on t.MainId=m.Id
}
}

/// <summary>
/// 党员自评 提交
/// </summary>
/// <param name="Assessed"></param>
/// <param name="Status"></param>
public void UpdateStatusForZP(string Assessed, int Status)
{
var db = this.BaseRepository("CollegeMIS");
try
{
if (Status == 1)
{
//提交 修改主表自评分值
string updSql = $@" update DT_EvaluationDataMain set ScoreZP=(
select MAX(Score) from DT_EvaluationData where Assessed = '{Assessed}' and ScoreType = 1
)
where BeAssessed = '{Assessed}'";

db.ExecuteBySql(updSql);
}
else if(Status == 3)
{
//审核未通过 修改主表 自评分值为NULL
string updSql = $@" update DT_EvaluationDataMain set ScoreZP=NULL where BeAssessed = '{Assessed}'";
db.ExecuteBySql(updSql);
Status = 0;
}
string sql =
$"update DT_EvaluationData set Status='{Status}' where ScoreType=1 and Assessed='{Assessed}'";
db.ExecuteBySql(sql);

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

/// <summary>
/// 保存实体数据(新增、修改)
/// </summary>
@@ -191,23 +240,42 @@ join DT_EvaluationDataMain m on t.MainId=m.Id
}
}


public void SaveList(List<DT_EvaluationDataEntity> list)
/// <summary>
/// 保存党员自评评分
/// </summary>
/// <param name="list"></param>
public string SaveList(List<DT_EvaluationDataEntity> list)
{
var db = this.BaseRepository("CollegeMIS");
try
{
string str = "";
foreach (var model in list)
{
if (!string.IsNullOrEmpty(model.Id))
string sql_get = $@"select t.*,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 t.Id='{model.Id}'";
var entity = db.FindList<DT_EvaluationDataEntity>(sql_get).FirstOrDefault();
if (entity != null)
{
string sql = $"update DT_EvaluationData set Score='{model.Score}' where Id='{model.Id}'";

db.ExecuteBySql(sql);
if (model.Score > entity.MaxScore)
{
return entity.ConductRequirements + " 不得超过最高分:" + entity.MaxScore + "分";
}
else if (entity.Status > 0)
{
return "数据已提交,不可修改!";
}
else
{
string sql = $"update DT_EvaluationData set Score='{model.Score}',Status=0 where Id='{model.Id}'";
db.ExecuteBySql(sql);
}
}
}

db.Commit();
return str;
}
catch (Exception ex)
{
@@ -230,7 +298,7 @@ join DT_EvaluationDataMain m on t.MainId=m.Id
/// <param name="scoreQuarter">季度</param>
/// <param name="partyMemberGroupId">小组Id</param>
/// <returns></returns>
public void AddEvaluationData(string scoreYear, string scoreQuarter, string partyMemberGroupId)
public void AddEvaluationData(int scoreYear, int scoreQuarter, string partyMemberGroupId)
{
var db = this.BaseRepository("CollegeMIS");
try
@@ -254,47 +322,65 @@ join DT_EvaluationDataMain m on t.MainId=m.Id

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);
DT_EvaluationDataMainEntity mainEntity = new DT_EvaluationDataMainEntity();
//主表
if (db.FindList<DT_EvaluationDataMainEntity>(x =>
x.BeAssessed == item && x.ScoreYear == scoreYear && x.ScoreQuarter == scoreQuarter).Count() > 0)
{
mainEntity = db.FindList<DT_EvaluationDataMainEntity>(x =>
x.BeAssessed == item && x.ScoreYear == scoreYear && x.ScoreQuarter == scoreQuarter)
.FirstOrDefault();
}
else
{
mainEntity.Create();
mainEntity.BeAssessed = item;
mainEntity.ScoreYear = scoreYear;
mainEntity.ScoreQuarter = 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.Assessed = item;//自评
entity.ScoreType = 1;
//entity.ScoreYear = Convert.ToInt32(scoreYear);
//entity.ScoreQuarter = Convert.ToInt32(scoreQuarter);
//entity.PartyMemberGroupId = partyMemberGroupId;
db.Insert(entity);
//********************需要判断是否存在
if (db.FindList<DT_EvaluationDataEntity>(x =>
x.MainId == mainEntity.Id &&
x.ScoreType == 1 && x.Assessed == item)
.Count() <= 0)
{
DT_EvaluationDataEntity entity = new DT_EvaluationDataEntity();
entity.Create();
entity.MainId = mainEntity.Id;
entity.EvaluatingIndicatorId = EvaluatingIndicator.Id;
entity.EOrder = EvaluatingIndicator.EOrder;
entity.Assessed = item;//自评
entity.ScoreType = 1;
entity.PartyMemberGroupId = partyMemberGroupId;
db.Insert(entity);
}

//组长评
if (EvaluatingIndicator.ScoringPersonnel.Contains(",") && !groupLeaderList.Contains(item))
{
foreach (var groupLeader in groupLeaderList)
{
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;
if (db.FindList<DT_EvaluationDataEntity>(x =>
x.MainId == mainEntity.Id &&
x.ScoreType == 2 && x.Assessed == groupLeader && x.EvaluatingIndicatorId == EvaluatingIndicator.Id)
.Count() <= 0)
{
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.PartyMemberGroupId = partyMemberGroupId;

db.Insert(entity1);
db.Insert(entity1);
}
}
}



+ 24
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationDataMain/DT_EvaluationDataMainBLL.cs Просмотреть файл

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

/// <summary>
///
/// </summary>
/// <param name="Assessed"></param>
/// <returns></returns>
public IEnumerable<DT_EvaluationDataMainEntity> GetEvaluationListForXZ(string Assessed)
{
try
{
return dT_EvaluationDataMainService.GetEvaluationListForXZ(Assessed);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}

/// <summary>
/// 获取DT_EvaluationDataMain表实体数据
/// </summary>


+ 6
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationDataMain/DT_EvaluationDataMainEntity.cs Просмотреть файл

@@ -74,7 +74,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>
/// 编辑调用
@@ -86,6 +86,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
}
#endregion
#region 扩展字段
/// <summary>
///
/// </summary>
public string StatusName { get; set; }

#endregion
}
}


+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationDataMain/DT_EvaluationDataMainIBLL.cs Просмотреть файл

@@ -21,6 +21,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
IEnumerable<DT_EvaluationDataMainEntity> GetPageList(Pagination pagination, string queryJson);
IEnumerable<DT_EvaluationDataMainEntity> GetEvaluationListForXZ(string Assessed);
/// <summary>
/// 获取DT_EvaluationDataMain表实体数据
/// </summary>


+ 28
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationDataMain/DT_EvaluationDataMainService.cs Просмотреть файл

@@ -59,6 +59,34 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
}
}

/// <summary>
/// 党小组长评分 返回需要我打分的列表
/// </summary>
/// <param name="Assessed"></param>
/// <returns></returns>
public IEnumerable<DT_EvaluationDataMainEntity> GetEvaluationListForXZ(string Assessed)
{
try
{
string sql = $@" select distinct 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}'";
return this.BaseRepository("CollegeMIS").FindList<DT_EvaluationDataMainEntity>(sql);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}

/// <summary>
/// 获取DT_EvaluationDataMain表实体数据
/// </summary>


+ 7
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/PartyMember/PartyMemberService.cs Просмотреть файл

@@ -126,7 +126,13 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
{
try
{
this.BaseRepository("CollegeMIS").Delete<PartyMemberEntity>(t => t.ID == keyValue);
if (keyValue.Contains(","))
{
keyValue = string.Join("','", keyValue.Split(','));
}

string sql = $"delete PartyMember where ID in ('{keyValue}')";
this.BaseRepository("CollegeMIS").ExecuteBySql(sql);
}
catch (Exception ex)
{


Загрузка…
Отмена
Сохранить