瀏覽代碼

工单修改,地区增加区号

duhongyu 6 年之前
父節點
當前提交
5d7d32ed7b

+ 16 - 7
codegit/CallCenterApi/CallCenterApi.DAL/T_RegionCategory.cs

@@ -40,9 +40,9 @@ namespace CallCenterApi.DAL
40 40
         {
41 41
             StringBuilder strSql = new StringBuilder();
42 42
             strSql.Append("insert into T_RegionCategory(");
43
-            strSql.Append("F_AreaId,F_RegionNumber,F_RegionName,F_RegionEName,F_Sort,F_Layer,F_ParentId,F_CreateBy,F_CreateOn,F_ModifyBy,F_ModifyOn,F_DeleteFlag)");
43
+            strSql.Append("F_AreaId,F_RegionNumber,F_RegionName,F_RegionEName,F_Sort,F_Layer,F_ParentId,F_CreateBy,F_CreateOn,F_ModifyBy,F_ModifyOn,F_DeleteFlag,F_ZipCode)");
44 44
             strSql.Append(" values (");
45
-            strSql.Append("@F_AreaId,@F_RegionNumber,@F_RegionName,@F_RegionEName,@F_Sort,@F_Layer,@F_ParentId,@F_CreateBy,@F_CreateOn,@F_ModifyBy,@F_ModifyOn,@F_DeleteFlag)");
45
+            strSql.Append("@F_AreaId,@F_RegionNumber,@F_RegionName,@F_RegionEName,@F_Sort,@F_Layer,@F_ParentId,@F_CreateBy,@F_CreateOn,@F_ModifyBy,@F_ModifyOn,@F_DeleteFlag,@F_ZipCode)");
46 46
             strSql.Append(";select @@IDENTITY");
47 47
             SqlParameter[] parameters = {
48 48
 					new SqlParameter("@F_AreaId", SqlDbType.Int,4),
@@ -56,7 +56,8 @@ namespace CallCenterApi.DAL
56 56
 					new SqlParameter("@F_CreateOn", SqlDbType.DateTime),
57 57
 					new SqlParameter("@F_ModifyBy", SqlDbType.Int,4),
58 58
 					new SqlParameter("@F_ModifyOn", SqlDbType.DateTime),
59
-					new SqlParameter("@F_DeleteFlag", SqlDbType.SmallInt,2)};
59
+                    new SqlParameter("@F_ZipCode", SqlDbType.NVarChar,50),
60
+                    new SqlParameter("@F_DeleteFlag", SqlDbType.SmallInt,2)};
60 61
             parameters[0].Value = model.F_AreaId;
61 62
             parameters[1].Value = model.F_RegionNumber;
62 63
             parameters[2].Value = model.F_RegionName;
@@ -68,7 +69,8 @@ namespace CallCenterApi.DAL
68 69
             parameters[8].Value = model.F_CreateOn;
69 70
             parameters[9].Value = model.F_ModifyBy;
70 71
             parameters[10].Value = model.F_ModifyOn;
71
-            parameters[11].Value = model.F_DeleteFlag;
72
+            parameters[11].Value = model.F_ZipCode;
73
+            parameters[12].Value = model.F_DeleteFlag;
72 74
 
73 75
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
74 76
             if (obj == null)
@@ -98,6 +100,7 @@ namespace CallCenterApi.DAL
98 100
             strSql.Append("F_CreateOn=@F_CreateOn,");
99 101
             strSql.Append("F_ModifyBy=@F_ModifyBy,");
100 102
             strSql.Append("F_ModifyOn=@F_ModifyOn,");
103
+            strSql.Append("F_ZipCode=@F_ZipCode,");
101 104
             strSql.Append("F_DeleteFlag=@F_DeleteFlag");
102 105
             strSql.Append(" where F_RegionId=@F_RegionId");
103 106
             SqlParameter[] parameters = {
@@ -112,7 +115,8 @@ namespace CallCenterApi.DAL
112 115
 					new SqlParameter("@F_CreateOn", SqlDbType.DateTime),
113 116
 					new SqlParameter("@F_ModifyBy", SqlDbType.Int,4),
114 117
 					new SqlParameter("@F_ModifyOn", SqlDbType.DateTime),
115
-					new SqlParameter("@F_DeleteFlag", SqlDbType.SmallInt,2),
118
+                    new SqlParameter("@F_ZipCode", SqlDbType.NVarChar,50),
119
+                    new SqlParameter("@F_DeleteFlag", SqlDbType.SmallInt,2),
116 120
 					new SqlParameter("@F_RegionId", SqlDbType.Int,4)};
117 121
             parameters[0].Value = model.F_AreaId;
118 122
             parameters[1].Value = model.F_RegionNumber;
@@ -125,8 +129,9 @@ namespace CallCenterApi.DAL
125 129
             parameters[8].Value = model.F_CreateOn;
126 130
             parameters[9].Value = model.F_ModifyBy;
127 131
             parameters[10].Value = model.F_ModifyOn;
128
-            parameters[11].Value = model.F_DeleteFlag;
129
-            parameters[12].Value = model.F_RegionId;
132
+            parameters[11].Value = model.F_ZipCode;
133
+            parameters[12].Value = model.F_DeleteFlag;
134
+            parameters[13].Value = model.F_RegionId;
130 135
 
131 136
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
132 137
             if (rows > 0)
@@ -303,6 +308,10 @@ namespace CallCenterApi.DAL
303 308
                 {
304 309
                     model.F_DeleteFlag = int.Parse(row["F_DeleteFlag"].ToString());
305 310
                 }
311
+                if (row["F_ZipCode"] != null && row["F_ZipCode"].ToString() != "")
312
+                {
313
+                    model.F_ZipCode = row["F_ZipCode"].ToString();
314
+                }
306 315
                 return model;
307 316
             }
308 317
             else

+ 17 - 7
codegit/CallCenterApi/CallCenterApi.DAL/T_Sys_MobileData.cs

@@ -38,9 +38,9 @@ namespace CallCenterApi.DAL
38 38
         {
39 39
             StringBuilder strSql = new StringBuilder();
40 40
             strSql.Append("insert into T_Sys_MobileData(");
41
-            strSql.Append("F_MobileNum,F_ZipCode,F_CityDes,F_CardDes,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime)");
41
+            strSql.Append("F_MobileNum,F_ZipCode,F_CityDes,F_CardDes,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_Regionld)");
42 42
             strSql.Append(" values (");
43
-            strSql.Append("@F_MobileNum,@F_ZipCode,@F_CityDes,@F_CardDes,@F_CreateUser,@F_CreateTime,@F_IsDelete,@F_DeleteUser,@F_DeleteTime)");
43
+            strSql.Append("@F_MobileNum,@F_ZipCode,@F_CityDes,@F_CardDes,@F_CreateUser,@F_CreateTime,@F_IsDelete,@F_DeleteUser,@F_DeleteTime,@F_Regionld)");
44 44
             strSql.Append(";select @@IDENTITY");
45 45
             SqlParameter[] parameters = {
46 46
                     new SqlParameter("@F_MobileNum", SqlDbType.VarChar,20),
@@ -51,6 +51,7 @@ namespace CallCenterApi.DAL
51 51
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
52 52
                     new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
53 53
                     new SqlParameter("@F_DeleteUser", SqlDbType.VarChar,50),
54
+                     new SqlParameter("@F_Regionld", SqlDbType.Int,4),
54 55
                     new SqlParameter("@F_DeleteTime", SqlDbType.DateTime)};
55 56
             parameters[0].Value = model.F_MobileNum;
56 57
             parameters[1].Value = model.F_ZipCode;
@@ -60,7 +61,8 @@ namespace CallCenterApi.DAL
60 61
             parameters[5].Value = model.F_CreateTime;
61 62
             parameters[6].Value = model.F_IsDelete;
62 63
             parameters[7].Value = model.F_DeleteUser;
63
-            parameters[8].Value = model.F_DeleteTime;
64
+            parameters[8].Value = model.F_Regionld;
65
+            parameters[9].Value = model.F_DeleteTime;
64 66
 
65 67
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
66 68
             if (obj == null)
@@ -87,6 +89,7 @@ namespace CallCenterApi.DAL
87 89
             strSql.Append("F_CreateTime=@F_CreateTime,");
88 90
             strSql.Append("F_IsDelete=@F_IsDelete,");
89 91
             strSql.Append("F_DeleteUser=@F_DeleteUser,");
92
+            strSql.Append("F_Regionld=@F_Regionld,");
90 93
             strSql.Append("F_DeleteTime=@F_DeleteTime");
91 94
             strSql.Append(" where F_Id=@F_Id");
92 95
             SqlParameter[] parameters = {
@@ -98,6 +101,7 @@ namespace CallCenterApi.DAL
98 101
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
99 102
                     new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
100 103
                     new SqlParameter("@F_DeleteUser", SqlDbType.VarChar,50),
104
+                     new SqlParameter("@F_Regionld", SqlDbType.Int,4),
101 105
                     new SqlParameter("@F_DeleteTime", SqlDbType.DateTime),
102 106
                     new SqlParameter("@F_Id", SqlDbType.Int,4)};
103 107
             parameters[0].Value = model.F_MobileNum;
@@ -108,8 +112,9 @@ namespace CallCenterApi.DAL
108 112
             parameters[5].Value = model.F_CreateTime;
109 113
             parameters[6].Value = model.F_IsDelete;
110 114
             parameters[7].Value = model.F_DeleteUser;
111
-            parameters[8].Value = model.F_DeleteTime;
112
-            parameters[9].Value = model.F_Id;
115
+            parameters[8].Value = model.F_Regionld;
116
+            parameters[9].Value = model.F_DeleteTime;
117
+            parameters[10].Value = model.F_Id;
113 118
 
114 119
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
115 120
             if (rows > 0)
@@ -191,7 +196,7 @@ namespace CallCenterApi.DAL
191 196
         {
192 197
 
193 198
             StringBuilder strSql = new StringBuilder();
194
-            strSql.Append("select  top 1 F_Id,F_MobileNum,F_ZipCode,F_CityDes,F_CardDes,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime from T_Sys_MobileData ");
199
+            strSql.Append("select  top 1 F_Id,F_MobileNum,F_ZipCode,F_CityDes,F_CardDes,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime ,F_Regionld from T_Sys_MobileData ");
195 200
             strSql.Append(" where F_Id=@F_Id");
196 201
             SqlParameter[] parameters = {
197 202
                     new SqlParameter("@F_Id", SqlDbType.Int,4)
@@ -223,6 +228,11 @@ namespace CallCenterApi.DAL
223 228
                 {
224 229
                     model.F_Id = int.Parse(row["F_Id"].ToString());
225 230
                 }
231
+                if (row["F_Regionld"] != null && row["F_Regionld"].ToString() != "")
232
+                {
233
+                    model.F_Regionld = int.Parse(row["F_Regionld"].ToString());
234
+                }
235
+                
226 236
                 if (row["F_MobileNum"] != null)
227 237
                 {
228 238
                     model.F_MobileNum = row["F_MobileNum"].ToString();
@@ -269,7 +279,7 @@ namespace CallCenterApi.DAL
269 279
         public DataSet GetList(string strWhere)
270 280
         {
271 281
             StringBuilder strSql = new StringBuilder();
272
-            strSql.Append("select F_Id,F_MobileNum,F_ZipCode,F_CityDes,F_CardDes,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime ");
282
+            strSql.Append("select F_Id,F_MobileNum,F_ZipCode,F_CityDes,F_CardDes,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime ,F_Regionld");
273 283
             strSql.Append(" FROM T_Sys_MobileData ");
274 284
             if (strWhere.Trim() != "")
275 285
             {

+ 49 - 4
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SeatGroupController.cs

@@ -80,7 +80,6 @@ namespace CallCenterApi.Interface.Controllers
80 80
             }
81 81
             return res;
82 82
         }
83
-
84 83
         /// <summary>
85 84
         /// 获取坐席组
86 85
         /// </summary>
@@ -91,13 +90,54 @@ namespace CallCenterApi.Interface.Controllers
91 90
             if (Request.IsAuthenticated)
92 91
             {
93 92
                 Model.T_Sys_SeatGroup sModel = seatBLL.GetModel(ZXZID);
93
+                string Region="";
94 94
                 if (sModel != null)
95
-                    return Success("获取坐席组信息成功", sModel);
95
+                {
96
+                    if (!string .IsNullOrEmpty (sModel.F_Region) )
97
+                    {
98
+                        string[] mRegion = sModel.F_Region.Split(',');
99
+                        if (mRegion.Length >0)
100
+                        {
101
+                            foreach (var it in mRegion)
102
+                            {
103
+                                if (int.Parse(it) < 32)
104
+                                {
105
+                                    var model = new BLL.T_RegionCategory().GetModel(int.Parse(it));
106
+                                    if (model != null)
107
+                                    {
108
+                                            if (Region == "")
109
+                                                Region = model.F_RegionName ;
110
+                                            else
111
+                                                Region = Region + "," + model.F_RegionName;
112
+                                    }
113
+                                }
114
+                               
115
+                            }
116
+                        }
117
+                    }
118
+                    var obj = new
119
+                    {
120
+                        sModel,
121
+                        Region
122
+                    };
123
+                    return Success("获取坐席组信息成功",
124
+                         obj);
125
+                }
126
+                  
96 127
                 return Error("获取坐席组信息失败");
97 128
             }
98 129
             return NoToken("未知错误,请重新登录");
99 130
         }
100
-
131
+        /// <summary>
132
+        /// 验证code是否唯一
133
+        /// </summary>
134
+        private bool getunphone( string ZXZCode)
135
+        {
136
+            var sql = " ";
137
+            sql += " (F_ZXZCode='" + ZXZCode + "')";
138
+            var count = seatBLL.GetModelList(sql).Count();
139
+            return count > 0;
140
+        }
101 141
         /// <summary>
102 142
         /// 添加坐席组
103 143
         /// </summary>
@@ -111,7 +151,12 @@ namespace CallCenterApi.Interface.Controllers
111 151
             {
112 152
                 Model.T_Sys_SeatGroup sModel = new Model.T_Sys_SeatGroup();
113 153
                 if (input.ZXZCode != null)
114
-                    sModel.F_ZXZCode = input.ZXZCode.Trim();
154
+                {
155
+                    if (getunphone( input.ZXZCode))
156
+                        return Error("已存在该编号勿重复添加");
157
+                    else
158
+                        sModel.F_ZXZCode = input.ZXZCode.Trim();
159
+                }
115 160
                 else
116 161
                 {
117 162
                     res = Error("编号不能为空");

+ 22 - 34
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

@@ -146,9 +146,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
146 146
                                 {
147 147
                                     detpid = ua.F_DeptId.ToString();
148 148
                                 }
149
-                                if (GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.neworder + "," + (int)EnumWorkOrderState.reassign + "") != "")
149
+                                if (GetDeptWorkOrderID(detpid) != "")
150 150
                                 {
151
-                                    sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.neworder + "," + (int)EnumWorkOrderState.reassign + "") + ") "; ;
151
+                                    sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid) + ") "; ;
152 152
                                 }
153 153
                                 else
154 154
                                 {
@@ -281,9 +281,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
281 281
                                 {
282 282
                                     detpid = ua.F_DeptId.ToString();
283 283
                                 }
284
-                                if (GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.evaluate + "") != "")
284
+                                if (GetDeptWorkOrderID(detpid) != "")
285 285
                                 {
286
-                                    sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.evaluate + "") + ") "; ;
286
+                                    sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid) + ") "; ;
287 287
                                 }
288 288
                                 else
289 289
                                 {
@@ -475,9 +475,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
475 475
                                 {
476 476
                                     detpid = ua.F_DeptId.ToString();
477 477
                                 }
478
-                                if (GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.evaluate + "") != "")
478
+                                if (GetDeptWorkOrderID(detpid) != "")
479 479
                                 {
480
-                                    sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.evaluate + "") + ") "; ;
480
+                                    sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid) + ") "; ;
481 481
                                 }
482 482
                                 else
483 483
                                 {
@@ -610,9 +610,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
610 610
                                     {
611 611
                                         detpid = ua.F_DeptId.ToString();
612 612
                                     }
613
-                                    if (GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.neworder + "," + (int)EnumWorkOrderState.reassign + "") != "")
613
+                                    if (GetDeptWorkOrderID(detpid) != "")
614 614
                                     {
615
-                                        sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.neworder + "," + (int)EnumWorkOrderState.reassign + "") + ") "; ;
615
+                                        sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid) + ") "; ;
616 616
                                     }
617 617
                                     else
618 618
                                     {
@@ -767,9 +767,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
767 767
                                     {
768 768
                                         detpid = ua.F_DeptId.ToString();
769 769
                                     }
770
-                                    if (GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.evaluate + "") != "")
770
+                                    if (GetDeptWorkOrderID(detpid) != "")
771 771
                                     {
772
-                                        sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.evaluate + "") + ") "; ;
772
+                                        sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid) + ") "; ;
773 773
                                     }
774 774
                                     else
775 775
                                     {
@@ -984,11 +984,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
984 984
                                     {
985 985
                                         detpid = ua.F_DeptId.ToString();
986 986
                                     }
987
-                                    if (GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.dealing + ", " + (int)EnumWorkOrderState.receive + "," +
988
-                            (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "") != "")
987
+                                    if (GetDeptWorkOrderID(detpid) != "")
989 988
                                     {
990
-                                        sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," +
991
-                            (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "") + ") "; ;
989
+                                        sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid) + ") "; ;
992 990
                                     }
993 991
                                     else
994 992
                                     {
@@ -1072,14 +1070,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
1072 1070
                                         detpid = ua.F_DeptId.ToString();
1073 1071
                                     }
1074 1072
                                
1075
-                                        if (GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.neworder + ", " + (int)EnumWorkOrderState.assign + "," +
1076
-                            (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.finish
1077
-                            + "," + (int)EnumWorkOrderState.evaluate + "") != "")
1073
+                                        if (GetDeptWorkOrderID(detpid) != "")
1078 1074
                                         {
1079 1075
 
1080
-                                            sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.neworder + ", " + (int)EnumWorkOrderState.assign + "," +
1081
-                            (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.finish
1082
-                            + "," + (int)EnumWorkOrderState.evaluate + "") + ") ";
1076
+                                            sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid) + ") ";
1083 1077
                                         }
1084 1078
                                         else
1085 1079
                                         {
@@ -2236,7 +2230,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
2236 2230
         /// 根据部门获取工单号
2237 2231
         /// </summary>
2238 2232
         /// <returns></returns>
2239
-        public string GetDeptWorkOrderID(string user,string F_ItemType)
2233
+        public string GetDeptWorkOrderID(string user)
2240 2234
         {
2241 2235
             string sql = " ";
2242 2236
             string ua = "";
@@ -2269,7 +2263,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
2269 2263
             }
2270 2264
             string str = string.Empty;
2271 2265
             str = "select F_WoID from T_Wo_WorkOrderItem_New where "
2272
-                     + "F_CreateUser in(" + ua + ") and F_IsUsed=0"
2266
+                     + "F_CreateUser in(" + ua + ") "
2273 2267
                ;
2274 2268
 
2275 2269
             return str;
@@ -2625,10 +2619,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
2625 2619
                         }
2626 2620
                         if (state >= 0)
2627 2621
                         {
2628
-                            if (GetDeptWorkOrderID(detpid, "" + state + "") != "")
2622
+                            if (GetDeptWorkOrderID(detpid) != "")
2629 2623
                             {
2630 2624
 
2631
-                                sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid, "" + state + "") + ") ";
2625
+                                sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid) + ") ";
2632 2626
                             }
2633 2627
                             else
2634 2628
                             {
@@ -2638,14 +2632,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
2638 2632
                         }
2639 2633
                         else
2640 2634
                         {
2641
-                            if (GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.neworder + ", " + (int)EnumWorkOrderState.assign + "," +
2642
-                (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.finish
2643
-                + "," + (int)EnumWorkOrderState.evaluate + "") != "")
2635
+                            if (GetDeptWorkOrderID(detpid) != "")
2644 2636
                             {
2645 2637
 
2646
-                                sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.neworder + ", " + (int)EnumWorkOrderState.assign + "," +
2647
-                (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.finish
2648
-                + "," + (int)EnumWorkOrderState.evaluate + "") + ") ";
2638
+                                sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid) + ") ";
2649 2639
                             }
2650 2640
                             else
2651 2641
                             {
@@ -2802,11 +2792,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
2802 2792
                         {
2803 2793
                             detpid = ua.F_DeptId.ToString ();
2804 2794
                         }
2805
-                        if (GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.dealing + ", " + (int)EnumWorkOrderState.receive + "," +
2806
-                (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "") != "")
2795
+                        if (GetDeptWorkOrderID(detpid) != "")
2807 2796
                         {
2808
-                            sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," +
2809
-                (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "") + ") "; ;
2797
+                            sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid) + ") "; ;
2810 2798
                         }
2811 2799
                         else
2812 2800
                         {

+ 9 - 0
codegit/CallCenterApi/CallCenterApi.Model/T_RegionCategory.cs

@@ -27,6 +27,7 @@ namespace CallCenterApi.Model
27 27
         private int? _f_modifyby;
28 28
         private DateTime? _f_modifyon = DateTime.Now;
29 29
         private int? _f_deleteflag = 0;
30
+        private string _f_zipCode;
30 31
         /// <summary>
31 32
         /// 
32 33
         /// </summary>
@@ -38,6 +39,14 @@ namespace CallCenterApi.Model
38 39
         /// <summary>
39 40
         /// 
40 41
         /// </summary>
42
+        public string F_ZipCode
43
+        {
44
+            set { _f_zipCode = value; }
45
+            get { return _f_zipCode; }
46
+        }
47
+        /// <summary>
48
+        /// 
49
+        /// </summary>
41 50
         public int? F_AreaId
42 51
         {
43 52
             set { _f_areaid = value; }

+ 9 - 0
codegit/CallCenterApi/CallCenterApi.Model/T_Sys_MobileData.cs

@@ -20,6 +20,7 @@ namespace CallCenterApi.Model
20 20
         private int? _f_isdelete;
21 21
         private string _f_deleteuser;
22 22
         private DateTime? _f_deletetime;
23
+        private int _f_regionld;
23 24
         /// <summary>
24 25
         /// 
25 26
         /// </summary>
@@ -31,6 +32,14 @@ namespace CallCenterApi.Model
31 32
         /// <summary>
32 33
         /// 
33 34
         /// </summary>
35
+        public int F_Regionld
36
+        {
37
+            set { _f_regionld = value; }
38
+            get { return _f_regionld; }
39
+        }
40
+        /// <summary>
41
+        /// 
42
+        /// </summary>
34 43
         public string F_MobileNum
35 44
         {
36 45
             set { _f_mobilenum = value; }