From acc2b5cebffb5db1abcc7751fb8405131747e760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
<10755671+mei-rong-he@user.noreply.gitee.com>
Date: Thu, 12 Mar 2026 17:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Entities/SK/T_SK_CHECK_CONTENTS_BASIC.cs | 3 ++
.../Controllers/Api/BasicLibraryController.cs | 44 +++++++++++++++++--
.../Controllers/Api/CrossDbContext.cs | 9 ++++
3 files changed, 53 insertions(+), 3 deletions(-)
diff --git a/APT.MS.Domain/Entities/SK/T_SK_CHECK_CONTENTS_BASIC.cs b/APT.MS.Domain/Entities/SK/T_SK_CHECK_CONTENTS_BASIC.cs
index 0e6a9c9..49faba9 100644
--- a/APT.MS.Domain/Entities/SK/T_SK_CHECK_CONTENTS_BASIC.cs
+++ b/APT.MS.Domain/Entities/SK/T_SK_CHECK_CONTENTS_BASIC.cs
@@ -3,6 +3,7 @@ using APT.MS.Domain.Entities.LR;
using System;
using System.Collections.Generic;
using System.ComponentModel;
+using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
namespace APT.MS.Domain.Entities.SK
@@ -21,6 +22,7 @@ namespace APT.MS.Domain.Entities.SK
/// 检查内容
///
[Description("检查内容")]
+ [NotMapped]
public virtual T_SK_CHECK_CONTENTS Nav_Contents { get; set; }
///
@@ -34,6 +36,7 @@ namespace APT.MS.Domain.Entities.SK
/// 导航属性：法律法规库
///
[Description("导航属性：法律法规库")]
+ [NotMapped]
public T_LR_LAW Nav_Law { get; set; }
}
}
diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/BasicLibraryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/BasicLibraryController.cs
index aa67adc..dd47b0c 100644
--- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/BasicLibraryController.cs
+++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/BasicLibraryController.cs
@@ -1716,10 +1716,13 @@ namespace APT.SK.WebApi.Controllers
//查检查依据(法律法规)
List updateCheckLaws = new List();
List updateCheckLawTypes = new List();
- var checkContLaws = this.GetEntities(t => true, new BaseFilter(orgId));
- var jtcheckContLaws = db.GetJTLaws(dbName).ToList();
+ List updateCheckBas = new List();
var jtcheckContLawTypes = db.GetJTLawTypes(dbName).ToList();
var checkContLawTypes = this.GetEntities(t => true, new BaseFilter(orgId));
+ var checkContLaws = this.GetEntities(t => true, new BaseFilter(orgId));
+ var jtcheckContLaws = db.GetJTLaws(dbName).ToList();
+ var checkContBas = this.GetEntities(t => true, new BaseFilter(orgId));
+ var jtcheckContBas = db.GetJTBas(dbName).ToList();
if (basicList != null && basicList.Any())
{
var conIds = basicList.Select(t => t.LAW_ID).Distinct().ToList();
@@ -1828,6 +1831,39 @@ namespace APT.SK.WebApi.Controllers
}
}
}
+ //检查内容子表保存
+ var conBasics = basicList.GroupBy(t => new { t.CHECK_CONTENTS_ID, t.LAW_ID }).ToList();
+ if (conBasics != null && conBasics.Any())
+ {
+ foreach (var item in conBasics)
+ {
+ var first = checkContBas.FirstOrDefault(t => t.CHECK_CONTENTS_ID == item.Key.CHECK_CONTENTS_ID && t.LAW_ID == item.Key.LAW_ID);
+ if (first == null)
+ {
+ //写入
+ var jtFirstType = jtcheckContBas.FirstOrDefault(t => t.CHECK_CONTENTS_ID == item.Key.CHECK_CONTENTS_ID && t.LAW_ID == item.Key.LAW_ID);
+ if (jtFirstType != null)
+ {
+ T_SK_CHECK_CONTENTS_BASIC conBasic = new T_SK_CHECK_CONTENTS_BASIC();
+ conBasic.CHECK_CONTENTS_ID = item.Key.CHECK_CONTENTS_ID;
+ conBasic.LAW_ID = item.Key.LAW_ID;
+ conBasic.ORG_ID = orgId;
+ conBasic.ID = jtFirstType.ID;
+ updateCheckBas.Add(conBasic);
+ }
+ }
+ else
+ {
+ //更新
+ T_SK_CHECK_CONTENTS_BASIC conBasic = new T_SK_CHECK_CONTENTS_BASIC();
+ conBasic.CHECK_CONTENTS_ID = item.Key.CHECK_CONTENTS_ID;
+ conBasic.LAW_ID = item.Key.LAW_ID;
+ conBasic.ORG_ID = orgId;
+ conBasic.ID = first.ID;
+ updateCheckBas.Add(conBasic);
+ }
+ }
+ }
}
//查隐患描述
List updateCheckQues = new List();
@@ -1898,7 +1934,9 @@ namespace APT.SK.WebApi.Controllers
if (updateCheckConts != null && updateCheckConts.Any())
BantchSaveEntityNoCommit(updateCheckConts);
if (updateCheckQues != null && updateCheckQues.Any())
- BantchSaveEntityNoCommit(updateCheckQues);
+ BantchSaveEntityNoCommit(updateCheckQues);
+ if (updateCheckBas != null && updateCheckBas.Any())
+ BantchSaveEntityNoCommit(updateCheckBas);
if (deleteBasBasicIds != null && deleteBasBasicIds.Any())
this.BantchDeleteEntityNoCommit(deleteBasBasicIds);
if (deleteBasHiddenIds != null && deleteBasHiddenIds.Any())
diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CrossDbContext.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CrossDbContext.cs
index aa7cf48..e56a689 100644
--- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CrossDbContext.cs
+++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CrossDbContext.cs
@@ -74,6 +74,9 @@ namespace APT.SK.WebApi.Controllers.Api
modelBuilder.Entity().Ignore(x => x.Nav_Org)
.Ignore(x => x.DbConn)
.Ignore(x => x.TaskID);
+ modelBuilder.Entity().Ignore(x => x.Nav_Org)
+ .Ignore(x => x.DbConn)
+ .Ignore(x => x.TaskID);
//modelBuilder.Entity()
// .Ignore(x => x.departmentCheckedKeys);
}
@@ -210,5 +213,11 @@ namespace APT.SK.WebApi.Controllers.Api
var ques = this.Set().FromSqlRaw(sql).ToList();
return ques;
}
+ public List GetJTBas(string dbName)
+ {
+ string sql = $"SELECT * FROM {dbName}.dbo.T_SK_CHECK_CONTENTS_BASIC";
+ var ques = this.Set().FromSqlRaw(sql).ToList();
+ return ques;
+ }
}
}