|
|
@@ -382,12 +382,12 @@ namespace DataSharing.Host.Controllers.Police110
|
|
|
await InitRawData("service/api/dcjt/12345To110/chainAlarm", base64String, jsonRes, sendData?.AlarmReceiptNumber);
|
|
|
}
|
|
|
bool bRun = true;
|
|
|
- if (!string.IsNullOrEmpty(sendData.StartDate) || !IsDate(sendData.StartDate))
|
|
|
+ if (!string.IsNullOrEmpty(sendData.StartDate) && !IsDate(sendData.StartDate))
|
|
|
{
|
|
|
bRun = false;
|
|
|
apiR = DCJTDeResponse<string>.Failed(null, "【创建开始时间】不是日期格式 yyyy-MM-dd HH:mm:ss");
|
|
|
}
|
|
|
- if (!string.IsNullOrEmpty(sendData.EndDate) || !IsDate(sendData.EndDate))
|
|
|
+ if (!string.IsNullOrEmpty(sendData.EndDate) && !IsDate(sendData.EndDate))
|
|
|
{
|
|
|
bRun = false;
|
|
|
apiR = DCJTDeResponse<string>.Failed(null, "【创建结束时间】不是日期格式 yyyy-MM-dd HH:mm:ss");
|
|
|
@@ -395,7 +395,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()
|
|
|
@@ -524,7 +524,7 @@ 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;
|
|
|
var listData = await _dsPoliceSendChainDealDcjtRepository.Queryable()
|
|
|
.WhereIF(!string.IsNullOrEmpty(sendData.StartDate), p => p.WarehousingTime >= Convert.ToDateTime(sendData.StartDate))
|
tangjiang