From ebde7ca1e5518145840b0191f2332c0141ae11f5 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Thu, 29 Jul 2021 14:25:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E3=80=81=E8=A1=8C=E6=94=BF=E5=85=AC=E6=96=87=E4=B8=8B?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Ass_AssetsInfoApply/FormJY.js | 22 +++--- .../Views/Ass_AssetsInfoApply/FormJYHC.js | 74 +++++++++---------- .../Views/Ass_AssetsInfoApply/FormViewJY.js | 22 +++--- .../Views/Ass_AssetsInfoApply/FormViewJYHC.js | 70 +++++++++--------- .../Ass_AssetsInfoItemApply/FormJY.cshtml | 58 +++++++-------- .../Ass_AssetsInfoItemApply/FormJYHC.cshtml | 50 ++++++------- .../Views/Sys_SendFile/Form.js | 2 +- .../Views/Sys_SendFile/Index.cshtml | 22 +++++- .../Views/Sys_SendFile/Index.js | 66 +++++++++++++++++ .../Sys_SendFile/Sys_SendFileService.cs | 36 ++++++++- 10 files changed, 271 insertions(+), 151 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJY.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJY.js index f7abda4f4..44e9a1a6b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJY.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJY.js @@ -140,11 +140,11 @@ var bootstrap = function ($, learun) { }); } }, - { - label: '生成资产明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) { - return (cellvalue === true || cellvalue === "true") ? "" : ""; - } - }, + //{ + // label: '生成资产明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) { + // return (cellvalue === true || cellvalue === "true") ? "" : ""; + // } + //}, { label: '库房', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { @@ -196,15 +196,15 @@ var bootstrap = function ($, learun) { }); } }, - { - label: '英文名称', name: 'AAIEName', width: 100, align: 'left' - }, + //{ + // label: '英文名称', name: 'AAIEName', width: 100, align: 'left' + //}, { label: '资产型号', name: 'AAIModel', width: 100, align: 'left' }, - { - label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left' - }, + //{ + // label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left' + //}, { label: '资产规格', name: 'AAISpecification', width: 100, align: 'left' }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJYHC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJYHC.js index a55d74b85..93b9f18be 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJYHC.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJYHC.js @@ -98,22 +98,22 @@ var bootstrap = function ($, learun) { // label: '耗材编号', name: 'AAICode', width: 150, align: 'left' //}, { - label: '资产名称', name: 'AAIName', width: 150, align: 'left' - }, - { - label: '资产类别', name: 'AAITId', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType', - key: value, - keyId: 'atid', - callback: function (_data) { - callback(_data['aname']); - } - }); - } + label: '耗材名称', name: 'AAIName', width: 150, align: 'left' }, + //{ + // label: '资产类别', name: 'AAITId', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType', + // key: value, + // keyId: 'atid', + // callback: function (_data) { + // callback(_data['aname']); + // } + // }); + // } + //}, { - label: '资产来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) { + label: '耗材来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { key: value, code: 'zcly', @@ -140,11 +140,11 @@ var bootstrap = function ($, learun) { }); } }, - { - label: '生成资产明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) { - return (cellvalue === true || cellvalue === "true") ? "" : ""; - } - }, + //{ + // label: '生成资产明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) { + // return (cellvalue === true || cellvalue === "true") ? "" : ""; + // } + //}, { label: '库房', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { @@ -195,33 +195,33 @@ var bootstrap = function ($, learun) { }); } }, - { - label: '英文名称', name: 'AAIEName', width: 100, align: 'left' - }, + //{ + // label: '英文名称', name: 'AAIEName', width: 100, align: 'left' + //}, { label: '资产型号', name: 'AAIModel', width: 100, align: 'left' }, - { - label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left' - }, + //{ + // label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left' + //}, { label: '资产规格', name: 'AAISpecification', width: 100, align: 'left' }, { label: '用途', name: 'AAIUse', width: 100, align: 'left' }, - { - label: '供应商', name: 'AAISupplierId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_SupplierData', - key: value, - keyId: 'sid', - callback: function (_data) { - callback(_data['sname']); - } - }); - } - } + //{ + // label: '供应商', name: 'AAISupplierId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_SupplierData', + // key: value, + // keyId: 'sid', + // callback: function (_data) { + // callback(_data['sname']); + // } + // }); + // } + //} ], height: 400, mainId: 'AAIId', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.js index 906f51e8a..f8d292c1c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.js @@ -139,11 +139,11 @@ var bootstrap = function ($, learun) { }); } }, - { - label: '生成资产明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) { - return (cellvalue === true || cellvalue === "true") ? "" : ""; - } - }, + //{ + // label: '生成资产明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) { + // return (cellvalue === true || cellvalue === "true") ? "" : ""; + // } + //}, { label: '库房', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { @@ -169,15 +169,15 @@ var bootstrap = function ($, learun) { }); } }, - { - label: '英文名称', name: 'AAIEName', width: 100, align: 'left' - }, + //{ + // label: '英文名称', name: 'AAIEName', width: 100, align: 'left' + //}, { label: '资产型号', name: 'AAIModel', width: 100, align: 'left' }, - { - label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left' - }, + //{ + // label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left' + //}, { label: '资产规格', name: 'AAISpecification', width: 100, align: 'left' }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJYHC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJYHC.js index f126ce247..48962d6f2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJYHC.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJYHC.js @@ -90,18 +90,18 @@ var bootstrap = function ($, learun) { { label: '耗材名称', name: 'AAIName', width: 150, align: 'left' }, - { - label: '耗材类别', name: 'AAITId', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType', - key: value, - keyId: 'atid', - callback: function (_data) { - callback(_data['aname']); - } - }); - } - }, + //{ + // label: '耗材类别', name: 'AAITId', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType', + // key: value, + // keyId: 'atid', + // callback: function (_data) { + // callback(_data['aname']); + // } + // }); + // } + //}, { label: '耗材来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { @@ -130,11 +130,11 @@ var bootstrap = function ($, learun) { }); } }, - { - label: '生成耗材明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) { - return (cellvalue === true || cellvalue === "true") ? "" : ""; - } - }, + //{ + // label: '生成耗材明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) { + // return (cellvalue === true || cellvalue === "true") ? "" : ""; + // } + //}, { label: '库房', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { @@ -150,33 +150,33 @@ var bootstrap = function ($, learun) { { label: '库位', name: 'AAIStoragePosition', width: 100, align: 'left' }, - { - label: '英文名称', name: 'AAIEName', width: 100, align: 'left' - }, + //{ + // label: '英文名称', name: 'AAIEName', width: 100, align: 'left' + //}, { label: '资产型号', name: 'AAIModel', width: 100, align: 'left' }, - { - label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left' - }, + //{ + // label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left' + //}, { label: '资产规格', name: 'AAISpecification', width: 100, align: 'left' }, { label: '用途', name: 'AAIUse', width: 100, align: 'left' }, - { - label: '供应商', name: 'AAISupplierId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_SupplierData', - key: value, - keyId: 'sid', - callback: function (_data) { - callback(_data['sname']); - } - }); - } - } + //{ + // label: '供应商', name: 'AAISupplierId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_SupplierData', + // key: value, + // keyId: 'sid', + // callback: function (_data) { + // callback(_data['sname']); + // } + // }); + // } + //} ], height: 400, mainId: 'AAIId', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJY.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJY.cshtml index b4c418d4a..7a9f2672f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJY.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJY.cshtml @@ -21,33 +21,33 @@
资产名称*
+ @*
+
英文名称
+ +
*@
-
英文名称
- -
-
-
资产型号
- -
-
-
生产厂家
- +
资产型号*
+
+ @*
+
生产厂家
+ +
*@
-
资产规格
- +
资产规格*
+
-
用途
- +
用途*
+
-
资产来源
-
+
资产来源*
+
-
供应商
-
+
供应商*
+
单价*
@@ -58,30 +58,30 @@
-
数量单位
-
+
数量单位*
+
-
+
楼宇名称*
-
房间号
-
+
房间号*
+
使用部门*
-
+
使用人*
-
+
-
+ @@ -90,8 +90,8 @@
-
备注
- +
备注*
+
@Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJY.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJYHC.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJYHC.cshtml index 29e469192..112cee3c3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJYHC.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJYHC.cshtml @@ -9,10 +9,10 @@
选择已登记耗材*
*@ -
+ @*
耗材类别*
-
+
*@ -
+ @*
英文名称
-
+
*@
-
耗材型号
- +
耗材型号*
+
-
+ @*
生产厂家
-
+
*@
-
耗材规格
- +
耗材规格*
+
-
用途
- +
用途*
+
-
耗材来源
-
+
耗材来源*
+
-
+ @*
供应商
-
+
*@
单价*
@@ -58,20 +58,20 @@
-
数量单位
-
+
数量单位*
+
-
+
楼宇名称*
-
房间号
-
+
房间号*
+
使用部门*
@@ -81,7 +81,7 @@
使用人*
-
+ @@ -90,8 +90,8 @@
-
备注
- +
备注*
+
@Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJYHC.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js index 87802f8ab..de60cc764 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js @@ -89,7 +89,7 @@ var bootstrap = function ($, learun) { } } }); - $('#SendType').lrselectSet("1"); + $('#SendType').lrselectSet("2"); $('#Url').lrUploader(); var ContentsUE = UE.getEditor('Contents'); $('#Contents')[0].ue = ContentsUE; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.cshtml index 0e94f634e..47b5ee5f1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.cshtml @@ -18,8 +18,28 @@
+
接收对象
+
+
+
接收人
- +
+
+
+
接收部门
+
+
+
+
接收岗位
+
+
+
+
接收校区
+
+
+
+
文号
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js index 1f76fa33c..2d5a6e840 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js @@ -51,6 +51,71 @@ var bootstrap = function ($, learun) { $('#lr_refresh').on('click', function () { location.reload(); }); + $("#ReceiverIddiv").hide(); + $("#PostIddiv").hide(); + $('#CompanyId').lrCompanySelect({ type: 'multiple' }); + $('#DeptId').lrDepartmentSelect({ type: 'treemultiple' }); + $('#PostId').lrPostSelect({ type: 'treemultiple' }); + $('#ReceiverUserId').lrUserSelect({ type: '1' }); + $('#SendType').lrDataItemSelect({ + code: 'FileSendType', select: function (item) { + if (item != null && item != undefined) { + if (item.id === 1 || item.id === "1") { + $("#CompanyIddiv").show(); + $("#CompanyId").attr("isvalid", "yes"); + $("#CompanyId").attr("checkexpession", "NotNull"); + $("#DeptIddiv").hide(); + $("#DeptId").removeAttr("isvalid"); + $("#DeptId").removeAttr("NotNull"); + $("#ReceiverIddiv").hide(); + $("#ReceiverUserId").removeAttr("isvalid"); + $("#ReceiverUserId").removeAttr("NotNull"); + $("#PostIddiv").hide(); + $("#PostId").removeAttr("isvalid"); + $("#PostId").removeAttr("NotNull"); + } else if (item.id === 2 || item.id === "2") { + $("#CompanyIddiv").hide(); + $("#CompanyId").removeAttr("isvalid"); + $("#CompanyId").removeAttr("NotNull"); + $("#DeptIddiv").show(); + $("#DeptId").attr("isvalid", "yes"); + $("#DeptId").attr("checkexpession", "NotNull"); + $("#ReceiverIddiv").hide(); + $("#ReceiverUserId").removeAttr("isvalid"); + $("#ReceiverUserId").removeAttr("NotNull"); + $("#PostIddiv").hide(); + $("#PostId").removeAttr("isvalid"); + $("#PostId").removeAttr("NotNull"); + } else if (item.id === 3 || item.id === "3") { + $("#CompanyIddiv").hide(); + $("#CompanyId").removeAttr("isvalid"); + $("#CompanyId").removeAttr("NotNull"); + $("#DeptIddiv").hide(); + $("#DeptId").removeAttr("isvalid"); + $("#DeptId").removeAttr("NotNull"); + $("#ReceiverIddiv").hide(); + $("#ReceiverUserId").removeAttr("isvalid"); + $("#ReceiverUserId").removeAttr("NotNull"); + $("#PostIddiv").show(); + $("#PostId").attr("isvalid", "yes"); + $("#PostId").attr("checkexpession", "NotNull"); + } else { + $("#CompanyIddiv").hide(); + $("#CompanyId").removeAttr("isvalid"); + $("#CompanyId").removeAttr("NotNull"); + $("#DeptIddiv").hide(); + $("#DeptId").removeAttr("isvalid"); + $("#DeptId").removeAttr("NotNull"); + $("#ReceiverIddiv").show(); + $("#ReceiverUserId").attr("isvalid", "yes"); + $("#ReceiverUserId").attr("checkexpession", "NotNull"); + $("#PostIddiv").hide(); + $("#PostId").removeAttr("isvalid"); + $("#PostId").removeAttr("NotNull"); + } + } + } + }); // 新增 $('#lr_add').on('click', function () { learun.layerForm({ @@ -238,6 +303,7 @@ var bootstrap = function ($, learun) { param = param || {}; param.StartTime = startTime; param.EndTime = endTime; + param.ReceiverId = param.DeptId + param.ReceiverUserId + param.PostId + param.CompanyId; param.SqlParameter = ' AND SendFlag<>4'; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs index f3978fb73..012643104 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs @@ -48,13 +48,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime); - strSql.Append(" AND ( t.SendTime >= @startTime AND t.SendTime <= @endTime ) "); + strSql.Append(" AND ( t.SendTime >= @startTime AND t.SendTime <= @endTime or (t.SendTime is null or len(t.SendTime)=0)) "); } + if (!queryParam["Title"].IsEmpty()) { dp.Add("Title", "%" + queryParam["Title"].ToString() + "%", DbType.String); strSql.Append(" AND t.Title Like @Title "); } + if (!queryParam["DocNo"].IsEmpty()) + { + dp.Add("DocNo", "%" + queryParam["DocNo"].ToString() + "%", DbType.String); + strSql.Append(" AND t.DocNo Like @DocNo "); + } if (!queryParam["SenderId"].IsEmpty()) { dp.Add("SenderId", "" + queryParam["SenderId"].ToString() + "", DbType.String); @@ -65,6 +71,34 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("Receiver", "%" + queryParam["Receiver"].ToString() + "%", DbType.String); strSql.Append(" AND t.Receiver Like @Receiver "); } + if (!queryParam["ReceiverId"].IsEmpty()) + { + if (queryParam["ReceiverId"].ToString().Contains(",")) + { + var arr = queryParam["ReceiverId"].ToString().Split(','); + var str = ""; + str += " AND ("; + + foreach (var item in arr) + { + str += $" t.ReceiverId Like '%{item}%' and"; + } + + str=str.Remove(str.LastIndexOf("and"), 3); + str += " )"; + strSql.Append(str); + } + else + { + strSql.Append($" AND t.ReceiverId Like '%{queryParam["ReceiverId"].ToString()}%' "); + } + + } + if (!queryParam["SendType"].IsEmpty()) + { + dp.Add("SendType", "" + queryParam["SendType"].ToString() + "", DbType.String); + strSql.Append(" AND t.SendType = @SendType "); + } //sql条件 if (!queryParam["SqlParameter"].IsEmpty()) {