Merge branch 'feature/updatecitychange' of http://110.188.24.182:10023/Fengwo/data-sharing into feature/updatecitychange

src/DataSharing.Host/Controllers/HotlineWebController.cs

@@ -1037,30 +1037,34 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
             if (!dto.EndTime.HasValue)
                 dto.EndTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 23:59:59"));
 
-            string strSql = @"SELECT * FROM( SELECT ""SCO"".""ProvinceNo"",""FirstTime"",  ""LastTime"",""SendTimes"", ""GenerationTime"",""CreationTime"",""RequestData"",""ExpiredTime"", ""CaseSource"",""OrderId""
-                    FROM(
-                    SELECT *  FROM 
-                    (
-                    SELECT ROW_NUMBER() OVER(PARTITION BY ""ProvinceNo"" ORDER BY ""CreationTime"" DESC)  AS ""newIndex"",""ProvinceNo"",""FirstTime"",""OrderId"",
-                    ""LastTime"",""SendTimes"",""GenerationTime""AS ""GenerationTime"",""CreationTime"",""RequestData"",""ExpiredTime"",""CaseSource"" AS ""CaseSource""
-                    FROM ""ds_send_task_submit_case_info"" 
-	                    where  ""GenerationTime"" >= '{0}'  AND  ""GenerationTime"" <= '{1}'     AND  ""LastTime"" >= '{0}'  AND  ""LastTime"" <= '{1}' AND  ""IsSuccess"" = 1 
-                    ) ""SCI"" WHERE ""newIndex""=1  	AND  ""CaseSource"" =  'RGDH' 
-                    ) ""SCO""
-                     LEFT JOIN 
-                    (
-                    SELECT * FROM (
-                    SELECT ROW_NUMBER() OVER(PARTITION BY ""CallId"" ORDER BY ""CreationTime"" DESC) as ""newIndex"",""ProvinceNo"",""CallId"",""CallLogId""
-                    FROM  ""ds_send_task_submit_case_record"" 
-				           WHERE   ""GenerationTime"" >= '{0}'   AND  ""LastTime"" >= '{0}'  AND  ""IsSuccess"" = 1 AND ""CallDirection""='0'
-                        ) ""SCR"" WHERE ""newIndex""=1 and (""ProvinceNo""  IS NOT NULL or ""ProvinceNo""  !='') 
-                    )""SCRC""
-                    ON ""SCO"".""ProvinceNo""=""SCRC"".""ProvinceNo""  WHERE  ""SCRC"".""ProvinceNo""  IS NULL   {2}
-                      )""te"" ";
+            //string strSql = @"SELECT * FROM( SELECT ""SCO"".""ProvinceNo"",""FirstTime"",  ""LastTime"",""SendTimes"", ""GenerationTime"",""CreationTime"",""RequestData"",""ExpiredTime"", ""CaseSource"",""OrderId""
+            //        FROM(
+            //        SELECT *  FROM 
+            //        (
+            //        SELECT ROW_NUMBER() OVER(PARTITION BY ""ProvinceNo"" ORDER BY ""CreationTime"" DESC)  AS ""newIndex"",""ProvinceNo"",""FirstTime"",""OrderId"",
+            //        ""LastTime"",""SendTimes"",""GenerationTime""AS ""GenerationTime"",""CreationTime"",""RequestData"",""ExpiredTime"",""CaseSource"" AS ""CaseSource""
+            //        FROM ""ds_send_task_submit_case_info"" 
+            //         where  ""GenerationTime"" >= '{0}'  AND  ""GenerationTime"" <= '{1}'     AND  ""LastTime"" >= '{0}'  AND  ""LastTime"" <= '{1}' AND  ""IsSuccess"" = 1 
+            //        ) ""SCI"" WHERE ""newIndex""=1  	AND  ""CaseSource"" =  'RGDH' 
+            //        ) ""SCO""
+            //         LEFT JOIN 
+            //        (
+            //        SELECT * FROM (
+            //        SELECT ROW_NUMBER() OVER(PARTITION BY ""CallId"" ORDER BY ""CreationTime"" DESC) as ""newIndex"",""ProvinceNo"",""CallId"",""CallLogId""
+            //        FROM  ""ds_send_task_submit_case_record"" 
+            //   WHERE   ""GenerationTime"" >= '{0}'   AND  ""LastTime"" >= '{0}'  AND  ""IsSuccess"" = 1 AND ""CallDirection""='0'
+            //            ) ""SCR"" WHERE ""newIndex""=1 and (""ProvinceNo""  IS NOT NULL or ""ProvinceNo""  !='') 
+            //        )""SCRC""
+            //        ON ""SCO"".""ProvinceNo""=""SCRC"".""ProvinceNo""  WHERE  ""SCRC"".""ProvinceNo""  IS NULL   {2}
+            //          )""te"" ";
+            string strSql = @"select provinceno ""ProvinceNo"",firsttime""FirstTime"",  lasttime""LastTime"",generationtime""GenerationTime"",
+                    creationtime""CreationTime"",requestdata""RequestData"",
+                    casesource""CaseSource"",orderid""OrderId"" FROM 
+                    get_order_matching_call_list('{0}','{1}')";
             string strWhere = "";
             if (!string.IsNullOrEmpty(dto.CaseSerial))
             {
-                strWhere = " AND  \"SCO\".\"ProvinceNo\"= '" + dto.CaseSerial + "'";
+                strWhere = " WHERE provinceno = '" + dto.CaseSerial + "'";
             }
             strSql = string.Format(strSql, dto.StartTime, dto.EndTime, strWhere);
             return _waitSendTaskRepository.GetDataBySql(strSql);

src/DataSharing.Host/Controllers/Police110/PoliceDCJTController.cs

@@ -434,7 +434,7 @@ namespace DataSharing.Host.Controllers.Police110
                                  JJLX = p.AlarmReceptionType,
                                  XZQHDM = p.AreaCode
                              })
-                             .OrderByDescending(p => p.BJSJ)
+                             .OrderByDescending(p => p.TSSJ)
                              .Take(takeNum)
                              .ToListAsync();
 

src/DataSharing.Host/Controllers/TaskSchedulerController.cs

@@ -542,27 +542,30 @@ namespace DataSharing.Host.Controllers
             DateTime startTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-01 00:00:00"));
             DateTime endTime = DateTime.Now;
 
-            string strSql = @"SELECT ""ProvinceNo"" FROM( SELECT ""SCO"".""ProvinceNo"",""FirstTime"",  ""LastTime"",""SendTimes"", ""GenerationTime"",""CreationTime"",""RequestData"",""ExpiredTime"", ""CaseSource"",""OrderId""
-                    FROM(
-                    SELECT *  FROM 
-                    (
-                    SELECT ROW_NUMBER() OVER(PARTITION BY ""ProvinceNo"" ORDER BY ""CreationTime"" DESC)  AS ""newIndex"",""ProvinceNo"",""FirstTime"",""OrderId"",
-                    ""LastTime"",""SendTimes"",""GenerationTime""AS ""GenerationTime"",""CreationTime"",""RequestData"",""ExpiredTime"",""CaseSource"" AS ""CaseSource""
-                    FROM ""ds_send_task_submit_case_info"" 
-	                    where  ""GenerationTime"" >= '{0}'  AND  ""GenerationTime"" <= '{1}'     AND  ""LastTime"" >= '{0}'  AND  ""LastTime"" <= '{1}' AND  ""IsSuccess"" = 1 
-                    ) ""SCI"" WHERE ""newIndex""=1  	AND  ""CaseSource"" =  'RGDH' 
-                    ) ""SCO""
-                     LEFT JOIN 
-                    (
-                    SELECT * FROM (
-                    SELECT ROW_NUMBER() OVER(PARTITION BY ""CallId"" ORDER BY ""CreationTime"" DESC) as ""newIndex"",""ProvinceNo"",""CallId"",""CallLogId""
-                    FROM  ""ds_send_task_submit_case_record"" 
-				           WHERE   ""GenerationTime"" >= '{0}'   AND  ""LastTime"" >= '{0}'  AND  ""IsSuccess"" = 1 AND ""CallDirection""='0'
-                        ) ""SCR"" WHERE ""newIndex""=1 and (""ProvinceNo""  IS NOT NULL or ""ProvinceNo""  !='') 
-                    )""SCRC""
-                    ON ""SCO"".""ProvinceNo""=""SCRC"".""ProvinceNo""  WHERE  ""SCRC"".""ProvinceNo""  IS NULL   
-                      )""te"" ";
-
+            //string strSql = @"SELECT ""ProvinceNo"" FROM( SELECT ""SCO"".""ProvinceNo"",""FirstTime"",  ""LastTime"",""SendTimes"", ""GenerationTime"",""CreationTime"",""RequestData"",""ExpiredTime"", ""CaseSource"",""OrderId""
+            //        FROM(
+            //        SELECT *  FROM 
+            //        (
+            //        SELECT ROW_NUMBER() OVER(PARTITION BY ""ProvinceNo"" ORDER BY ""CreationTime"" DESC)  AS ""newIndex"",""ProvinceNo"",""FirstTime"",""OrderId"",
+            //        ""LastTime"",""SendTimes"",""GenerationTime""AS ""GenerationTime"",""CreationTime"",""RequestData"",""ExpiredTime"",""CaseSource"" AS ""CaseSource""
+            //        FROM ""ds_send_task_submit_case_info"" 
+            //         where  ""GenerationTime"" >= '{0}'  AND  ""GenerationTime"" <= '{1}'     AND  ""LastTime"" >= '{0}'  AND  ""LastTime"" <= '{1}' AND  ""IsSuccess"" = 1 
+            //        ) ""SCI"" WHERE ""newIndex""=1  	AND  ""CaseSource"" =  'RGDH' 
+            //        ) ""SCO""
+            //         LEFT JOIN 
+            //        (
+            //        SELECT * FROM (
+            //        SELECT ROW_NUMBER() OVER(PARTITION BY ""CallId"" ORDER BY ""CreationTime"" DESC) as ""newIndex"",""ProvinceNo"",""CallId"",""CallLogId""
+            //        FROM  ""ds_send_task_submit_case_record"" 
+            //   WHERE   ""GenerationTime"" >= '{0}'   AND  ""LastTime"" >= '{0}'  AND  ""IsSuccess"" = 1 AND ""CallDirection""='0'
+            //            ) ""SCR"" WHERE ""newIndex""=1 and (""ProvinceNo""  IS NOT NULL or ""ProvinceNo""  !='') 
+            //        )""SCRC""
+            //        ON ""SCO"".""ProvinceNo""=""SCRC"".""ProvinceNo""  WHERE  ""SCRC"".""ProvinceNo""  IS NULL   
+            //          )""te"" ";
+            string strSql = @"select provinceno ""ProvinceNo"",firsttime""FirstTime"",  lasttime""LastTime"",generationtime""GenerationTime"",
+                    creationtime""CreationTime"",requestdata""RequestData"",
+                    casesource""CaseSource"",orderid""OrderId"" FROM 
+                    get_order_matching_call_list('{0}','{1}')";
             strSql = string.Format(strSql, startTime, endTime);
 
             var list = await _waitSendTaskRepository.GetDataBySql(strSql).ToListAsync();

src/DataSharing/Province/ProvinceService.cs

@@ -780,6 +780,11 @@ namespace DataSharing.Province
         /// <exception cref="UserFriendlyException"></exception>
         public async Task SubmitCaseRecordFwAsync(CallNativeDto dto, CancellationToken cancellationToken)
         {
+            //如果是呼出，没有通话录音文件，直接过滤
+            if (dto != null && dto.Direction == ECallDirection.Out && string.IsNullOrEmpty(dto.AudioFile))
+            {
+                return;
+            }
             //验证是否需要推送未接数据
             if (dto != null && dto.AnsweredTime == null && dto.Direction == ECallDirection.In)
             {

src/DataSharing/Province/SendTask/ProvinceOther/DsSendTaskProvinceOther.cs

@@ -1,5 +1,4 @@
 using DataSharing.SendTask;
-using DataSharing.Share.Dtos;
 using Hotline.Share.Dtos.File;
 using SqlSugar;
 using System.ComponentModel;
@@ -14,6 +13,7 @@ namespace DataSharing.Province.SendTask.ProvinceOther
     [SugarIndex("index_dssendtaskprovinceother_provinceno", nameof(ProvinceNo), OrderByType.Desc)]
     [SugarIndex("index_dssendtaskprovinceother_firsttime", nameof(FirstTime), OrderByType.Desc)]
     [SugarIndex("index_dssendtaskprovinceother_lasttime", nameof(LastTime), OrderByType.Desc)]
+    [SugarIndex("index_dssendtaskprovinceother_generationtime", nameof(GenerationTime), OrderByType.Desc)]
     public class DsSendTaskProvinceOther : BaseSendTask
     {
         /// <summary>

src/DataSharing/Province/SendTask/SubmitCaseInfo/DsSendTaskSubmitCaseInfo.cs

@@ -14,6 +14,7 @@ namespace DataSharing.Province.SendTask.SubmitCaseInfo
     [SugarIndex("index_dssendtasksubmitcaseinfo_provinceno", nameof(ProvinceNo), OrderByType.Desc)]
     [SugarIndex("index_dssendtasksubmitcaseinfo_firsttime", nameof(FirstTime), OrderByType.Desc)]
     [SugarIndex("index_dssendtasksubmitcaseinfo_lasttime", nameof(LastTime), OrderByType.Desc)]
+    [SugarIndex("index_dssendtasksubmitcaseinfo_generationtime", nameof(GenerationTime), OrderByType.Desc)]
     public class DsSendTaskSubmitCaseInfo : BaseSendTask
     {
         /// <summary>

src/DataSharing/Province/SendTask/SubmitCaseProcess/DsSendTaskSubmitCaseProcess.cs

@@ -12,6 +12,7 @@ namespace DataSharing.Province.SendTask.SubmitCaseProcess
     [SugarIndex("index_dssendtasksubmitcaseprocess_provinceno", nameof(ProvinceNo), OrderByType.Desc)]
     [SugarIndex("index_dssendtasksubmitcaseprocess_firsttime", nameof(FirstTime), OrderByType.Desc)]
     [SugarIndex("index_dssendtasksubmitcaseprocess_lasttime", nameof(LastTime), OrderByType.Desc)]
+    [SugarIndex("index_dssendtasksubmitcaseprocess_generationtime", nameof(GenerationTime), OrderByType.Desc)]
     public class DsSendTaskSubmitCaseProcess : BaseSendTask
     {
         /// <summary>

src/DataSharing/Province/SendTask/SubmitCaseRecord/DsSendTaskSubmitCaseRecord.cs

@@ -10,11 +10,10 @@ namespace DataSharing.Province.SendTask.SubmitCaseRecord
     [Description("业务汇聚-电话记录推送任务数据")]
     [SugarIndex("index_dssendtasksubmitcaserecord_callid", nameof(CallId), OrderByType.Desc)]
     [SugarIndex("index_dssendtasksubmitcaserecord_calllogid", nameof(CallLogId), OrderByType.Desc)]
-    [SugarIndex("index_dssendtasksubmitcaserecord_calldirection", nameof(CallDirection), OrderByType.Desc)]
-    [SugarIndex("index_dssendtasksubmitcaserecord_onstate", nameof(OnState), OrderByType.Desc)]
     [SugarIndex("index_dssendtasksubmitcaserecord_provinceno", nameof(ProvinceNo), OrderByType.Desc)]
     [SugarIndex("index_dssendtasksubmitcaserecord_firsttime", nameof(FirstTime), OrderByType.Desc)]
     [SugarIndex("index_dssendtasksubmitcaserecord_lasttime", nameof(LastTime), OrderByType.Desc)]
+    [SugarIndex("index_dssendtasksubmitcaserecord_generationtime", nameof(GenerationTime), OrderByType.Desc)]
     public class DsSendTaskSubmitCaseRecord : BaseSendTask
     {
         /// <summary>

src/DataSharing/Province/SendTask/SubmitCaseResult/DsSendTaskSubmitCaseResult.cs

@@ -11,6 +11,7 @@ namespace DataSharing.Province.SendTask.SubmitCaseResult
     [SugarIndex("index_dssendtasksubmitcaseresult_provinceno", nameof(ProvinceNo), OrderByType.Desc)]
     [SugarIndex("index_dssendtasksubmitcaseresult_firsttime", nameof(FirstTime), OrderByType.Desc)]
     [SugarIndex("index_dssendtasksubmitcaseresult_lasttime", nameof(LastTime), OrderByType.Desc)]
+    [SugarIndex("index_dssendtasksubmitcaseresult_generationtime", nameof(GenerationTime), OrderByType.Desc)]
     public class DsSendTaskSubmitCaseResult : BaseSendTask
     {
         /// <summary>