Browse Source

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

duhongyu 4 years ago
parent
commit
cdee77c829

+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

431
             }
431
             }
432
 
432
 
433
             //List<Model.T_Sys_UserAccount> userList = sysUserAccountBll.GetModelList(sql, " f_userid desc ");
433
             //List<Model.T_Sys_UserAccount> userList = sysUserAccountBll.GetModelList(sql, " f_userid desc ");
434
-            var userList = sysUserAccountBll.GetList(sql, " f_userid desc ");
434
+            var userList = sysUserAccountBll.GetList(sql, " f_userid desc ").Tables[0];
435
             return Success("列表加载成功", userList);
435
             return Success("列表加载成功", userList);
436
         }
436
         }
437
 
437
 

+ 8 - 4
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/HotspotGlossaryController.cs

58
         /// <param name="pagesize"></param>
58
         /// <param name="pagesize"></param>
59
         /// <param name="isdc"></param>
59
         /// <param name="isdc"></param>
60
         /// <returns></returns>
60
         /// <returns></returns>
61
-        public ActionResult GetList(int page = 1, int pagesize = 10, int isdc = 0)
61
+        public ActionResult GetList(string keyvalue, int page = 1, int pagesize = 10, int isdc = 0)
62
         {
62
         {
63
             DataTable dt = new DataTable();
63
             DataTable dt = new DataTable();
64
             string sql = " and F_IsDelete=0 ";
64
             string sql = " and F_IsDelete=0 ";
65
             string sqldt = "";
65
             string sqldt = "";
66
 
66
 
67
-            string strdanwei = HttpUtility.UrlDecode(RequestString.GetQueryString("danwei"));
67
+            string strzhengcemingci = HttpUtility.UrlDecode(RequestString.GetQueryString("zhengcemingci"));
68
             string strhangye = HttpUtility.UrlDecode(RequestString.GetQueryString("hangye"));
68
             string strhangye = HttpUtility.UrlDecode(RequestString.GetQueryString("hangye"));
69
             int key = RequestString.GetInt("key", 0);
69
             int key = RequestString.GetInt("key", 0);
70
 
70
 
72
             {
72
             {
73
                 sql += " and F_FaBuDanWei like '%" + strhangye + "%' ";
73
                 sql += " and F_FaBuDanWei like '%" + strhangye + "%' ";
74
             }
74
             }
75
-            if (strdanwei.Trim() != "" && strdanwei != "undefined")
75
+            if (strzhengcemingci.Trim() != "" && strzhengcemingci != "undefined")
76
             {
76
             {
77
-                sql += " and F_DanWei like '%" + strdanwei + "%' ";
77
+                sql += " and F_ZhengCeMingCi like '%" + strzhengcemingci + "%' ";
78
             }
78
             }
79
             if (key > 0)
79
             if (key > 0)
80
             {
80
             {
82
 
82
 
83
                 sqldt = " INNER JOIN [GetValueId]('" + key + "') Value on a.F_Key = Value.F_ValueId";
83
                 sqldt = " INNER JOIN [GetValueId]('" + key + "') Value on a.F_Key = Value.F_ValueId";
84
             }
84
             }
85
+            if (!string.IsNullOrEmpty(keyvalue))
86
+            {
87
+                sql += " and (F_ZhengCeMingCi like '%" + keyvalue + "%' or F_QiTaShuoMing like '%" + keyvalue + "%' or F_BanLiLiuCheng like '%" + keyvalue + "%' or F_BeiZhu like '%" + keyvalue + "%')";
88
+            }
85
 
89
 
86
             string cols = "a.*,dbo.GetDictionaryName(F_Key) as KeyName";
90
             string cols = "a.*,dbo.GetDictionaryName(F_Key) as KeyName";
87
 
91
 

+ 8 - 4
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/LawGuideController.cs

58
         /// <param name="pagesize"></param>
58
         /// <param name="pagesize"></param>
59
         /// <param name="isdc"></param>
59
         /// <param name="isdc"></param>
60
         /// <returns></returns>
60
         /// <returns></returns>
61
-        public ActionResult GetList(int page = 1, int pagesize = 10, int isdc = 0)
61
+        public ActionResult GetList(string keyvalue, int page = 1, int pagesize = 10, int isdc = 0)
62
         {
62
         {
63
             DataTable dt = new DataTable();
63
             DataTable dt = new DataTable();
64
             string sql = " and F_IsDelete=0 ";
64
             string sql = " and F_IsDelete=0 ";
65
             string sqldt = "";
65
             string sqldt = "";
66
 
66
 
67
-            string strdanwei = HttpUtility.UrlDecode(RequestString.GetQueryString("danwei"));
67
+            string stryewumingcheng = HttpUtility.UrlDecode(RequestString.GetQueryString("yewumingcheng"));
68
             string strhangye = HttpUtility.UrlDecode(RequestString.GetQueryString("hangye"));
68
             string strhangye = HttpUtility.UrlDecode(RequestString.GetQueryString("hangye"));
69
             int key = RequestString.GetInt("key",0);
69
             int key = RequestString.GetInt("key",0);
70
 
70
 
72
             {
72
             {
73
                 sql += " and F_FaBuDanWei like '%" + strhangye + "%' ";
73
                 sql += " and F_FaBuDanWei like '%" + strhangye + "%' ";
74
             }
74
             }
75
-            if (strdanwei.Trim() != "" && strdanwei != "undefined")
75
+            if (stryewumingcheng.Trim() != "" && stryewumingcheng != "undefined")
76
             {
76
             {
77
-                sql += " and F_DanWei like '%" + strdanwei + "%' ";
77
+                sql += " and F_YeWuMingCheng like '%" + stryewumingcheng + "%' ";
78
             }
78
             }
79
             if (key>0)
79
             if (key>0)
80
             {
80
             {
82
 
82
 
83
                 sqldt = " INNER JOIN [GetValueId]('" + key + "') Value on a.F_Key = Value.F_ValueId";
83
                 sqldt = " INNER JOIN [GetValueId]('" + key + "') Value on a.F_Key = Value.F_ValueId";
84
             }
84
             }
85
+            if (!string.IsNullOrEmpty(keyvalue))
86
+            {
87
+                sql += " and (F_YeWuMingCheng like '%" + keyvalue + "%' or F_ReDianWenTi like '%" + keyvalue + "%' or F_WenTiJieDa like '%" + keyvalue + "%' )";
88
+            }
85
 
89
 
86
             string cols = "a.*,dbo.GetDictionaryName(F_Key) as KeyName";
90
             string cols = "a.*,dbo.GetDictionaryName(F_Key) as KeyName";
87
 
91
 

+ 11 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/ProfessorController.cs

28
                 ImageUpload iu = new ImageUpload();
28
                 ImageUpload iu = new ImageUpload();
29
                 iu.SavePath = "/Upload/ZJTX/";
29
                 iu.SavePath = "/Upload/ZJTX/";
30
                 iu.PostFile = _upfile;
30
                 iu.PostFile = _upfile;
31
-                if (string.IsNullOrEmpty(name))
31
+                if (!string.IsNullOrEmpty(name))
32
                 {
32
                 {
33
                     iu.InFileName = name + ".jpg";
33
                     iu.InFileName = name + ".jpg";
34
                     iu.SaveType = 1;
34
                     iu.SaveType = 1;
51
         /// <param name="pagesize"></param>
51
         /// <param name="pagesize"></param>
52
         /// <param name="isdc"></param>
52
         /// <param name="isdc"></param>
53
         /// <returns></returns>
53
         /// <returns></returns>
54
-        public ActionResult GetList(int page = 1, int pagesize = 10, int isdc = 0)
54
+        public ActionResult GetList(string keyvalue,int page = 1, int pagesize = 10, int isdc = 0)
55
         {
55
         {
56
             DataTable dt = new DataTable();
56
             DataTable dt = new DataTable();
57
             string sql = " and F_IsDelete=0 ";
57
             string sql = " and F_IsDelete=0 ";
59
             string strxingming = HttpUtility.UrlDecode(RequestString.GetQueryString("xingming"));
59
             string strxingming = HttpUtility.UrlDecode(RequestString.GetQueryString("xingming"));
60
             string strdanwei = HttpUtility.UrlDecode(RequestString.GetQueryString("danwei"));
60
             string strdanwei = HttpUtility.UrlDecode(RequestString.GetQueryString("danwei"));
61
             string strkeshi = HttpUtility.UrlDecode(RequestString.GetQueryString("keshi"));
61
             string strkeshi = HttpUtility.UrlDecode(RequestString.GetQueryString("keshi"));
62
+            string strshouji = HttpUtility.UrlDecode(RequestString.GetQueryString("shouji"));
62
 
63
 
63
             if (strxingming.Trim() != "" && strxingming != "undefined")
64
             if (strxingming.Trim() != "" && strxingming != "undefined")
64
             {
65
             {
72
             {
73
             {
73
                 sql += " and F_KeShi like '%" + strkeshi + "%' ";
74
                 sql += " and F_KeShi like '%" + strkeshi + "%' ";
74
             }
75
             }
76
+            if (strshouji.Trim() != "" && strshouji != "undefined")
77
+            {
78
+                sql += " and F_ShouJi like '%" + strshouji + "%' ";
79
+            }
80
+            if (!string.IsNullOrEmpty(keyvalue))
81
+            {
82
+                sql += " and (F_XingMing like '%" + keyvalue + "%' or F_ShouJi like '%" + keyvalue + "%' )";
83
+            }
75
 
84
 
76
             string cols = "*";
85
             string cols = "*";
77
 
86
 

+ 15 - 15
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

539
             int recordCount = 0;
539
             int recordCount = 0;
540
             dt = BLL.PagerBLL.GetListPager(
540
             dt = BLL.PagerBLL.GetListPager(
541
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwhere,
541
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwhere,
542
-                "F_WorkOrderId",
542
+                "F_Id",
543
                 cols,
543
                 cols,
544
                 sql,
544
                 sql,
545
                 "ORDER BY F_CreateTime DESC",
545
                 "ORDER BY F_CreateTime DESC",
951
             int recordCount = 0;
951
             int recordCount = 0;
952
             dt = BLL.PagerBLL.GetListPager(
952
             dt = BLL.PagerBLL.GetListPager(
953
                 "T_Bus_WorkOrder a WITH(NOLOCK)" ,
953
                 "T_Bus_WorkOrder a WITH(NOLOCK)" ,
954
-                "F_WorkOrderId",
954
+                "F_Id",
955
                 cols,
955
                 cols,
956
                 sql,
956
                 sql,
957
                 "ORDER BY F_CreateTime DESC",
957
                 "ORDER BY F_CreateTime DESC",
1320
             int recordCount = 0;
1320
             int recordCount = 0;
1321
             dt = BLL.PagerBLL.GetListPager(
1321
             dt = BLL.PagerBLL.GetListPager(
1322
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwhere,
1322
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwhere,
1323
-                "F_WorkOrderId",
1323
+                "F_Id",
1324
                 cols,
1324
                 cols,
1325
                 sql,
1325
                 sql,
1326
                 "ORDER BY F_CreateTime DESC",
1326
                 "ORDER BY F_CreateTime DESC",
2093
             int recordCount = 0;
2093
             int recordCount = 0;
2094
             dt = BLL.PagerBLL.GetListPager(
2094
             dt = BLL.PagerBLL.GetListPager(
2095
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwheres,
2095
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwheres,
2096
-                "F_WorkOrderId",
2096
+                "F_Id",
2097
                 cols,
2097
                 cols,
2098
                 sql,
2098
                 sql,
2099
                order,
2099
                order,
2881
             //二级单位待办事项、正在办理页面中,工单排列按照剩余时长来排序,超期最久的放在最上边,离办理时限最远的放在最后
2881
             //二级单位待办事项、正在办理页面中,工单排列按照剩余时长来排序,超期最久的放在最上边,离办理时限最远的放在最后
2882
             dt = BLL.PagerBLL.GetListPager(
2882
             dt = BLL.PagerBLL.GetListPager(
2883
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwhere,
2883
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwhere,
2884
-                "F_WorkOrderId",
2884
+                "F_Id",
2885
                 cols,
2885
                 cols,
2886
                 sql,
2886
                 sql,
2887
                 order,
2887
                 order,
3435
             int recordCount = 0;
3435
             int recordCount = 0;
3436
             dt = BLL.PagerBLL.GetListPager(
3436
             dt = BLL.PagerBLL.GetListPager(
3437
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwhere,
3437
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwhere,
3438
-                "F_WorkOrderId",
3438
+                "F_Id",
3439
                 cols,
3439
                 cols,
3440
                 sql,
3440
                 sql,
3441
                 "ORDER BY F_CreateTime DESC",
3441
                 "ORDER BY F_CreateTime DESC",
3884
             int recordCount = 0;
3884
             int recordCount = 0;
3885
             dt = BLL.PagerBLL.GetListPager(
3885
             dt = BLL.PagerBLL.GetListPager(
3886
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwhere,
3886
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwhere,
3887
-                "F_WorkOrderId",
3887
+                "F_Id",
3888
                 cols,
3888
                 cols,
3889
                 sql,
3889
                 sql,
3890
                 "ORDER BY F_CreateTime DESC",
3890
                 "ORDER BY F_CreateTime DESC",
4320
             int recordCount = 0;
4320
             int recordCount = 0;
4321
             dt = BLL.PagerBLL.GetListPager(
4321
             dt = BLL.PagerBLL.GetListPager(
4322
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwhere,
4322
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwhere,
4323
-                "F_WorkOrderId",
4323
+                "F_Id",
4324
                 cols,
4324
                 cols,
4325
                 sql,
4325
                 sql,
4326
                 "ORDER BY F_CreateTime DESC",
4326
                 "ORDER BY F_CreateTime DESC",
4752
             int recordCount = 0;
4752
             int recordCount = 0;
4753
             dt = BLL.PagerBLL.GetListPager(
4753
             dt = BLL.PagerBLL.GetListPager(
4754
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwhere,
4754
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwhere,
4755
-                "F_WorkOrderId",
4755
+                "F_Id",
4756
                 cols,
4756
                 cols,
4757
                 sql,
4757
                 sql,
4758
                 "ORDER BY F_CreateTime DESC",
4758
                 "ORDER BY F_CreateTime DESC",
5122
             int recordCount = 0;
5122
             int recordCount = 0;
5123
             dt = BLL.PagerBLL.GetListPager(
5123
             dt = BLL.PagerBLL.GetListPager(
5124
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwhere,
5124
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwhere,
5125
-                "F_WorkOrderId",
5125
+                "F_Id",
5126
                 cols,
5126
                 cols,
5127
                 sql,
5127
                 sql,
5128
                 "ORDER BY F_CreateTime DESC",
5128
                 "ORDER BY F_CreateTime DESC",
5561
             int recordCount = 0;
5561
             int recordCount = 0;
5562
             dt = BLL.PagerBLL.GetListPager(
5562
             dt = BLL.PagerBLL.GetListPager(
5563
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwheres,
5563
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwheres,
5564
-                "F_WorkOrderId",
5564
+                "F_Id",
5565
                 cols,
5565
                 cols,
5566
                 sql,
5566
                 sql,
5567
                 "ORDER BY F_CreateTime DESC",
5567
                 "ORDER BY F_CreateTime DESC",
5920
             int recordCount = 0;
5920
             int recordCount = 0;
5921
             dt = BLL.PagerBLL.GetListPager(
5921
             dt = BLL.PagerBLL.GetListPager(
5922
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwheres,
5922
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwheres,
5923
-                "F_WorkOrderId",
5923
+                "F_Id",
5924
                 cols,
5924
                 cols,
5925
                 sql,
5925
                 sql,
5926
                 "ORDER BY F_CreateTime DESC",
5926
                 "ORDER BY F_CreateTime DESC",
6492
             int recordCount = 0;
6492
             int recordCount = 0;
6493
             dt = BLL.PagerBLL.GetListPager(
6493
             dt = BLL.PagerBLL.GetListPager(
6494
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwheres,
6494
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwheres,
6495
-                "F_WorkOrderId",
6495
+                "F_Id",
6496
                 cols,
6496
                 cols,
6497
                 sql,
6497
                 sql,
6498
                 "ORDER BY F_CreateTime DESC",
6498
                 "ORDER BY F_CreateTime DESC",
6882
             int recordCount = 0;
6882
             int recordCount = 0;
6883
             dt = BLL.PagerBLL.GetListPager(
6883
             dt = BLL.PagerBLL.GetListPager(
6884
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwheres,
6884
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwheres,
6885
-                "F_WorkOrderId",
6885
+                "F_Id",
6886
                 cols,
6886
                 cols,
6887
                 sql,
6887
                 sql,
6888
                 "ORDER BY F_CreateTime DESC",
6888
                 "ORDER BY F_CreateTime DESC",
7280
             int recordCount = 0;
7280
             int recordCount = 0;
7281
             dt = BLL.PagerBLL.GetListPager(
7281
             dt = BLL.PagerBLL.GetListPager(
7282
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwheres,
7282
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + sqlwheres,
7283
-                "F_WorkOrderId",
7283
+                "F_Id",
7284
                 cols,
7284
                 cols,
7285
                 sql,
7285
                 sql,
7286
                 "ORDER BY F_CreateTime DESC",
7286
                 "ORDER BY F_CreateTime DESC",