From 894885fa8cdef3cd5e8e1a755552a41c0247ed90 Mon Sep 17 00:00:00 2001
From: yashen <yashen@gmail.com>
Date: Thu, 22 Sep 2016 15:09:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=AE=A2=E6=88=B7=E5=BE=97?=
 =?UTF-8?q?=E5=88=B0=E5=AE=A1=E6=89=B9=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 B3WeChat/B3WeChat.csproj           |  7 ++++---
 B3WeChat/BO/ApproveMessage.cs      |  4 ++++
 B3WeChat/Rpcs/ApproveMessageRpc.cs | 32 ++++++++++++++++++++----------
 B3WeChat/Rpcs/WeChatUserRpc.cs     |  1 +
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/B3WeChat/B3WeChat.csproj b/B3WeChat/B3WeChat.csproj
index 07ec337..f0da0df 100644
--- a/B3WeChat/B3WeChat.csproj
+++ b/B3WeChat/B3WeChat.csproj
@@ -36,6 +36,10 @@
       <HintPath>..\..\..\tsref\Debug\Forks.EnterpriseServices.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="forks.json, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\tsref\Debug\forks.json.dll</HintPath>
+    </Reference>
     <Reference Include="Forks.Utils, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\tsref\Debug\Forks.Utils.dll</HintPath>
@@ -126,9 +130,6 @@
     <Compile Include="WeiChatObjs\AuthorizationCodeResponse.cs" />
     <Compile Include="WeiChatObjs\BaseResponse.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <WCFMetadata Include="Service References\" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/B3WeChat/BO/ApproveMessage.cs b/B3WeChat/BO/ApproveMessage.cs
index ec9b9bc..6e9b17f 100644
--- a/B3WeChat/BO/ApproveMessage.cs
+++ b/B3WeChat/BO/ApproveMessage.cs
@@ -49,9 +49,13 @@ namespace BWP.B3WeChat.BO
     [LogicName("审批结果")]
     public NamedValue<审批状态> ApproveResult { get; set; }
 
+    [LogicName("审批时间")]
+    public DateTime? ApproveTime { get; set; }
+
     [LogicName("审批意见")]
     public string ApproveComment { get; set; }
 
     public string OpenID { get; set; }
+
   }
 }
diff --git a/B3WeChat/Rpcs/ApproveMessageRpc.cs b/B3WeChat/Rpcs/ApproveMessageRpc.cs
index 8edc82c..57da8fe 100644
--- a/B3WeChat/Rpcs/ApproveMessageRpc.cs
+++ b/B3WeChat/Rpcs/ApproveMessageRpc.cs
@@ -53,22 +53,34 @@ namespace BWP.B3WeChat.Rpcs
     }
 
 
-    /// <summary>
-    /// 返回消息状态
-    /// </summary>
-    /// <param name="messageID"></param>
-    /// <returns></returns>
     [Rpc]
-    public static short QueryMessageState(string messageID)
+    public static Dictionary<string, short> QueryApproveResult(string[] messageIDList)
     {
+      if (messageIDList.Length == 0)
+      {
+        return new Dictionary<string, short>(0);
+      }
       var query = new DQueryDom(new JoinAlias(typeof(ApproveMessage)));
-      query.Where.Conditions.Add(DQCondition.EQ("ID", messageID));
+      query.Where.Conditions.Add(DQCondition.InList(DQExpression.Field("ID"),
+        messageIDList.Select((item) => DQExpression.Value(item)).ToArray()));
+      query.Columns.Add(DQSelectColumn.Field("ID"));
       query.Columns.Add(DQSelectColumn.Field("ApproveResult"));
-      query.Range = SelectRange.Top(1);
-      var state = query.EExecuteScalar<NamedValue<审批状态>?>() ?? 审批状态.已删除;
-      return state.Value;
+
+      var dic = query.EExecuteList<string, NamedValue<审批状态>>()
+        .ToDictionary((item) => item.Item1, (item) => item.Item2.Value);
+
+      foreach (var messasgeID in messageIDList)
+      {
+        if (!dic.ContainsKey(messasgeID))
+        {
+          dic.Add(messasgeID, 审批状态.已删除.Value);
+        }
+      }
+      return dic;
     }
 
+
+
     [Rpc]
     public static void Delete(string messageID)
     {
diff --git a/B3WeChat/Rpcs/WeChatUserRpc.cs b/B3WeChat/Rpcs/WeChatUserRpc.cs
index e76c695..df49680 100644
--- a/B3WeChat/Rpcs/WeChatUserRpc.cs
+++ b/B3WeChat/Rpcs/WeChatUserRpc.cs
@@ -26,6 +26,7 @@ namespace BWP.B3WeChat.Rpcs
       var query = new DmoQuery(typeof(ApproveMessage));
 
       query.Where.Conditions.Add(DQCondition.EQ("OpenID", "DEBUG"));
+      query.OrderBy.Expressions.Add(DQOrderByExpression.Create("CreateTime", true));
 
       return query.EExecuteList().Cast<ApproveMessage>().ToArray();
     }