From 3b029fb510aeca89d31812bde7542ee55a8ddc1a Mon Sep 17 00:00:00 2001
From: PC-201906131823\Administrator <zyyao>
Date: 星期一, 08 十一月 2021 17:02:50 +0800
Subject: [PATCH] 增加合计

---
 zhengcaioa/Services/ExpertTestTopicService.cs |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/zhengcaioa/Services/ExpertTestTopicService.cs b/zhengcaioa/Services/ExpertTestTopicService.cs
index 57fa6ea..3748593 100644
--- a/zhengcaioa/Services/ExpertTestTopicService.cs
+++ b/zhengcaioa/Services/ExpertTestTopicService.cs
@@ -327,7 +327,16 @@
 
                 foreach (var quer in querydel)
                 {
-                    lian.Topic += quer.Anwserno + " " + quer.Anwser + " </br>";
+                    if (lian.Topictype != "03")
+                    {
+                        lian.Topic += quer.Anwserno + " " + quer.Anwser + " </br>";
+                    }
+                 
+                    if(quer.Shifouzhengqu == "A")
+                    {
+                        lian.Anwsers += quer.Anwserno ;
+                    }
+                    
                 }
             }
 
@@ -344,7 +353,15 @@
 
                     jiexi +=(falv!=null? "銆�" + falv.Comments + "銆�" : "") + " " + quer.Fatiao + " " + quer.Jiexi + " </br>" ;
                 }
-                lian.Jiexi = jiexi + lian.Jiexi + " </br>";
+                if (string.IsNullOrEmpty(lian.Jiexi))
+                {
+                    lian.Jiexi = jiexi;
+                }
+                else
+                {
+                    lian.Jiexi = jiexi + lian.Jiexi + " </br>";
+                }
+               
             }
 
             data.LoadData(searchEntity, lianlist);

--
Gitblit v1.9.1