@ -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,c.xiangmu_name as title,c.synchronoustime as createDate," +
sql=$"select * from ((select a.\"Id\" as taskId,a.\"UnitName\" as unitName,c.xiangmu_name as title,c.handle_status_id,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,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," +
$" and a.\"State\"=1 ) UNION \r\n\r\n(select a.\"Id\" as taskId,a.\"UnitName\" as unitName,c.xiangmu_name as title,c.handle_status_id,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 ";
@ -2808,6 +2808,12 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
sqlpart=sqlpart+$" and (e.caseno like '%"+req.caseNo+"%' or e.title like '%"+req.caseNo+"%') ";
}
if(!string.IsNullOrEmpty(req.caseid))
{
//sqlpart = sqlpart + $" and e.xiangmu_no like '%" + req.caseNo + "%'";
sqlpart=sqlpart+$" and e.caseid='{req.caseid}' ";
}
@ -2883,6 +2889,11 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
double.Parse(req.jibenArea2);
}
if(req.handle_status_id!=null)
{
sqlpart=sqlpart+$" and handle_status_id={req.handle_status_id} ";
}
sqlpart+=$" ORDER BY e.createdate desc";
@ -6957,5 +6968,9 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl