From 040d77475711eecc46aaac3724479329372b3bd7 Mon Sep 17 00:00:00 2001
From: PC-201906131823\Administrator <zyyao>
Date: 星期三, 10 十一月 2021 16:41:47 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml | 17 ++++----
zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs | 3 +
zhengcaioa/Services/ExpertTestTopicService.cs | 55 +++++++++++++++------------
3 files changed, 42 insertions(+), 33 deletions(-)
diff --git a/zhengcaioa/Services/ExpertTestTopicService.cs b/zhengcaioa/Services/ExpertTestTopicService.cs
index 1ce29f8..2b69280 100644
--- a/zhengcaioa/Services/ExpertTestTopicService.cs
+++ b/zhengcaioa/Services/ExpertTestTopicService.cs
@@ -243,28 +243,33 @@
into ksssss
from kkk in ksssss.DefaultIfEmpty()
-
- //join ll in ( from aaa in _context.ExpertTestTopicanwsers.Where(x => x.RecStatus == "A").Select(e => new { Topic = e.Topic, Items = e.Anwserno + " " + e.Anwser + "</br>" }).GroupBy(e => new { e.Topic })
- // let ids = aaa.Select(b => b.Items.ToString()).ToArray()
-
- // select new { Topic = aaa.Key.Topic, Items = String.Join(" ", ids) }
- // //.Select(eg => new
- // //{
- // // Topic = eg.Key.Topic,
- // // //EmployeeName = eg.First().EmployeeName,
- // // Items = eg.Select(i => i.Anwserno) + " " + eg.Select(i => i.Anwser) + "</br>",
- // //})
- // )
- //on a.Id equals ll.Topic
- // into llsssss
- //from llll in llsssss.DefaultIfEmpty()
+ join l in _context.ExpertTestTopicjiexis
+ on a.Id equals l.Topic
+ into lsssss
+ from lll in lsssss.DefaultIfEmpty()
-
+ //join ll in ( from aaa in _context.ExpertTestTopicanwsers.Where(x => x.RecStatus == "A").Select(e => new { Topic = e.Topic, Items = e.Anwserno + " " + e.Anwser + "</br>" }).GroupBy(e => new { e.Topic })
+ // let ids = aaa.Select(b => b.Items.ToString()).ToArray()
+
+ // select new { Topic = aaa.Key.Topic, Items = String.Join(" ", ids) }
+ // //.Select(eg => new
+ // //{
+ // // Topic = eg.Key.Topic,
+ // // //EmployeeName = eg.First().EmployeeName,
+ // // Items = eg.Select(i => i.Anwserno) + " " + eg.Select(i => i.Anwser) + "</br>",
+ // //})
+ // )
+ //on a.Id equals ll.Topic
+ // into llsssss
+ //from llll in llsssss.DefaultIfEmpty()
- where a.RecStatus == "A"
+
+
+
+ where a.RecStatus == "A"
&& (string.IsNullOrWhiteSpace(searchEntity.Topictype) || a.Topictype == searchEntity.Topictype.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.Zhishitype) || a.Zhishitype == searchEntity.Zhishitype.Trim())
@@ -274,12 +279,12 @@
&& (string.IsNullOrWhiteSpace(searchEntity.Topic) || a.Topic.Contains(searchEntity.Topic.Trim()))
&& (string.IsNullOrWhiteSpace(searchEntity.Area) || a.Area == searchEntity.Area.Trim())
-
-
+ && (string.IsNullOrWhiteSpace(searchEntity.Falv) || lll.Falv == searchEntity.Falv.Trim())
- select new ExpertTestTopicDTO
+
+ select new ExpertTestTopicDTO
{
Id = a.Id,
Topictype = a.Topictype,
@@ -306,15 +311,15 @@
Modifytime = a.Modifytime,
}
- ).OrderByDescending(x => x.Modifytime).ToList();
+ ).Distinct().OrderByDescending(x => x.Modifytime).ToList();
-
+
+
-
- //if (searchEntity.totalrows == 0)
- searchEntity.totalrows = query.Count();
+ //if (searchEntity.totalrows == 0)
+ searchEntity.totalrows = query.Count();
var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
var lianlist11 = lianlist.Select(x => x.Id).ToList();
diff --git a/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs b/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs
index bed0bf2..5845414 100644
--- a/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs
@@ -93,6 +93,9 @@
ViewBag.zhongdian = _liaotianService.GetSYScode("system", "shifou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.jiexi_status = _liaotianService.GetSYScode("expert_test_topic", "jiexi_status").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.shenpi_status = _liaotianService.GetSYScode("expert_test_topic", "shenpi_status").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
+ ViewBag.Falv = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
+
+
var areaDTOs = _areaService.GetList().Where(x => x.ParentId == "0 ").ToList();
foreach (var areaDTO in areaDTOs)
{
diff --git a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml
index a186666..b893c77 100644
--- a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml
@@ -11,8 +11,8 @@
var jiexi_status = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.jiexi_status))';
var shenpi_status = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.shenpi_status))';
var Area = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.Area))';
-
-
+ var Falv = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.Falv))';
+ loseherght = 60;
dataCol = [
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true },
{
@@ -49,15 +49,16 @@
{ label: '鍖哄煙', name: 'Area', labtype: 'combox', hidden: false, data: JSON.parse(Area), cwidth: '5%', cccwidth: '15%' },
{ label: '棰樺瀷', name: 'Topictype', labtype: 'combox', hidden: false, data: JSON.parse(topictype), cwidth: '5%', cccwidth: '15%' },
{ label: '鐭ヨ瘑鐐�', name: 'Zhishitype', labtype: 'combox', hidden: false, data: JSON.parse(zhishitype), cwidth: '5%', cccwidth: '15%' },
+ { label: '娉曞緥', name: 'Falv', labtype: 'combox', hidden: false, data: JSON.parse(Falv), cwidth: '5%', cccwidth: '15%' },
{ label: '閲嶇偣鏍囨敞', name: 'Zhongdian', labtype: 'combox', hidden: false, data: JSON.parse(zhongdian), cwidth: '5%', cccwidth: '15%' },
{ label: '瑙ｆ瀽', name: 'JiexiStatus', labtype: 'combox', hidden: false, data: JSON.parse(jiexi_status), cwidth: '5%', cccwidth: '15%' },
{ label: '瀹℃牳', name: 'ShenpiStatus', labtype: 'combox', hidden: false, data: JSON.parse(shenpi_status), cwidth: '5%', cccwidth: '15%' },
-
+
{ label: '璇曢', name: 'Topic', labtype: 'txt', hidden: false },
-
+
@@ -117,14 +118,14 @@
$(document).ready(function () {
-
+
$("#PBSJiexiStatus").val("D");
$("#PBSJiexiStatus").trigger('chosen:updated');//鏇存柊閫夐」
$("#PBSShenpiStatus").val("D");
$("#PBSShenpiStatus").trigger('chosen:updated');//鏇存柊閫夐」
-
- });
+
+ });
var _afterSave = function (result) {
if (result) {
@@ -149,7 +150,7 @@
var Area = $("#PBSArea").val();
var Topictype = $("#PBSTopictype").val();
-
+
var Zhishitype = $("#PBSZhishitype").val();
var Zhongdian = $("#PBSZhongdian").val();
var JiexiStatus = $("#PBSJiexiStatus").val();
--
Gitblit v1.9.1