综合查询接口添加按是否满意和交办单位查询

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -44,6 +44,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 //2018-7-2查询条件增加乡镇和信息分类
                 string strcounty = HttpUtility.UrlDecode(RequestString.GetQueryString("county"));
                 string strinfotype = HttpUtility.UrlDecode(RequestString.GetQueryString("infotype"));
+                //2018-7-4查询条件增加是否满意和交办单位
+                string strsatisfy = HttpUtility.UrlDecode(RequestString.GetQueryString("satisfy"));
+                string strunit = HttpUtility.UrlDecode(RequestString.GetQueryString("unit"));
 
                 string strpageindex = RequestString.GetQueryString("page");
                 int pageindex = 1;
@@ -101,6 +104,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     sql += " and County = '" + strcounty.Trim() + "' ";
                 }
+                //2018-7-4
+                if (!string.IsNullOrWhiteSpace(strsatisfy)&& strsatisfy.Trim() != "" && strsatisfy != "undefined")
+                {
+                    
+                    sql += " and ISReward is not null and ISReward="+strsatisfy +" ";
+                    
+                }
+                if (strunit.Trim() != "" && strunit != "undefined")
+                {
+                    sql += " and Unit = '" + strunit.Trim() + "' ";
+                }
                 #endregion
                 if (strpageindex.Trim() != "")
                 {
@@ -163,7 +177,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         string strname = HttpUtility.UrlDecode(RequestString.GetQueryString("name"));
                         string strstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
                         string strendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("endtime"));
-                        string strisreward = HttpUtility.UrlDecode(RequestString.GetQueryString("isreward"));
+                        
+                        //string strisreward = HttpUtility.UrlDecode(RequestString.GetQueryString("isreward"));//2018-7-4
+                        
                         string strstate = HttpUtility.UrlDecode(RequestString.GetQueryString("state"));
                         string strpageindex = RequestString.GetQueryString("page");
                         int pageindex = 1;
@@ -243,10 +259,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             sql += " and datediff(day,CreateTime,'" + strendtime + "')>=0   ";
                         }
-                        if (strisreward.Trim() != "" && strisreward != "undefined")
-                        {
-                            sql += " and ISReward=" + strisreward.Trim();
-                        }
+                        //if (strisreward.Trim() != "" && strisreward != "undefined")
+                        //{
+                        //    sql += " and ISReward=" + strisreward.Trim();
+                        //}
                         #region 针对已参与工单增加状态搜索
                         //20180612 zhengbingbing
                         if (strstate.Trim() != "" && strstate != "undefined")
@@ -985,7 +1001,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         public ActionResult DealWorkOrder(string orderid, int isend
            , string customer, string inqtime, string inquser, string country, string address
            , string detail, string cont, string answer, string remark,
-            string infotype, string unit, string clbm, string clgh)
+            string infotype, string unit, string clbm, string clgh,int? isreward)
             //int infotypeid, int unitid,int clbm,int clid)
         {
             ActionResult res = NoToken("未知错误，请重新登录");
@@ -1088,7 +1104,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 model.State = 2;
                             else
                                 model.State = 1;
-
+                            model.ISReward = isreward;
                             var rerere = new BLL.T_Wo_WorkOrder().Update(model);
                             #region 无需走流程
                             //int n = new BLL.T_Wo_WorkOrder().DealWorkOrder1(orderid, isend