diff --git a/OpenAuth.App/ServiceApp/DroneCaseInfo/DroneCaseInfoSingleApp.cs b/OpenAuth.App/ServiceApp/DroneCaseInfo/DroneCaseInfoSingleApp.cs index 1c934bf..3bed8b7 100644 --- a/OpenAuth.App/ServiceApp/DroneCaseInfo/DroneCaseInfoSingleApp.cs +++ b/OpenAuth.App/ServiceApp/DroneCaseInfo/DroneCaseInfoSingleApp.cs @@ -2954,7 +2954,7 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp>'pkeyValue'=c.\"Id\" where 1=1 and a.\"ProcessCode\"='004' "; + $"b on a.\"ProcessId\"=b.\"Id\" \r\nLEFT JOIN drone_ssnyd c on b.\"InstanceInfo\"->>'pkeyValue'=c.\"Id\" where 1=1 "; string sqlcount1 = $"select count(a.*) from wf_task a LEFT JOIN wf_process " + @@ -2966,11 +2966,11 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp>'pkeyValue'=c.\"Id\" where 1=1 and a.\"ProcessCode\"='004' and a.\"UnitName\" in ('开工核查','开工问题整改','建中核查','建中问题整改','完工核查','完工问题整改','日常监管','监管问题整改','现场复核','监管接收')" + - $" "; + $"on b.\"InstanceInfo\"->>'pkeyValue'=c.\"Id\" where 1=1 and a.\"UnitName\" in ('开工核查','开工问题整改','建中核查','建中问题整改','完工核查','完工问题整改','日常监管','监管问题整改','现场复核','监管接收')" + + $" and a.\"State\"=1"; - string sqlpart2 = sqlpart1 + $" and a.\"UnitName\" in ('开工核查','开工问题整改','建中核查','建中问题整改','完工核查','完工问题整改','日常监管','监管问题整改','现场复核','监管接收')"; + string sqlpart2 = sqlpart1 + $" and a.\"UnitName\" in ('开工核查','开工问题整改','建中核查','建中问题整改','完工核查','完工问题整改','日常监管','监管问题整改','现场复核','监管接收') and a.\"State\"=1"; allCount = await client.Ado.GetIntAsync(sqlcount + sqlpart2); //var allCount1 = await client.Ado.GetIntAsync(sqlcount1 + sqlpart2);