From 09c2292a34980beff332c65239b68e9c619a9663 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 25 七月 2022 15:15:58 +0800
Subject: [PATCH] 文书管理
---
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
index b1ed7a0..e4732ad 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -2239,7 +2239,7 @@
var sysCodeDtls2 = sysCodeDtls1.Where(x => x.Classify1 == challengeItemDTO.Question).ToList();
if (!string.IsNullOrEmpty(challengeItemDTO.Law))
{
- sysCodeDtls2 = sysCodeDtls2.Where(x => challengeItemDTO.Law.Split(',').Contains(x.CodeSn)).ToList();
+ sysCodeDtls2 = sysCodeDtls2.Where(x => challengeItemDTO.Law.Split(',').Contains(x.CodeSn)).OrderBy(x=>x.Classify3).ToList();
}
challengeItemDTO.sysCodeDtls = sysCodeDtls2;
}
@@ -2798,7 +2798,7 @@
var sysCodeDtls2 = sysCodeDtls1.Where(x => x.Classify1 == complaintItemDTO.Question).ToList();
if (!string.IsNullOrEmpty(complaintItemDTO.Law))
{
- sysCodeDtls2 = sysCodeDtls2.Where(x => complaintItemDTO.Law.Split(',').Contains(x.CodeSn)).ToList();
+ sysCodeDtls2 = sysCodeDtls2.Where(x => complaintItemDTO.Law.Split(',').Contains(x.CodeSn)).OrderBy(x => x.Classify3).ToList();
}
complaintItemDTO.sysCodeDtls = sysCodeDtls2;
}
@@ -2876,9 +2876,22 @@
complaintletterDTO.SqdbId += challengeItemDTO.QuestionName+";";
}
}
-
-
+
+
+ }
+ else
+ {
+ complaintletterDTO.SqdbId = "";
+ if (complaintletterDTO.complaintItemDTOs != null && complaintletterDTO.complaintItemDTOs.Count > 0)
+ {
+ foreach (var complaintItemDTO in complaintletterDTO.complaintItemDTOs)
+ {
+
+ complaintletterDTO.SqdbId += complaintItemDTO.QuestionName + ";";
+ }
+ }
+
}
var cooperOrderDTO = _cooperOrderService.Get(id);
--
Gitblit v1.9.1