Browse Source

更新代码

zhangkun 5 years ago
parent
commit
db5f61b8f3

BIN
data/工单流程图/工单流程图1.0.eddx


BIN
data/工单流程图/工单流程图1.0.jpg


+ 7 - 2
data/数据迁移准备sql/二期/T_Wo_WorkOrderNotice.txt

@@ -27,6 +27,7 @@ CREATE TABLE [dbo].[T_Wo_WorkOrderNotice](
27 27
 	[Remark3] [varchar](500) NOT NULL,
28 28
 	[Remark4] [varchar](500) NOT NULL,
29 29
 	[Remark5] [varchar](500) NOT NULL,
30
+	[DZNumber] [int] NOT NULL,
30 31
  CONSTRAINT [PK_T_Wo_WorkOrderNotice_1] PRIMARY KEY CLUSTERED 
31 32
 (
32 33
 	[NoticeId] ASC
@@ -86,12 +87,15 @@ GO
86 87
 EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'定责处理结果' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'T_Wo_WorkOrderNotice', @level2type=N'COLUMN',@level2name=N'DealResult'
87 88
 GO
88 89
 
89
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'是否有效 0无效 1有效  默认有效     三次定责,每次定责都要让之前的定责单失效' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'T_Wo_WorkOrderNotice', @level2type=N'COLUMN',@level2name=N'NoticeState'
90
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'是否有效1有效  默认有效     三次定责,每次定责都要让之前的定责单失效' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'T_Wo_WorkOrderNotice', @level2type=N'COLUMN',@level2name=N'NoticeState'
90 91
 GO
91 92
 
92 93
 EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'添加时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'T_Wo_WorkOrderNotice', @level2type=N'COLUMN',@level2name=N'Addtime'
93 94
 GO
94 95
 
96
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'定责次数' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'T_Wo_WorkOrderNotice', @level2type=N'COLUMN',@level2name=N'DZNumber'
97
+GO
98
+
95 99
 ALTER TABLE [dbo].[T_Wo_WorkOrderNotice] ADD  CONSTRAINT [DF_T_Wo_WorkOrderNotice_OrderId]  DEFAULT ((0)) FOR [OrderId]
96 100
 GO
97 101
 
@@ -170,4 +174,5 @@ GO
170 174
 ALTER TABLE [dbo].[T_Wo_WorkOrderNotice] ADD  CONSTRAINT [DF_T_Wo_WorkOrderNotice_Remark5]  DEFAULT ('') FOR [Remark5]
171 175
 GO
172 176
 
173
-
177
+ALTER TABLE [dbo].[T_Wo_WorkOrderNotice] ADD  CONSTRAINT [DF_T_Wo_WorkOrderNotice_DZNumber]  DEFAULT ((1)) FOR [DZNumber]
178
+GO

+ 10 - 3
web/BaseCallCenter.BLL/Order/T_Wo_WorkOrderNotice.cs

@@ -35,11 +35,18 @@ namespace YTSoft.BaseCallCenter.BLL
35 35
         {
36 36
             return dal.Update(model);
37 37
         }
38
-
39 38
         /// <summary>
40
-        /// 删除一条数据
39
+        /// 更新定责次数
41 40
         /// </summary>
42
-        public bool Delete(int NoticeId)
41
+        public bool updatenum(int orderid)
42
+        {
43
+            return dal.updatenum(orderid);
44
+        }
45
+
46
+            /// <summary>
47
+            /// 删除一条数据
48
+            /// </summary>
49
+            public bool Delete(int NoticeId)
43 50
         {
44 51
 
45 52
             return dal.Delete(NoticeId);

+ 42 - 9
web/BaseCallCenter.DAL/Order/T_Wo_WorkOrderNotice.cs

@@ -37,11 +37,10 @@ namespace YTSoft.BaseCallCenter.DAL
37 37
         public int Add(YTSoft.BaseCallCenter.Model.T_Wo_WorkOrderNotice model)
38 38
         {
39 39
             StringBuilder strSql = new StringBuilder();
40
-            strSql.Append("UPDATE T_Wo_WorkOrderNotice SET NoticeState=0 WHERE NoticeDeptId=@NoticeDeptId AND OrderId=@OrderId;");
41 40
             strSql.Append("insert into T_Wo_WorkOrderNotice(");
42
-            strSql.Append("OrderId,HistoryID,NoticeUserid,NoticeUsername,NoticeDeptId,NoticeDeptName,NoticeDeptContent,NoticeDeptAdvise,Class1,Class2,Class3,ClassId1,ClassId2,ClassId3,NoticeType,Userid,Username,DealAdvise,DealResult,NoticeState,Addtime,Remark1,Remark2,Remark3,Remark4,Remark5)");
41
+            strSql.Append("OrderId,HistoryID,NoticeUserid,NoticeUsername,NoticeDeptId,NoticeDeptName,NoticeDeptContent,NoticeDeptAdvise,Class1,Class2,Class3,ClassId1,ClassId2,ClassId3,NoticeType,Userid,Username,DealAdvise,DealResult,NoticeState,Addtime,Remark1,Remark2,Remark3,Remark4,Remark5,DZNumber)");
43 42
             strSql.Append(" values (");
44
-            strSql.Append("@OrderId,@HistoryID,@NoticeUserid,@NoticeUsername,@NoticeDeptId,@NoticeDeptName,@NoticeDeptContent,@NoticeDeptAdvise,@Class1,@Class2,@Class3,@ClassId1,@ClassId2,@ClassId3,@NoticeType,@Userid,@Username,@DealAdvise,@DealResult,@NoticeState,@Addtime,@Remark1,@Remark2,@Remark3,@Remark4,@Remark5)");
43
+            strSql.Append("@OrderId,@HistoryID,@NoticeUserid,@NoticeUsername,@NoticeDeptId,@NoticeDeptName,@NoticeDeptContent,@NoticeDeptAdvise,@Class1,@Class2,@Class3,@ClassId1,@ClassId2,@ClassId3,@NoticeType,@Userid,@Username,@DealAdvise,@DealResult,@NoticeState,@Addtime,@Remark1,@Remark2,@Remark3,@Remark4,@Remark5,@DZNumber)");
45 44
             strSql.Append(";select @@IDENTITY");
46 45
             SqlParameter[] parameters = {
47 46
                     new SqlParameter("@OrderId", SqlDbType.Int,4),
@@ -69,7 +68,8 @@ namespace YTSoft.BaseCallCenter.DAL
69 68
                     new SqlParameter("@Remark2", SqlDbType.VarChar,500),
70 69
                     new SqlParameter("@Remark3", SqlDbType.VarChar,500),
71 70
                     new SqlParameter("@Remark4", SqlDbType.VarChar,500),
72
-                    new SqlParameter("@Remark5", SqlDbType.VarChar,500)};
71
+                    new SqlParameter("@Remark5", SqlDbType.VarChar,500),
72
+                    new SqlParameter("@DZNumber", SqlDbType.Int,4)};
73 73
             parameters[0].Value = model.OrderId;
74 74
             parameters[1].Value = model.HistoryID;
75 75
             parameters[2].Value = model.NoticeUserid;
@@ -96,6 +96,7 @@ namespace YTSoft.BaseCallCenter.DAL
96 96
             parameters[23].Value = model.Remark3;
97 97
             parameters[24].Value = model.Remark4;
98 98
             parameters[25].Value = model.Remark5;
99
+            parameters[26].Value = model.DZNumber;
99 100
 
100 101
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
101 102
             if (obj == null)
@@ -139,7 +140,8 @@ namespace YTSoft.BaseCallCenter.DAL
139 140
             strSql.Append("Remark2=@Remark2,");
140 141
             strSql.Append("Remark3=@Remark3,");
141 142
             strSql.Append("Remark4=@Remark4,");
142
-            strSql.Append("Remark5=@Remark5");
143
+            strSql.Append("Remark5=@Remark5,");
144
+            strSql.Append("DZNumber=@DZNumber");
143 145
             strSql.Append(" where NoticeId=@NoticeId");
144 146
             SqlParameter[] parameters = {
145 147
                     new SqlParameter("@OrderId", SqlDbType.Int,4),
@@ -168,6 +170,7 @@ namespace YTSoft.BaseCallCenter.DAL
168 170
                     new SqlParameter("@Remark3", SqlDbType.VarChar,500),
169 171
                     new SqlParameter("@Remark4", SqlDbType.VarChar,500),
170 172
                     new SqlParameter("@Remark5", SqlDbType.VarChar,500),
173
+                    new SqlParameter("@DZNumber", SqlDbType.Int,4),
171 174
                     new SqlParameter("@NoticeId", SqlDbType.Int,4)};
172 175
             parameters[0].Value = model.OrderId;
173 176
             parameters[1].Value = model.HistoryID;
@@ -195,7 +198,33 @@ namespace YTSoft.BaseCallCenter.DAL
195 198
             parameters[23].Value = model.Remark3;
196 199
             parameters[24].Value = model.Remark4;
197 200
             parameters[25].Value = model.Remark5;
198
-            parameters[26].Value = model.NoticeId;
201
+            parameters[26].Value = model.DZNumber;
202
+            parameters[27].Value = model.NoticeId;
203
+
204
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
205
+            if (rows > 0)
206
+            {
207
+                return true;
208
+            }
209
+            else
210
+            {
211
+                return false;
212
+            }
213
+        }
214
+
215
+        /// <summary>
216
+        /// 更新定责次数
217
+        /// </summary>
218
+        public bool updatenum(int orderid)
219
+        {
220
+
221
+            StringBuilder strSql = new StringBuilder();
222
+            strSql.Append(" update T_Wo_WorkOrderNotice ");
223
+            strSql.Append(" set NoticeState=0,DZNumber=DZNumber+1 ");
224
+            strSql.Append(" where OrderId=@OrderId");
225
+            SqlParameter[] parameters = {
226
+                    new SqlParameter("@OrderId",orderid)
227
+            };
199 228
 
200 229
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
201 230
             if (rows > 0)
@@ -259,7 +288,7 @@ namespace YTSoft.BaseCallCenter.DAL
259 288
         {
260 289
 
261 290
             StringBuilder strSql = new StringBuilder();
262
-            strSql.Append("select  top 1 NoticeId,OrderId,HistoryID,NoticeUserid,NoticeUsername,NoticeDeptId,NoticeDeptName,NoticeDeptContent,NoticeDeptAdvise,Class1,Class2,Class3,ClassId1,ClassId2,ClassId3,NoticeType,Userid,Username,DealAdvise,DealResult,NoticeState,Addtime,Remark1,Remark2,Remark3,Remark4,Remark5 from T_Wo_WorkOrderNotice ");
291
+            strSql.Append("select  top 1 NoticeId,OrderId,HistoryID,NoticeUserid,NoticeUsername,NoticeDeptId,NoticeDeptName,NoticeDeptContent,NoticeDeptAdvise,Class1,Class2,Class3,ClassId1,ClassId2,ClassId3,NoticeType,Userid,Username,DealAdvise,DealResult,NoticeState,Addtime,Remark1,Remark2,Remark3,Remark4,Remark5,DZNumber from T_Wo_WorkOrderNotice ");
263 292
             strSql.Append(" where NoticeId=@NoticeId");
264 293
             SqlParameter[] parameters = {
265 294
                     new SqlParameter("@NoticeId", SqlDbType.Int,4)
@@ -395,6 +424,10 @@ namespace YTSoft.BaseCallCenter.DAL
395 424
                 {
396 425
                     model.Remark5 = row["Remark5"].ToString();
397 426
                 }
427
+                if (row["DZNumber"] != null && row["DZNumber"].ToString() != "")
428
+                {
429
+                    model.DZNumber = int.Parse(row["DZNumber"].ToString());
430
+                }
398 431
             }
399 432
             return model;
400 433
         }
@@ -405,7 +438,7 @@ namespace YTSoft.BaseCallCenter.DAL
405 438
         public DataSet GetList(string strWhere)
406 439
         {
407 440
             StringBuilder strSql = new StringBuilder();
408
-            strSql.Append("select NoticeId,OrderId,HistoryID,NoticeUserid,NoticeUsername,NoticeDeptId,NoticeDeptName,NoticeDeptContent,NoticeDeptAdvise,Class1,Class2,Class3,ClassId1,ClassId2,ClassId3,NoticeType,Userid,Username,DealAdvise,DealResult,NoticeState,Addtime,Remark1,Remark2,Remark3,Remark4,Remark5 ");
441
+            strSql.Append("select NoticeId,OrderId,HistoryID,NoticeUserid,NoticeUsername,NoticeDeptId,NoticeDeptName,NoticeDeptContent,NoticeDeptAdvise,Class1,Class2,Class3,ClassId1,ClassId2,ClassId3,NoticeType,Userid,Username,DealAdvise,DealResult,NoticeState,Addtime,Remark1,Remark2,Remark3,Remark4,Remark5,DZNumber ");
409 442
             strSql.Append(" FROM T_Wo_WorkOrderNotice ");
410 443
             if (strWhere.Trim() != "")
411 444
             {
@@ -425,7 +458,7 @@ namespace YTSoft.BaseCallCenter.DAL
425 458
             {
426 459
                 strSql.Append(" top " + Top.ToString());
427 460
             }
428
-            strSql.Append(" NoticeId,OrderId,HistoryID,NoticeUserid,NoticeUsername,NoticeDeptId,NoticeDeptName,NoticeDeptContent,NoticeDeptAdvise,Class1,Class2,Class3,ClassId1,ClassId2,ClassId3,NoticeType,Userid,Username,DealAdvise,DealResult,NoticeState,Addtime,Remark1,Remark2,Remark3,Remark4,Remark5 ");
461
+            strSql.Append(" NoticeId,OrderId,HistoryID,NoticeUserid,NoticeUsername,NoticeDeptId,NoticeDeptName,NoticeDeptContent,NoticeDeptAdvise,Class1,Class2,Class3,ClassId1,ClassId2,ClassId3,NoticeType,Userid,Username,DealAdvise,DealResult,NoticeState,Addtime,Remark1,Remark2,Remark3,Remark4,Remark5,DZNumber ");
429 462
             strSql.Append(" FROM T_Wo_WorkOrderNotice ");
430 463
             if (strWhere.Trim() != "")
431 464
             {

+ 24 - 6
web/BaseCallCenter.DAL/T_Wo_WorkOrderBase.cs

@@ -12,6 +12,7 @@ namespace YTSoft.BaseCallCenter.DAL
12 12
     {
13 13
         DAL.T_Sys_UserAccount userBll = new DAL.T_Sys_UserAccount();
14 14
         DAL.T_Sys_Department depBll = new DAL.T_Sys_Department();
15
+        DAL.T_Wo_WorkOrderNotice NoticeBll = new DAL.T_Wo_WorkOrderNotice();
15 16
         public T_Wo_WorkOrderBase()
16 17
         { }
17 18
         #region  Method
@@ -1417,8 +1418,25 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
1417 1418
             //历史工单id
1418 1419
             int historyId = 0;
1419 1420
 
1420
-            //转办
1421
-            if (model.F_WORKORDERTYPEID == 1 && model.F_WORKORDERSTATEID > 0)
1421
+            if (model.F_HOUSING == "表扬"|| model.F_HOUSING == "咨询" || model.F_HOUSING == "挂失")
1422
+            {
1423
+                if (model.F_WORKORDERTYPEID == 3 && model.F_WORKORDERSTATEID > 0)
1424
+                {
1425
+                    if (model.F_HOUSING == "表扬")
1426
+                    {
1427
+                        Model.T_Wo_WorkOrderNotice modelNotice = new Model.T_Wo_WorkOrderNotice();
1428
+                        modelNotice.OrderId = model.F_WORKORDERID;
1429
+                        modelNotice.NoticeType = 0;
1430
+                        modelNotice.NoticeState = 1;
1431
+                        modelNotice.NoticeDeptName = model.F_DEPTCODE;
1432
+                        modelNotice.NoticeDeptId = model.F_DEPTID.ToInt32();
1433
+                        NoticeBll.Add(modelNotice);
1434
+                    }
1435
+                    model.F_WORKORDERSTATEID = 2;
1436
+                    model.F_REPAIRREQUEST = "已办结";
1437
+                }
1438
+            }
1439
+            else   if (model.F_WORKORDERTYPEID == 1 && model.F_WORKORDERSTATEID > 0)
1422 1440
             {
1423 1441
                 //Model.T_Wo_WorkOrderHistory historyModel = new Model.T_Wo_WorkOrderHistory();
1424 1442
                 //historyModel.F_INSTANCEID = model.F_WORKORDERID;
@@ -1806,7 +1824,7 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
1806 1824
             SqlParameter[] parameters = {
1807 1825
                     new SqlParameter("@F_REMAINDERENDTIME",model.F_REMAINDERENDTIME),
1808 1826
                     new SqlParameter("@F_RETURNVISITRESULT", model.F_RETURNVISITRESULT),
1809
-                    new SqlParameter("@F_ROAD", model.F_ROAD),
1827
+                    new SqlParameter("@F_ROAD", ""),
1810 1828
                     new SqlParameter("@F_RETURNVISITOPINION", model.F_RETURNVISITOPINION),
1811 1829
                     new SqlParameter("@F_REPAIRREQUEST","回访转单处理中"),
1812 1830
                     new SqlParameter("@F_WORKORDERID", model.F_WORKORDERID)};
@@ -1832,7 +1850,7 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
1832 1850
             SqlParameter[] parameters = {
1833 1851
                     new SqlParameter("@F_REMAINDERENDTIME",model.F_REMAINDERENDTIME),
1834 1852
                     new SqlParameter("@F_RETURNVISITRESULT", model.F_RETURNVISITRESULT),
1835
-                    new SqlParameter("@F_ROAD", model.F_ROAD),
1853
+                    new SqlParameter("@F_ROAD", ""),//原为满意度,前端没有用,后用作定责人员
1836 1854
                     new SqlParameter("@F_RETURNVISITOPINION", model.F_RETURNVISITOPINION),
1837 1855
                     new SqlParameter("@F_REPAIRREQUEST","待定责"),
1838 1856
                     new SqlParameter("@F_WORKORDERID", model.F_WORKORDERID)};
@@ -1960,7 +1978,7 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
1960 1978
                 strSql.Append("update T_Wo_WorkOrderBase set ");
1961 1979
                 strSql.Append("F_REMAINDERENDTIME=@F_REMAINDERENDTIME,");
1962 1980
                 strSql.Append("F_RETURNVISITRESULT=@F_RETURNVISITRESULT,");
1963
-                strSql.Append("F_ROAD=@F_ROAD,");
1981
+                //strSql.Append("F_ROAD=@F_ROAD,");
1964 1982
                 strSql.Append("F_RETURNVISITOPINION=@F_RETURNVISITOPINION,");
1965 1983
                 strSql.Append("F_WORKORDERSTATEID=@F_WORKORDERSTATEID,");
1966 1984
                 strSql.Append("F_REPAIRREQUEST=@F_REPAIRREQUEST");
@@ -2054,7 +2072,7 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
2054 2072
             strSql.Append("F_RETURNVISITTIME =@F_RETURNVISITTIME,");
2055 2073
             strSql.Append("F_REMAINDERENDTIME=@F_REMAINDERENDTIME,");
2056 2074
             strSql.Append("F_RETURNVISITRESULT=@F_RETURNVISITRESULT,");
2057
-            strSql.Append("F_ROAD=@F_ROAD,");
2075
+            //strSql.Append("F_ROAD=@F_ROAD,");
2058 2076
             strSql.Append("F_RETURNVISITOPINION=@F_RETURNVISITOPINION,");
2059 2077
             strSql.Append("F_FILEFLAG =@F_FILEFLAG,");
2060 2078
             strSql.Append("F_HOUSING =@F_HOUSING,");//F_RETURNVISITCONTENT 处理回复

+ 11 - 6
web/BaseCallCenter.Model/Order/T_Wo_WorkOrderNotice.cs

@@ -3,9 +3,6 @@ using System.Collections.Generic;
3 3
 
4 4
 namespace YTSoft.BaseCallCenter.Model
5 5
 {
6
-    /// <summary>
7
-    /// T_Wo_WorkOrderNotice:实体类(属性说明自动提取数据库字段的描述信息)
8
-    /// </summary>
9 6
     [Serializable]
10 7
     public partial class T_Wo_WorkOrderNotice
11 8
     {
@@ -39,6 +36,7 @@ namespace YTSoft.BaseCallCenter.Model
39 36
         private string _remark3 = "";
40 37
         private string _remark4 = "";
41 38
         private string _remark5 = "";
39
+        private int _dznumber = 1;
42 40
         /// <summary>
43 41
         /// 
44 42
         /// </summary>
@@ -192,7 +190,7 @@ namespace YTSoft.BaseCallCenter.Model
192 190
             get { return _dealadvise; }
193 191
         }
194 192
         /// <summary>
195
-        /// 定责结果
193
+        /// 定责处理结果
196 194
         /// </summary>
197 195
         public string DealResult
198 196
         {
@@ -200,7 +198,7 @@ namespace YTSoft.BaseCallCenter.Model
200 198
             get { return _dealresult; }
201 199
         }
202 200
         /// <summary>
203
-        /// 是否有效 0无效 1有效  默认有效     三次定责,每次定责都要让之前的定责单失效
201
+        /// 是否有效1有效  默认有效     三次定责,每次定责都要让之前的定责单失效
204 202
         /// </summary>
205 203
         public int NoticeState
206 204
         {
@@ -255,10 +253,17 @@ namespace YTSoft.BaseCallCenter.Model
255 253
             set { _remark5 = value; }
256 254
             get { return _remark5; }
257 255
         }
256
+        /// <summary>
257
+        /// 定责次数
258
+        /// </summary>
259
+        public int DZNumber
260
+        {
261
+            set { _dznumber = value; }
262
+            get { return _dznumber; }
263
+        }
258 264
         #endregion Model
259 265
 
260 266
     }
261
-
262 267
     public partial class T_Wo_WorkOrderNoticeInput
263 268
     {
264 269
         public List<T_Wo_WorkOrderNotice> Noticelist { get; set; }

+ 2 - 2
web/BaseCallCenter.Model/T_Wo_WorkOrderBase.cs

@@ -322,7 +322,7 @@ namespace YTSoft.BaseCallCenter.Model
322 322
 
323 323
 
324 324
         /// <summary>
325
-        /// 0未处理 1处理中  2已办结(结束) 3待回访 4待定责 5待通知 
325
+        /// 0未处理 1处理中  2已办结(结束) 3待回访 4待定责 5已定责
326 326
         /// </summary>
327 327
         public int? F_WORKORDERSTATEID
328 328
         {
@@ -481,7 +481,7 @@ namespace YTSoft.BaseCallCenter.Model
481 481
         }
482 482
 
483 483
         /// <summary>
484
-        /// 满意度
484
+        /// 原为满意度,前端没有用,后用作定责人员
485 485
         /// </summary>
486 486
         public string F_ROAD
487 487
         {

+ 2 - 2
web/YTSoft.BaseCallCenter.MVCWeb/Controllers/CallRecordController.cs

@@ -261,7 +261,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
261 261
         }
262 262
 
263 263
         /// <summary>
264
-        /// 编辑历史工单
264
+        /// 撤回历史工单
265 265
         /// </summary>
266 266
         /// <param name="workOrderBaseModel"></param>
267 267
         /// <returns></returns>
@@ -271,7 +271,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
271 271
             bool result = false;;
272 272
             int byid = F_UserID;
273 273
             string bycode = F_UserCode; 
274
-            string byname = HttpUtility.UrlDecode(F_UserName);
274
+            string byname =F_UserName;
275 275
             int bmid = F_DeptId;
276 276
             string bmmc = "";
277 277
             if (byid>0) {

+ 362 - 5
web/YTSoft.BaseCallCenter.MVCWeb/Controllers/Order/OrderController.cs

@@ -374,7 +374,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
374 374
         }
375 375
 
376 376
         /// <summary>
377
-        /// 获取待回访工单
377
+        /// 定责视图
378 378
         /// </summary>
379 379
         /// <param name="dtype">工单类型 1、所有待办工单 2、代办结工单</param>
380 380
         /// <returns></returns>
@@ -408,8 +408,9 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
408 408
             modelorder.F_CITY = modelinput.ClassName2;
409 409
             modelorder.F_AREA = modelinput.ClassName3;           
410 410
             #endregion
411
-            if (modelinput.Noticelist != null)
411
+            if (modelinput.Noticelist != null&& modelinput.Noticelist.Count>0)
412 412
             {
413
+                noticeBLL.updatenum(modelinput.orderid);
413 414
                 foreach (T_Wo_WorkOrderNotice model in modelinput.Noticelist)
414 415
                 {
415 416
                     T_Wo_WorkOrderNotice modeladd = new T_Wo_WorkOrderNotice();
@@ -585,12 +586,364 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
585 586
                 return orderBLL.UpdateDZuser(model);
586 587
             }
587 588
         }
588
-       
589
-        
590
-        
589
+
590
+
591
+
591 592
         #endregion
592 593
 
594
+        #region 已定责
595
+
596
+        /// <summary>
597
+        /// 已定责视图
598
+        /// </summary>
599
+        /// <param name="dtype">工单类型 1、所有待办工单 2、代办结工单</param>
600
+        /// <returns></returns>
601
+        public ActionResult WorkOrderMyListDZ1(int dtype)
602
+        {
603
+            WorkOrderMyModel model = new WorkOrderMyModel();
604
+            model.DType = dtype;
605
+            //业务类型字典表
606
+            model.WorkOrderTypeModelList = GetWorkTypeModelList();
607
+            //话务标志
608
+            model.SeatFlag = F_SeatFlag;
609
+            return View(model);
610
+        }
611
+
612
+        /// <summary>
613
+        /// 录入定责结果
614
+        /// </summary>
615
+        /// <param name="workOrderBaseModel"></param>
616
+        /// <returns></returns>
617
+        [AcceptVerbs(HttpVerbs.Post)]
618
+        public bool SubmitOrderDZ1(T_Wo_WorkOrderNoticeInput modelinput)
619
+        {
620
+            if (modelinput.orderid == 0)
621
+            {
622
+                return false;
623
+            }
624
+            #region 处理工单事件分类
625
+            Model.T_Wo_WorkOrderBase modelorder = new T_Wo_WorkOrderBase();
626
+            modelorder.F_WORKORDERID = modelinput.orderid;
627
+            modelorder.F_PROVINCE = modelinput.ClassName1;
628
+            modelorder.F_CITY = modelinput.ClassName2;
629
+            modelorder.F_AREA = modelinput.ClassName3;
630
+            #endregion
631
+            if (modelinput.Noticelist != null)
632
+            {
633
+                noticeBLL.updatenum(modelinput.orderid);
634
+                foreach (T_Wo_WorkOrderNotice model in modelinput.Noticelist)
635
+                {
636
+                    T_Wo_WorkOrderNotice modeladd = new T_Wo_WorkOrderNotice();
637
+
638
+                    #region 前端传入参数
639
+                    modeladd.OrderId = modelinput.orderid;
640
+                    modeladd.DealAdvise = model.DealAdvise;
641
+                    modeladd.DealResult = model.DealResult;
642
+                    modeladd.NoticeDeptId = model.NoticeDeptId;
643
+                    modeladd.NoticeDeptName = model.NoticeDeptName;
644
+
645
+                    #endregion
646
+
647
+                    modeladd.NoticeState = 1;
648
+                    modeladd.NoticeType = 1;
649
+                    modeladd.Userid = F_UserID;
650
+                    modeladd.Username = F_UserName;
651
+                    List<T_Wo_WorkOrderHistory> modelhisList = historyBll.GetModelList(string.Format(" F_INSTANCEID={0} AND F_OPTBTNID={1}", model.OrderId, model.NoticeDeptId));
652
+                    foreach (T_Wo_WorkOrderHistory modelhis in modelhisList)
653
+                    {
654
+                        modeladd.NoticeDeptContent += modelhis.F_REMARK;
655
+                        modeladd.NoticeDeptAdvise += modelhis.F_REMARK;
656
+                        modeladd.NoticeUserid = modelhis.F_OPTUSERID.ToInt32();
657
+                        modeladd.NoticeUsername = modelhis.F_UserName;
658
+                    }
659
+                    noticeBLL.Add(modeladd);
660
+
661
+                }
662
+            }
663
+            return orderBLL.UpdateDZClass(modelorder);
664
+        }
665
+
666
+
667
+        /// <summary>
668
+        /// 已定责列表
669
+        /// </summary>
670
+        /// <param name="page">当前页码</param>
671
+        /// <param name="limit">每页数据量</param>
672
+        /// <param name="sqlWhere">查询条件</param>
673
+        /// <returns></returns>
674
+        [ActionName("WorkOrderMyDataDZ1")]
675
+        [HttpGet]
676
+        public string WorkOrderMyDataDZ1(DateTime? NowDateTime, int page, int limit, int? types, string dateParty,
677
+            string workorderNum, string cusName, string phoneNumber,
678
+            string userInfo, int? bussType, int? detailType, string Content)
679
+        {
680
+
681
+            //数据结果集
682
+            ResponseData dataModel = new ResponseData();
683
+
684
+            //F_FILEFLAG 业务类型ID
685
+            //F_WORKORDERSTATEID   0未处理 1处理中  2已办结 status
686
+            //F_WORKORDERTYPEID 处理方式  1转单 3客服处理 GoType
687
+            //F_REPAIRMANID 接入渠道 1语音 2留言  3微信 4微博 FromType
688
+            //string sql = string.Format(" and F_WORKORDERTYPEID=1 and F_WORKORDERSTATEID=1 and F_WORKORDERID in (select F_INSTANCEID from T_Wo_WorkOrderHistory where F_WORKORDERSTATEID=0 and F_OPTUSERID={0})", F_UserID);
689
+
690
+            string sql = string.Format(" and F_WORKORDERTYPEID=3 and F_WORKORDERSTATEID=5 and F_ROAD='{0}'", F_UserID);
691
+
692
+
693
+            //工单编号
694
+            if (!string.IsNullOrEmpty(workorderNum))
695
+            {
696
+                sql += " and F_CODE like '%" + workorderNum.Trim() + "%'";
697
+            }
698
+            //客户姓名
699
+            if (!string.IsNullOrEmpty(cusName))
700
+            {
701
+                sql += " and F_CUSTOMERNAME like '%" + cusName.Trim() + "%'";
702
+            }
703
+            //客户电话
704
+            if (!string.IsNullOrEmpty(phoneNumber))
705
+            {
706
+                sql += " and F_CUSTOMERTELEPHONE like '%" + phoneNumber.Trim() + "%'";
707
+            }
708
+            //坐席工号
709
+            if (!string.IsNullOrEmpty(userInfo))
710
+            {
711
+                sql += " and F_LINKMAN like '%" + userInfo.Trim() + "%'";
712
+            }
713
+
714
+            //业务类别
715
+            if (bussType != null && bussType > 0)
716
+            {
717
+                sql += " and F_FILEFLAG =" + bussType;
718
+            }
719
+            //业务类型
720
+            if (detailType != null && detailType > 0)
721
+            {
722
+                sql += " and F_REPAIRLEVEL =" + detailType;
723
+            }
724
+            //内容
725
+            if (!string.IsNullOrEmpty(Content))
726
+            {
727
+                sql += " and F_CONTENT like '%" + Content.Trim() + "%'";
728
+            }
729
+
730
+
731
+
732
+            //查询按钮
733
+            if (types == 0)
734
+            {
735
+                if (!string.IsNullOrEmpty(dateParty))
736
+                {
737
+                    string startDate = dateParty.Substring(0, 10);
738
+                    string endDate = dateParty.Substring(12);
739
+                    sql += " and F_CREATEDATE>= '" + startDate + " 00:00:00" + "'";
740
+                    sql += " and F_CREATEDATE<= '" + endDate + " 23:59:59" + "'";
741
+
742
+                }
743
+            }//一周按钮
744
+            else if (types == 1)
745
+            {
746
+
747
+                string endDate = DateTime.Now.ToString();
748
+                string startDate = DateTime.Now.AddDays(-7).ToString();
749
+                sql += " and F_CREATEDATE>= '" + startDate + "'";
750
+                sql += " and F_CREATEDATE<= '" + endDate + "'";
751
+
752
+            }//一月按钮
753
+            else if (types == 2)
754
+            {
755
+
756
+                string endDate = DateTime.Now.ToString();
757
+                string startDate = DateTime.Now.AddMonths(-1).ToString();
758
+                sql += " and F_CREATEDATE>= '" + startDate + "'";
759
+                sql += " and F_CREATEDATE<= '" + endDate + "'";
760
+
761
+            }//一年按钮
762
+            else if (types == 3)
763
+            {
764
+
765
+                string endDate = DateTime.Now.ToString();
766
+                string startDate = DateTime.Now.AddYears(-1).ToString();
767
+                sql += " and F_CREATEDATE>= '" + startDate + "'";
768
+                sql += " and F_CREATEDATE<= '" + endDate + "'";
769
+
770
+            }
771
+
772
+            DataTable dt = new DataTable();
773
+            int recordCount = 0;
774
+            Model.PageData<Model.T_Wo_WorkOrderBase> pageModel = new Model.PageData<Model.T_Wo_WorkOrderBase>();
775
+            dt = BLL.PagerBLL.GetListPager(
776
+                "T_Wo_WorkOrderBase",
777
+                "F_WORKORDERID",
778
+              "*,CONVERT(varchar,F_CREATEDATE, 120 ) as F_CREATEDATENew"
779
+              + @" , replace(replace(CASE F_WORKORDERFROM WHEN '留言工单' THEN (SELECT F_RecFileUrl FROM dbo.T_Call_LeaveRecord  WHERE F_CallId=F_KSHADDRESSCODE) WHEN '语音工单' THEN (SELECT FilePath FROM dbo.T_Call_CallRecords WHERE CallId=F_KSHADDRESSCODE AND FilePath!='') ELSE NULL END,'\','/'),'" + GetSysconfig("newFilePath") + "','" + GetSysconfig("newPlayPath") + "') as FilePath",
780
+                //+ " ,(CASE F_WORKORDERFROM WHEN '留言工单' THEN (SELECT F_RecFileUrl FROM dbo.T_Call_LeaveRecord  WHERE F_CallId=F_KSHADDRESSCODE) WHEN '语音工单' THEN (SELECT FilePath FROM dbo.T_Call_CallRecords WHERE CallId=F_KSHADDRESSCODE AND FilePath!='') ELSE NULL END ) as FilePath",
781
+                sql,
782
+                "ORDER BY F_CREATEDATE desc",
783
+                limit,
784
+                page,
785
+                true,
786
+                out recordCount);
787
+
788
+
789
+            dataModel.code = 0;
790
+            dataModel.count = recordCount;
791
+            dataModel.data = dt;
792
+
793
+            return JsonConvert.SerializeObject(dataModel);
794
+        }
795
+
796
+        #endregion 
797
+
798
+        #region 相关通知
799
+
800
+        /// <summary>
801
+        /// 已定责视图
802
+        /// </summary>
803
+        /// <param name="dtype">工单类型 1、所有待办工单 2、代办结工单</param>
804
+        /// <returns></returns>
805
+        public ActionResult WorkOrderMyListNotice(int dtype)
806
+        {
807
+            WorkOrderMyModel model = new WorkOrderMyModel();
808
+            model.DType = dtype;
809
+            //业务类型字典表
810
+            model.WorkOrderTypeModelList = GetWorkTypeModelList();
811
+            //话务标志
812
+            model.SeatFlag = F_SeatFlag;
813
+            return View(model);
814
+        }
815
+
816
+
817
+        /// <summary>
818
+        /// 相关表扬
819
+        /// </summary>
820
+        /// <param name="page">当前页码</param>
821
+        /// <param name="limit">每页数据量</param>
822
+        /// <param name="sqlWhere">查询条件</param>
823
+        /// <returns></returns>
824
+        [ActionName("WorkOrderMyDataNotice")]
825
+        [HttpGet]
826
+        public string WorkOrderMyDataNotice(DateTime? NowDateTime, int page, int limit, int? types, string dateParty,
827
+            string workorderNum, string cusName, string phoneNumber,
828
+            string userInfo, int? bussType, int? detailType, string Content,int NoticeType)
829
+        {
830
+
831
+            //数据结果集
832
+            ResponseData dataModel = new ResponseData();
833
+
834
+            //F_FILEFLAG 业务类型ID
835
+            //F_WORKORDERSTATEID   0未处理 1处理中  2已办结 status
836
+            //F_WORKORDERTYPEID 处理方式  1转单 3客服处理 GoType
837
+            //F_REPAIRMANID 接入渠道 1语音 2留言  3微信 4微博 FromType
838
+            //string sql = string.Format(" and F_WORKORDERTYPEID=1 and F_WORKORDERSTATEID=1 and F_WORKORDERID in (select F_INSTANCEID from T_Wo_WorkOrderHistory where F_WORKORDERSTATEID=0 and F_OPTUSERID={0})", F_UserID);
839
+
840
+            string sql = " and F_WORKORDERTYPEID=3 and F_WORKORDERSTATEID=5 ";
841
+
842
+
843
+            //工单编号
844
+            if (!string.IsNullOrEmpty(workorderNum))
845
+            {
846
+                sql += " and F_CODE like '%" + workorderNum.Trim() + "%'";
847
+            }
848
+            //客户姓名
849
+            if (!string.IsNullOrEmpty(cusName))
850
+            {
851
+                sql += " and F_CUSTOMERNAME like '%" + cusName.Trim() + "%'";
852
+            }
853
+            //客户电话
854
+            if (!string.IsNullOrEmpty(phoneNumber))
855
+            {
856
+                sql += " and F_CUSTOMERTELEPHONE like '%" + phoneNumber.Trim() + "%'";
857
+            }
858
+            //坐席工号
859
+            if (!string.IsNullOrEmpty(userInfo))
860
+            {
861
+                sql += " and F_LINKMAN like '%" + userInfo.Trim() + "%'";
862
+            }
863
+
864
+            //业务类别
865
+            if (bussType != null && bussType > 0)
866
+            {
867
+                sql += " and F_FILEFLAG =" + bussType;
868
+            }
869
+            //业务类型
870
+            if (detailType != null && detailType > 0)
871
+            {
872
+                sql += " and F_REPAIRLEVEL =" + detailType;
873
+            }
874
+            //内容
875
+            if (!string.IsNullOrEmpty(Content))
876
+            {
877
+                sql += " and F_CONTENT like '%" + Content.Trim() + "%'";
878
+            }
879
+
880
+
881
+
882
+            //查询按钮
883
+            if (types == 0)
884
+            {
885
+                if (!string.IsNullOrEmpty(dateParty))
886
+                {
887
+                    string startDate = dateParty.Substring(0, 10);
888
+                    string endDate = dateParty.Substring(12);
889
+                    sql += " and F_CREATEDATE>= '" + startDate + " 00:00:00" + "'";
890
+                    sql += " and F_CREATEDATE<= '" + endDate + " 23:59:59" + "'";
891
+
892
+                }
893
+            }//一周按钮
894
+            else if (types == 1)
895
+            {
896
+
897
+                string endDate = DateTime.Now.ToString();
898
+                string startDate = DateTime.Now.AddDays(-7).ToString();
899
+                sql += " and F_CREATEDATE>= '" + startDate + "'";
900
+                sql += " and F_CREATEDATE<= '" + endDate + "'";
901
+
902
+            }//一月按钮
903
+            else if (types == 2)
904
+            {
905
+
906
+                string endDate = DateTime.Now.ToString();
907
+                string startDate = DateTime.Now.AddMonths(-1).ToString();
908
+                sql += " and F_CREATEDATE>= '" + startDate + "'";
909
+                sql += " and F_CREATEDATE<= '" + endDate + "'";
910
+
911
+            }//一年按钮
912
+            else if (types == 3)
913
+            {
914
+
915
+                string endDate = DateTime.Now.ToString();
916
+                string startDate = DateTime.Now.AddYears(-1).ToString();
917
+                sql += " and F_CREATEDATE>= '" + startDate + "'";
918
+                sql += " and F_CREATEDATE<= '" + endDate + "'";
919
+
920
+            }
921
+
922
+            DataTable dt = new DataTable();
923
+            int recordCount = 0;
924
+            Model.PageData<Model.T_Wo_WorkOrderBase> pageModel = new Model.PageData<Model.T_Wo_WorkOrderBase>();
925
+            dt = BLL.PagerBLL.GetListPager(
926
+                string.Format(" T_Wo_WorkOrderBase T1 Inner join T_Wo_WorkOrderNotice T2 On T1.F_WORKORDERID=T2.OrderId AND T2.NoticeDeptId={0} AND NoticeType={1}", F_DeptId, NoticeType),
927
+                "F_WORKORDERID",
928
+              "*,CONVERT(varchar,F_CREATEDATE, 120 ) as F_CREATEDATENew,NoticeDeptId,NoticeDeptName"
929
+              + @" , replace(replace(CASE F_WORKORDERFROM WHEN '留言工单' THEN (SELECT F_RecFileUrl FROM dbo.T_Call_LeaveRecord  WHERE F_CallId=F_KSHADDRESSCODE) WHEN '语音工单' THEN (SELECT FilePath FROM dbo.T_Call_CallRecords WHERE CallId=F_KSHADDRESSCODE AND FilePath!='') ELSE NULL END,'\','/'),'" + GetSysconfig("newFilePath") + "','" + GetSysconfig("newPlayPath") + "') as FilePath",
930
+                //+ " ,(CASE F_WORKORDERFROM WHEN '留言工单' THEN (SELECT F_RecFileUrl FROM dbo.T_Call_LeaveRecord  WHERE F_CallId=F_KSHADDRESSCODE) WHEN '语音工单' THEN (SELECT FilePath FROM dbo.T_Call_CallRecords WHERE CallId=F_KSHADDRESSCODE AND FilePath!='') ELSE NULL END ) as FilePath",
931
+                sql,
932
+                "ORDER BY F_CREATEDATE desc",
933
+                limit,
934
+                page,
935
+                true,
936
+                out recordCount);
937
+
938
+
939
+            dataModel.code = 0;
940
+            dataModel.count = recordCount;
941
+            dataModel.data = dt;
942
+
943
+            return JsonConvert.SerializeObject(dataModel);
944
+        }
593 945
 
946
+        #endregion 
594 947
         #region 公共
595 948
 
596 949
         /// <summary>
@@ -810,6 +1163,8 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
810 1163
             callScreenModel.DepartmentList = deptBll.GetModelList("F_ParentId=0");
811 1164
 
812 1165
             callScreenModel.HistoryOrderList = historyBll.GetModelList("F_INSTANCEID=" + orderKeyId);
1166
+
1167
+            callScreenModel.Noticelist = noticeBLL.GetModelList(" Orderid=" + orderKeyId + " Order by DZNumber ASC");
813 1168
             return View(callScreenModel);
814 1169
         }
815 1170
 
@@ -862,6 +1217,8 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
862 1217
             callScreenModel.DepartmentList = deptBll.GetModelList("F_ParentId=0");
863 1218
 
864 1219
             callScreenModel.HistoryOrderList = historyBll.GetModelList("F_INSTANCEID=" + orderKeyId);
1220
+
1221
+            callScreenModel.Noticelist = noticeBLL.GetModelList(" Orderid=" + orderKeyId+ " Order by DZNumber ASC");
865 1222
             return View(callScreenModel);
866 1223
         }
867 1224
 

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/WorkOrderController.cs → web/YTSoft.BaseCallCenter.MVCWeb/Controllers/Order/WorkOrderController.cs


+ 5 - 0
web/YTSoft.BaseCallCenter.MVCWeb/Models/CallScreenModel.cs

@@ -14,6 +14,11 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Models
14 14
         public List<Model.T_Wo_WorkOrderType> WorkOrderTypeModelList { get; set; }
15 15
 
16 16
         /// <summary>
17
+        /// 业务类型数据
18
+        /// </summary>
19
+        public List<Model.T_Wo_WorkOrderNotice> Noticelist { get; set; }
20
+
21
+        /// <summary>
17 22
         /// 业务数据
18 23
         /// </summary>
19 24
 

+ 2 - 2
web/YTSoft.BaseCallCenter.MVCWeb/YTSoft.BaseCallCenter.MVCWeb.csproj

@@ -111,7 +111,7 @@
111 111
     <Compile Include="Commons\HttpHelper.cs" />
112 112
     <Compile Include="Controllers\APIController.cs" />
113 113
     <Compile Include="Controllers\BaseController.cs" />
114
-    <Compile Include="Controllers\CallRecordController.cs" />
114
+    <Compile Include="Controllers\HW\CallRecordController.cs" />
115 115
     <Compile Include="Controllers\Com\ClassController.cs" />
116 116
     <Compile Include="Controllers\Com\UploadController.cs" />
117 117
     <Compile Include="Controllers\Com\TagController.cs" />
@@ -139,7 +139,7 @@
139 139
     <Compile Include="Controllers\SystemManageController.cs" />
140 140
     <Compile Include="Controllers\WebHelper.cs" />
141 141
     <Compile Include="Controllers\WorkFlowController.cs" />
142
-    <Compile Include="Controllers\WorkOrderController.cs" />
142
+    <Compile Include="Controllers\Order\WorkOrderController.cs" />
143 143
     <Compile Include="Controllers\WXInterFaceController.cs" />
144 144
     <Compile Include="Global.asax.cs">
145 145
       <DependentUpon>Global.asax</DependentUpon>