Merge branch 'master' of http://192.168.1.222:3000/duhongyu/Anyang_api

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -431,7 +431,7 @@ namespace CallCenterApi.Interface.Controllers
             }
 
             //List<Model.T_Sys_UserAccount> userList = sysUserAccountBll.GetModelList(sql, " f_userid desc ");
-            var userList = sysUserAccountBll.GetList(sql, " f_userid desc ");
+            var userList = sysUserAccountBll.GetList(sql, " f_userid desc ").Tables[0];
             return Success("列表加载成功", userList);
         }
 

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/HotspotGlossaryController.cs

@@ -58,13 +58,13 @@ namespace CallCenterApi.Interface.Controllers.Wiki
         /// <param name="pagesize"></param>
         /// <param name="isdc"></param>
         /// <returns></returns>
-        public ActionResult GetList(int page = 1, int pagesize = 10, int isdc = 0)
+        public ActionResult GetList(string keyvalue, int page = 1, int pagesize = 10, int isdc = 0)
         {
             DataTable dt = new DataTable();
             string sql = " and F_IsDelete=0 ";
             string sqldt = "";
 
-            string strdanwei = HttpUtility.UrlDecode(RequestString.GetQueryString("danwei"));
+            string strzhengcemingci = HttpUtility.UrlDecode(RequestString.GetQueryString("zhengcemingci"));
             string strhangye = HttpUtility.UrlDecode(RequestString.GetQueryString("hangye"));
             int key = RequestString.GetInt("key", 0);
 
@@ -72,9 +72,9 @@ namespace CallCenterApi.Interface.Controllers.Wiki
             {
                 sql += " and F_FaBuDanWei like '%" + strhangye + "%' ";
             }
-            if (strdanwei.Trim() != "" && strdanwei != "undefined")
+            if (strzhengcemingci.Trim() != "" && strzhengcemingci != "undefined")
             {
-                sql += " and F_DanWei like '%" + strdanwei + "%' ";
+                sql += " and F_ZhengCeMingCi like '%" + strzhengcemingci + "%' ";
             }
             if (key > 0)
             {
@@ -82,6 +82,10 @@ namespace CallCenterApi.Interface.Controllers.Wiki
 
                 sqldt = " INNER JOIN [GetValueId]('" + key + "') Value on a.F_Key = Value.F_ValueId";
             }
+            if (!string.IsNullOrEmpty(keyvalue))
+            {
+                sql += " and (F_ZhengCeMingCi like '%" + keyvalue + "%' or F_QiTaShuoMing like '%" + keyvalue + "%' or F_BanLiLiuCheng like '%" + keyvalue + "%' or F_BeiZhu like '%" + keyvalue + "%')";
+            }
 
             string cols = "a.*,dbo.GetDictionaryName(F_Key) as KeyName";
 

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/LawGuideController.cs

@@ -58,13 +58,13 @@ namespace CallCenterApi.Interface.Controllers.Wiki
         /// <param name="pagesize"></param>
         /// <param name="isdc"></param>
         /// <returns></returns>
-        public ActionResult GetList(int page = 1, int pagesize = 10, int isdc = 0)
+        public ActionResult GetList(string keyvalue, int page = 1, int pagesize = 10, int isdc = 0)
         {
             DataTable dt = new DataTable();
             string sql = " and F_IsDelete=0 ";
             string sqldt = "";
 
-            string strdanwei = HttpUtility.UrlDecode(RequestString.GetQueryString("danwei"));
+            string stryewumingcheng = HttpUtility.UrlDecode(RequestString.GetQueryString("yewumingcheng"));
             string strhangye = HttpUtility.UrlDecode(RequestString.GetQueryString("hangye"));
             int key = RequestString.GetInt("key",0);
 
@@ -72,9 +72,9 @@ namespace CallCenterApi.Interface.Controllers.Wiki
             {
                 sql += " and F_FaBuDanWei like '%" + strhangye + "%' ";
             }
-            if (strdanwei.Trim() != "" && strdanwei != "undefined")
+            if (stryewumingcheng.Trim() != "" && stryewumingcheng != "undefined")
             {
-                sql += " and F_DanWei like '%" + strdanwei + "%' ";
+                sql += " and F_YeWuMingCheng like '%" + stryewumingcheng + "%' ";
             }
             if (key>0)
             {
@@ -82,6 +82,10 @@ namespace CallCenterApi.Interface.Controllers.Wiki
 
                 sqldt = " INNER JOIN [GetValueId]('" + key + "') Value on a.F_Key = Value.F_ValueId";
             }
+            if (!string.IsNullOrEmpty(keyvalue))
+            {
+                sql += " and (F_YeWuMingCheng like '%" + keyvalue + "%' or F_ReDianWenTi like '%" + keyvalue + "%' or F_WenTiJieDa like '%" + keyvalue + "%' )";
+            }
 
             string cols = "a.*,dbo.GetDictionaryName(F_Key) as KeyName";
 

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/ProfessorController.cs

@@ -28,7 +28,7 @@ namespace CallCenterApi.Interface.Controllers.Wiki
                 ImageUpload iu = new ImageUpload();
                 iu.SavePath = "/Upload/ZJTX/";
                 iu.PostFile = _upfile;
-                if (string.IsNullOrEmpty(name))
+                if (!string.IsNullOrEmpty(name))
                 {
                     iu.InFileName = name + ".jpg";
                     iu.SaveType = 1;
@@ -51,7 +51,7 @@ namespace CallCenterApi.Interface.Controllers.Wiki
         /// <param name="pagesize"></param>
         /// <param name="isdc"></param>
         /// <returns></returns>
-        public ActionResult GetList(int page = 1, int pagesize = 10, int isdc = 0)
+        public ActionResult GetList(string keyvalue,int page = 1, int pagesize = 10, int isdc = 0)
         {
             DataTable dt = new DataTable();
             string sql = " and F_IsDelete=0 ";
@@ -59,6 +59,7 @@ namespace CallCenterApi.Interface.Controllers.Wiki
             string strxingming = HttpUtility.UrlDecode(RequestString.GetQueryString("xingming"));
             string strdanwei = HttpUtility.UrlDecode(RequestString.GetQueryString("danwei"));
             string strkeshi = HttpUtility.UrlDecode(RequestString.GetQueryString("keshi"));
+            string strshouji = HttpUtility.UrlDecode(RequestString.GetQueryString("shouji"));
 
             if (strxingming.Trim() != "" && strxingming != "undefined")
             {
@@ -72,6 +73,14 @@ namespace CallCenterApi.Interface.Controllers.Wiki
             {
                 sql += " and F_KeShi like '%" + strkeshi + "%' ";
             }
+            if (strshouji.Trim() != "" && strshouji != "undefined")
+            {
+                sql += " and F_ShouJi like '%" + strshouji + "%' ";
+            }
+            if (!string.IsNullOrEmpty(keyvalue))
+            {
+                sql += " and (F_XingMing like '%" + keyvalue + "%' or F_ShouJi like '%" + keyvalue + "%' )";
+            }
 
             string cols = "*";
 

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

@@ -539,7 +539,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int recordCount = 0;
             dt = BLL.PagerBLL.GetListPager(
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwhere,
-                "F_WorkOrderId",
+                "F_Id",
                 cols,
                 sql,
                 "ORDER BY F_CreateTime DESC",
@@ -951,7 +951,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int recordCount = 0;
             dt = BLL.PagerBLL.GetListPager(
                 "T_Bus_WorkOrder a WITH(NOLOCK)" ,
-                "F_WorkOrderId",
+                "F_Id",
                 cols,
                 sql,
                 "ORDER BY F_CreateTime DESC",
@@ -1320,7 +1320,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int recordCount = 0;
             dt = BLL.PagerBLL.GetListPager(
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwhere,
-                "F_WorkOrderId",
+                "F_Id",
                 cols,
                 sql,
                 "ORDER BY F_CreateTime DESC",
@@ -2093,7 +2093,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int recordCount = 0;
             dt = BLL.PagerBLL.GetListPager(
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwheres,
-                "F_WorkOrderId",
+                "F_Id",
                 cols,
                 sql,
                order,
@@ -2881,7 +2881,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             //二级单位待办事项、正在办理页面中，工单排列按照剩余时长来排序，超期最久的放在最上边，离办理时限最远的放在最后
             dt = BLL.PagerBLL.GetListPager(
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwhere,
-                "F_WorkOrderId",
+                "F_Id",
                 cols,
                 sql,
                 order,
@@ -3435,7 +3435,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int recordCount = 0;
             dt = BLL.PagerBLL.GetListPager(
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwhere,
-                "F_WorkOrderId",
+                "F_Id",
                 cols,
                 sql,
                 "ORDER BY F_CreateTime DESC",
@@ -3884,7 +3884,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int recordCount = 0;
             dt = BLL.PagerBLL.GetListPager(
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwhere,
-                "F_WorkOrderId",
+                "F_Id",
                 cols,
                 sql,
                 "ORDER BY F_CreateTime DESC",
@@ -4320,7 +4320,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int recordCount = 0;
             dt = BLL.PagerBLL.GetListPager(
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwhere,
-                "F_WorkOrderId",
+                "F_Id",
                 cols,
                 sql,
                 "ORDER BY F_CreateTime DESC",
@@ -4752,7 +4752,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int recordCount = 0;
             dt = BLL.PagerBLL.GetListPager(
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwhere,
-                "F_WorkOrderId",
+                "F_Id",
                 cols,
                 sql,
                 "ORDER BY F_CreateTime DESC",
@@ -5122,7 +5122,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int recordCount = 0;
             dt = BLL.PagerBLL.GetListPager(
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwhere,
-                "F_WorkOrderId",
+                "F_Id",
                 cols,
                 sql,
                 "ORDER BY F_CreateTime DESC",
@@ -5561,7 +5561,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int recordCount = 0;
             dt = BLL.PagerBLL.GetListPager(
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwheres,
-                "F_WorkOrderId",
+                "F_Id",
                 cols,
                 sql,
                 "ORDER BY F_CreateTime DESC",
@@ -5920,7 +5920,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int recordCount = 0;
             dt = BLL.PagerBLL.GetListPager(
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwheres,
-                "F_WorkOrderId",
+                "F_Id",
                 cols,
                 sql,
                 "ORDER BY F_CreateTime DESC",
@@ -6492,7 +6492,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int recordCount = 0;
             dt = BLL.PagerBLL.GetListPager(
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwheres,
-                "F_WorkOrderId",
+                "F_Id",
                 cols,
                 sql,
                 "ORDER BY F_CreateTime DESC",
@@ -6882,7 +6882,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int recordCount = 0;
             dt = BLL.PagerBLL.GetListPager(
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwheres,
-                "F_WorkOrderId",
+                "F_Id",
                 cols,
                 sql,
                 "ORDER BY F_CreateTime DESC",
@@ -7280,7 +7280,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int recordCount = 0;
             dt = BLL.PagerBLL.GetListPager(
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwheres,
-                "F_WorkOrderId",
+                "F_Id",
                 cols,
                 sql,
                 "ORDER BY F_CreateTime DESC",