chenwei
/
lanlingxian_ziranziyuanheguihua
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

dev
陈伟 2025-05-25 08:59:41 +08:00
parent 0e0b383771 9f80c75496
commit 5ed5c3558a
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
OpenAuth.App/ServiceApp/DroneCaseInfo/DroneCaseInfoSingleApp.cs
View File

@ -2755,6 +2755,7 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
//该用户下包含所有部门
List<string> deplist = new List<string>();
string sqlpart = " ";
string sqlpart1 = " ";
if (user != null && user.Id != -1 && level != 0)
{
var departs = client.Queryable<SysUserOrg>().Where(r => r.UserId == user.Id).ToList();
@ -2766,7 +2767,8 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
}
string orgs = "\'" + string.Join("\',\'", deplist) + "\'";
sqlpart = $" and (c.countyid in ({orgs}) or c.streetid in ({orgs}) or c.communityid in ({orgs})) ";
sqlpart = $" and (e.countyid in ({orgs}) or e.streetid in ({orgs}) or e.communityid in ({orgs})) ";
sqlpart1 = $" and (c.countyid in ({orgs}) or c.streetid in ({orgs}) or c.communityid in ({orgs})) ";
}
var schemeCode = _configuration.GetSection("AppSetting:DroneCaseInfoSchemeCode").Value;
@ -2795,9 +2797,9 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
$" and a.\"ProcessCode\"='005' and a.\"UnitName\" in ('开工核查','开工问题整改','建中核查','建中问题整改','完工核查','完工 问题整改','日常监管','监管问题整改','现场复核','子流程') and a.\"State\"=1 )) e where 1=1 ";
string sqlpart1 = sqlpart + $" and a.\"UnitName\" in ('开工核查','开工问题整改','建中核查','建中问题整改','完工核查','完工问题整改','日常监管','监管问题整改','现场复核','子流程') and a.\"State\"=1 ";
allCount = await client.Ado.GetIntAsync(sqlcount + sqlpart1);
var allCount1 = await client.Ado.GetIntAsync(sqlcount1 + sqlpart1);
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);
allCount = allCount + allCount1;
if (!string.IsNullOrEmpty(req.caseNo))
@ -2901,8 +2903,22 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
Result = dic
};
}
public async Task<Response<Dictionary<string, object>>> LoadLanLingChildTask(string caseid)
{
public Response<List<dynamic>> loadStreet()
Dictionary<string, object> dic = new Dictionary<string, object>();
string sql = $"select a.\"Id\" as taskId,d.*\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\" where d.ssnyd_id='"+caseid+"' and is_lishi=1";
var list = client.Ado.SqlQuery<dynamic>(sql);
dic.Add("list", list);
return new Response<Dictionary<string, object>>
{
Result = dic
};
}
public Response<List<dynamic>> loadStreet()
{
var authStrategyContext = _auth.GetCurrentUser();
var user = authStrategyContext.User;

6
OpenAuth.WebApi/Controllers/ServiceControllers/DroneCaseInfoSingleController.cs
View File

@ -307,6 +307,12 @@ public class DroneCaseInfoSingleController : ControllerBase
return await _app.LoadLanLingMyUncompletedTask(req);
}
[HttpGet]
public async Task<Response<Dictionary<string, object>>> LoadLanLingChildTask(string caseid)
{
return await _app.LoadLanLingChildTask(caseid);
}
[HttpGet]
public Response<List<dynamic>> loadStreet()
{