|
|
@@ -396,7 +396,7 @@ namespace DataSharing.Host.Controllers.Police110
|
|
|
if (bRun)
|
|
|
{
|
|
|
int takeNum = 10;
|
|
|
- if (string.IsNullOrEmpty(sendData.StartDate) || string.IsNullOrEmpty(sendData.EndDate))
|
|
|
+ if (!string.IsNullOrEmpty(sendData.StartDate) || !string.IsNullOrEmpty(sendData.EndDate))
|
|
|
takeNum = 100;
|
|
|
|
|
|
var listData = await _dsPoliceSendChainAlarmDcjtRepository.Queryable()
|
|
|
@@ -525,14 +525,18 @@ namespace DataSharing.Host.Controllers.Police110
|
|
|
{
|
|
|
//默认查询20条，当有参数查询100条
|
|
|
int takeNum = 20;
|
|
|
- if (string.IsNullOrEmpty(sendData.StartDate) || string.IsNullOrEmpty(sendData.EndDate))
|
|
|
+ if (!string.IsNullOrEmpty(sendData.StartDate) || !string.IsNullOrEmpty(sendData.EndDate))
|
|
|
+ takeNum = 100;
|
|
|
+ if (!string.IsNullOrEmpty(sendData.AlarmReceiptNumber))
|
|
|
+ takeNum = 100;
|
|
|
+ if (!string.IsNullOrEmpty(sendData.DisposalType))
|
|
|
takeNum = 100;
|
|
|
var listData = await _dsPoliceSendChainDealDcjtRepository.Queryable()
|
|
|
.WhereIF(!string.IsNullOrEmpty(sendData.StartDate), p => p.WarehousingTime >= Convert.ToDateTime(sendData.StartDate))
|
|
|
.WhereIF(!string.IsNullOrEmpty(sendData.EndDate), p => p.WarehousingTime <= Convert.ToDateTime(sendData.EndDate))
|
|
|
.WhereIF(!string.IsNullOrEmpty(sendData.AlarmReceiptNumber), p => p.AlarmReceiptNumber == sendData.AlarmReceiptNumber)
|
|
|
- // .Where(p => p.DisposalType == sendData.DisposalType)
|
|
|
- .WhereIF(!string.IsNullOrEmpty(sendData.DisposalType),p=> sendData.DisposalType.Contains(p.DisposalType))
|
|
|
+ // .Where(p => p.DisposalType == sendData.DisposalType)
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(sendData.DisposalType), p => sendData.DisposalType.Contains(p.DisposalType))
|
|
|
.Select(p => new ChainDeal_DCJTNewDto
|
|
|
{
|
|
|
JJDBH = p.AlarmReceiptNumber,
|
tangjiang