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

OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyApp.cs

@@ -552,13 +552,48 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
 
         public async Task<PageInfo<List<DroneSsnydRcjg>>> ProjectSupervise(DroneSsnydRcjgPageReq req)
         {
-             RefAsync<int> totalCount = 0;
+            RefAsync<int> totalCount = 0;
             var list = await Repository
                 .ChangeRepository<SugarRepositiry<DroneSsnydRcjg>>()
                 .AsQueryable()
-                .Where(a => a.ssnyd_id == req.ProjectId)
-                .WhereIF(req.IsLishi != null, a => a.is_lishi == req.IsLishi)
-                .OrderBy(a => a.create_time, OrderByType.Desc)
+                .LeftJoin<WFTask>((a, b) => a.ssnyd_id == b.ProcessId)
+                .Where((a, b) => a.ssnyd_id == req.ProjectId)
+                .WhereIF(req.IsLishi != null, (a, b) => a.is_lishi == req.IsLishi)
+                .OrderBy((a, b) => a.create_time, OrderByType.Desc)
+                .Select((a, b) => new DroneSsnydRcjg()
+                {
+                    Id = a.Id,
+                    taskId = b.Id,
+                    iswenti_rc = a.iswenti_rc, // 监管-是否存在问题  
+                    wentileixing_rc = a.wentileixing_rc, //监管-问题类型  
+                    qtqksm_rc = a.qtqksm_rc, //监管-其他情况说明  
+                    zgfs_rc = a.zgfs_rc, //监管-整改方式  
+                    zgqx_rc = a.zgqx_rc, //监管-整改期限  
+                    hechauser_rc = a.hechauser_rc, //监管-核查人员  
+                    hechatime_rc = a.hechatime_rc, //监管-核查时间  
+                    wjzp_rc = a.wjzp_rc, //监管-现场外景照片  
+                    njzp_rc = a.njzp_rc, //监管-现场内景照片  
+                    zgfs_rczg = a.zgfs_rczg, //整改-整改方式  
+                    hechauser_rczg = a.hechauser_rczg, // 整改-办理人员  
+                    hechatime_rczg = a.hechatime_rczg, //整改-办理时间  
+                    wjzp_rczg = a.wjzp_rczg, // 整改-现场外景照片  
+                    njzp_rczg = a.njzp_rczg, //整改-现场内景照片  
+                    iswenti_rcfh = a.iswenti_rcfh, //复核-是否整改完成  
+                    wentileixing_rcfh = a.wentileixing_rcfh, // 复核-问题类型  
+                    qtqksm_rcfh = a.qtqksm_rcfh, //复核-其他情况说明  
+                    zgfs_rcfh = a.zgfs_rcfh, //  复核-整改方式  
+                    zgqx_rcfh = a.zgqx_rcfh, //复核-整改期限  
+                    hechauser_rcfh = a.hechauser_rcfh, // 复核-核查人员  
+                    hechatime_rcfh = a.hechatime_rcfh, // 复核-核查时间  
+                    wjzp_rcfh = a.wjzp_rcfh, //复核-现场外景照片  
+                    njzp_rcfh = a.njzp_rcfh, // 复核--现场内景照片  
+                    ssnyd_id = a.ssnyd_id, //主表id  
+                    create_time = a.create_time, // 创建时间  
+                    fujian_rc = a.fujian_rc, // 监管_附件  
+                    fujian_rczg = a.fujian_rczg, // 整改_附件  
+                    fujian_rcfh = a.fujian_rcfh, // 复核_附件  
+                    is_lishi = a.is_lishi, // 0新的1历史  
+                })
                 .ToPageListAsync(req.page, req.limit, totalCount);
             return new PageInfo<List<DroneSsnydRcjg>>
             {

OpenAuth.Repository/Domain/DroneSsnydRcjg.cs

@@ -223,6 +223,9 @@ namespace OpenAuth.Repository.Domain
         /// 0 新的 1 历史
         /// </summary>
         public int is_lishi { get; set; }
+        
+        [SugarColumn(IsIgnore = true)]
+        public string taskId { get; set; }
 
     }
 }