From e4565d46b57a1d04d134671ee05037b2a0df5341 Mon Sep 17 00:00:00 2001
From: song.jun <lion0756@qq.com>
Date: 星期一, 13 四月 2026 13:21:35 +0800
Subject: [PATCH] 更新 QCDistributionRegisterInfoViewModel 和 TestPage
---
sbcLabSystem/Controllers/BackstageController.cs | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/sbcLabSystem/Controllers/BackstageController.cs b/sbcLabSystem/Controllers/BackstageController.cs
index 7fff284..e04d41a 100644
--- a/sbcLabSystem/Controllers/BackstageController.cs
+++ b/sbcLabSystem/Controllers/BackstageController.cs
@@ -263,15 +263,27 @@
[HttpPost]
public ActionResult ImportLabs(int oriDistId, int TargetDistId)
{
+ if (oriDistId == TargetDistId)
+ {
+ return Json(new QCDistributionPageViewModel(TargetDistId, 1, 20));
+ }
QCDistribution qcDistInfo = _qcService.GetQcDistributions()
.FirstOrDefault(p => p.Id == TargetDistId);
+ if (qcDistInfo == null)
+ {
+ return Json(new QCDistributionPageViewModel(TargetDistId, 1, 20));
+ }
var delList = _qcService.GetQcDistributionRegisters().Where(p => p.QCDistributionId == TargetDistId).ToList();
for (int i = 0; i < delList.Count; i++)
{
_qcService.DeleteQcDistributionRegister(delList[i]);
}
_qcService.GetQcDistributionRegisters().Where(p => p.QCDistributionId == oriDistId
- && p.LabInfo.State == 1).ToList().ForEach(x =>
+ && p.LabInfo.State == 1).ToList()
+ .GroupBy(x => new { x.LabId, x.ProjectId })
+ .Select(g => g.First())
+ .ToList()
+ .ForEach(x =>
{
var newEntityInfo = new QCDistributionRegisterInfo();
newEntityInfo.QCDistributionId = TargetDistId;
@@ -1216,10 +1228,10 @@
string TableName = distName + "参与实验室.xls";
string[] headers = { "实验室编号", "实验室名称","是否收费", "单位名称", "省份", "质评项目",
"地址", "邮编","Email","管理员","手机号","操作员姓名","操作员Email","操作员手机号" };
- string[] cellKes = { "labCode", "labName","isCharged", "companyName", "province", "projectClass",
- "address","postcode","email","manager","managerMobile","operatorName","operatorEmail","operatorMobile"};
+ string[] cellKes = { "labCode", "labName","isCharged", "companyName", "province", "projectClass","address","postcode","email","manager","managerMobile",
+ "operatorName","operatorEmail","operatorMobile"};
ExcelUtil.ExportByWeb(dt, distName + "参与实验室列表", headers, cellKes, TableName);
- return View("QCDistributionLabs");
+ return View("QCDistributionLabs");
}
--
Gitblit v1.8.0