手机端接口添加项目名称查询

OpenAuth.App/ServiceApp/DroneCaseInfo/DroneCaseInfoSingleApp.cs

@@ -2786,12 +2786,12 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
         // $"a.\"ProcessCode\"='" +
         // schemeCode + "'  ";
 
-        sql = $"select * from ((select   a.\"Id\" as taskId,a.\"UnitName\" as unitName,b.\"Title\" as title,c.synchronoustime as createDate," +
+        sql = $"select * from ((select   a.\"Id\" as taskId,a.\"UnitName\" as unitName,c.xiangmu_name as title,c.synchronoustime as createDate," +
             $"c.xiangmu_no as caseNo,c.countyname,c.streetname,c.communityname,c.countyid,c.streetid,c.communityid,\r\n a.\"ProcessCode\" as processcode,a.\"ProcessId\" as processid,a.\"Type\" as type,a.\"ChildSchemeInfoCode\" as childSchemeInfoCode," +
             $"c.gengdi_area as gengdiArea,yongjiujibennongtian_area as yongjiujibennongtianArea ,nongyongdi_area as nongyongdiArea,c.geomid," +
             $"c.\"Id\" as caseid\r\n from wf_task a   LEFT JOIN wf_process  b on a.\"ProcessId\"=b.\"Id\"\r\nLEFT JOIN drone_ssnyd c  " +
             $"on b.\"InstanceInfo\"->>'pkeyValue'=c.\"Id\"  where 1=1 and a.\"ProcessCode\"='004'  and a.\"UnitName\" in ('开工核查','开工问题整改','建中核查','建中问题整改','完工核查','完工问题整改','日常监管','监管问题整改','现场复核','监管接收')" +
-            $" and  a.\"State\"=1  ) UNION \r\n\r\n(select   a.\"Id\" as taskId,a.\"UnitName\" as unitName,b.\"Title\" as title,c.synchronoustime as createDate,c.xiangmu_no as caseNo,c.countyname,c.streetname,c.communityname,c.countyid,c.streetid,c.communityid," +
+            $" and  a.\"State\"=1  ) UNION \r\n\r\n(select   a.\"Id\" as taskId,a.\"UnitName\" as unitName,c.xiangmu_name as title,c.synchronoustime as createDate,c.xiangmu_no as caseNo,c.countyname,c.streetname,c.communityname,c.countyid,c.streetid,c.communityid," +
             $"\r\n a.\"ProcessCode\" as processcode,a.\"ProcessId\" as processid,a.\"Type\" as type,a.\"ChildSchemeInfoCode\" as childSchemeInfoCode,c.gengdi_area as gengdiArea,yongjiujibennongtian_area as yongjiujibennongtianArea ,nongyongdi_area as nongyongdiArea,c.geomid,c.\"Id\" as caseid\r\n" +
             $" from wf_task a   LEFT JOIN wf_process  b on a.\"ProcessId\"=b.\"Id\"\r\nLEFT JOIN drone_ssnyd_rcjg d  on b.\"InstanceInfo\"->>'pkeyValue'=d.\"Id\" RIGHT  JOIN drone_ssnyd c on c.\"Id\"=d.ssnyd_id  where 1=1 " +
             $" and a.\"ProcessCode\"='005' and a.\"UnitName\" in ('开工核查','开工问题整改','建中核查','建中问题整改','完工核查','完工问题整改','日常监管','监管问题整改','现场复核','监管接收')   and a.\"State\"=1  )) e where 1=1 ";
@@ -2805,7 +2805,7 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
         if (!string.IsNullOrEmpty(req.caseNo))
         {
             //sqlpart = sqlpart + $" and e.xiangmu_no like '%" + req.caseNo + "%'";
-            sqlpart = sqlpart + $" and e.caseno like '%" + req.caseNo + "%'";
+            sqlpart = sqlpart + $" and (e.caseno like '%" + req.caseNo + "%' or e.title like '%" + req.caseNo+"%') ";
         }
 
 
@@ -2953,7 +2953,7 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
         int allCount = 0;
 
         sqlcount =
-            $"select  count(a.*) from wf_task a   LEFT JOIN wf_process  " +
+            $"select  count(a.*) from wf_task a INNER JOIN ( select \"ProcessId\",max(\"CreateDate\") as createtime from wf_task GROUP BY \"ProcessId\" ) t on a.\"CreateDate\"=t.createtime     LEFT JOIN wf_process  " +
             $"b on a.\"ProcessId\"=b.\"Id\" \r\nLEFT JOIN drone_ssnyd c  on b.\"InstanceInfo\"->>'pkeyValue'=c.\"Id\" where 1=1  ";
 
         string sqlcount1 =
@@ -2962,15 +2962,14 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
         // $"a.\"ProcessCode\"='" +
         // schemeCode + "'  ";
 
-        sql = $"select   a.\"Id\" as taskId,a.\"UnitName\" as unitName,b.\"Title\" as title,c.synchronoustime as createDate," +
+        sql = $"select   a.\"Id\" as taskId,a.\"UnitName\" as unitName,c.xiangmu_name as title,c.synchronoustime as createDate," +
             $"c.xiangmu_no as caseNo,c.countyname,c.streetname,c.communityname,c.countyid,c.streetid,c.communityid,\r\n a.\"ProcessCode\" as processcode,a.\"ProcessId\" as processid,a.\"Type\" as type,a.\"ChildSchemeInfoCode\" as childSchemeInfoCode," +
             $"c.gengdi_area as gengdiArea,yongjiujibennongtian_area as yongjiujibennongtianArea ,nongyongdi_area as nongyongdiArea,c.geomid," +
-            $"c.\"Id\" as caseid\r\n from wf_task a   LEFT JOIN wf_process  b on a.\"ProcessId\"=b.\"Id\"\r\nLEFT JOIN drone_ssnyd c  " +
-            $"on b.\"InstanceInfo\"->>'pkeyValue'=c.\"Id\"  where 1=1  and a.\"UnitName\" in ('开工核查','开工问题整改','建中核查','建中问题整改','完工核查','完工问题整改','日常监管','监管问题整改','现场复核','监管接收')" +
-            $" and a.\"State\"=1";
+            $"c.\"Id\" as caseid\r\n from wf_task a   INNER JOIN ( select \"ProcessId\",max(\"CreateDate\") as createtime from wf_task GROUP BY \"ProcessId\" ) t on a.\"CreateDate\"=t.createtime   LEFT JOIN wf_process  b on a.\"ProcessId\"=b.\"Id\"\r\nLEFT JOIN drone_ssnyd c  " +
+            $"on b.\"InstanceInfo\"->>'pkeyValue'=c.\"Id\"  where 1=1  and c.\"Id\" is not null ";
 
 
-        string sqlpart2 = sqlpart1 + $" and a.\"UnitName\" in ('开工核查','开工问题整改','建中核查','建中问题整改','完工核查','完工问题整改','日常监管','监管问题整改','现场复核','监管接收') and a.\"State\"=1";
+        string sqlpart2 = sqlpart1 + $" and  c.\"Id\" is not null ";
         allCount = await client.Ado.GetIntAsync(sqlcount + sqlpart2);
         //var allCount1 = await client.Ado.GetIntAsync(sqlcount1 + sqlpart2);