浏览代码

Merge branch 'master' of http://192.168.1.222:3000/zhoufan/SQ12345_Api

mengjie 5 年之前
父节点
当前提交
f7f96929d7

+ 19 - 8
CallCenterApi/CallCenterApi.DAL/T_Bus_VisitResult.cs

38
         {
38
         {
39
             StringBuilder strSql = new StringBuilder();
39
             StringBuilder strSql = new StringBuilder();
40
             strSql.Append("insert into T_Bus_VisitResult(");
40
             strSql.Append("insert into T_Bus_VisitResult(");
41
-            strSql.Append("F_WorkOrderId,F_AssignedId,F_VisitUser,F_Type,F_IsSatisfie,F_Result,F_LimitTime,F_CallRecordId,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_File)");
41
+            strSql.Append("F_WorkOrderId,F_AssignedId,F_VisitUser,F_Type,F_IsSatisfie,F_Result,F_LimitTime,F_CallRecordId,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_File,F_IsPerform)");
42
             strSql.Append(" values (");
42
             strSql.Append(" values (");
43
-            strSql.Append("@F_WorkOrderId,@F_AssignedId,@F_VisitUser,@F_Type,@F_IsSatisfie,@F_Result,@F_LimitTime,@F_CallRecordId,@F_Remark,@F_State,@F_CreateUser,@F_CreateTime,@F_IsDelete,@F_DeleteUser,@F_DeleteTime,@F_File)");
43
+            strSql.Append("@F_WorkOrderId,@F_AssignedId,@F_VisitUser,@F_Type,@F_IsSatisfie,@F_Result,@F_LimitTime,@F_CallRecordId,@F_Remark,@F_State,@F_CreateUser,@F_CreateTime,@F_IsDelete,@F_DeleteUser,@F_DeleteTime,@F_File,@F_IsPerform)");
44
             strSql.Append(";select @@IDENTITY");
44
             strSql.Append(";select @@IDENTITY");
45
             SqlParameter[] parameters = {
45
             SqlParameter[] parameters = {
46
                     new SqlParameter("@F_WorkOrderId", SqlDbType.NVarChar,20),
46
                     new SqlParameter("@F_WorkOrderId", SqlDbType.NVarChar,20),
58
                     new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
58
                     new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
59
                     new SqlParameter("@F_DeleteUser", SqlDbType.VarChar,50),
59
                     new SqlParameter("@F_DeleteUser", SqlDbType.VarChar,50),
60
                     new SqlParameter("@F_DeleteTime", SqlDbType.DateTime),
60
                     new SqlParameter("@F_DeleteTime", SqlDbType.DateTime),
61
-                    new SqlParameter("@F_File", SqlDbType.VarChar,500)};
61
+                    new SqlParameter("@F_File", SqlDbType.VarChar,500),
62
+                    new SqlParameter("@F_IsPerform", SqlDbType.Int,4)
63
+            };
62
             parameters[0].Value = model.F_WorkOrderId;
64
             parameters[0].Value = model.F_WorkOrderId;
63
             parameters[1].Value = model.F_AssignedId;
65
             parameters[1].Value = model.F_AssignedId;
64
             parameters[2].Value = model.F_VisitUser;
66
             parameters[2].Value = model.F_VisitUser;
75
             parameters[13].Value = model.F_DeleteUser;
77
             parameters[13].Value = model.F_DeleteUser;
76
             parameters[14].Value = model.F_DeleteTime;
78
             parameters[14].Value = model.F_DeleteTime;
77
             parameters[15].Value = model.F_File;
79
             parameters[15].Value = model.F_File;
80
+            parameters[16].Value = model.F_IsPerform;
78
 
81
 
79
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
82
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
80
             if (obj == null)
83
             if (obj == null)
108
             strSql.Append("F_IsDelete=@F_IsDelete,");
111
             strSql.Append("F_IsDelete=@F_IsDelete,");
109
             strSql.Append("F_DeleteUser=@F_DeleteUser,");
112
             strSql.Append("F_DeleteUser=@F_DeleteUser,");
110
             strSql.Append("F_DeleteTime=@F_DeleteTime,");
113
             strSql.Append("F_DeleteTime=@F_DeleteTime,");
111
-            strSql.Append("F_File=@F_File");
114
+            strSql.Append("F_File=@F_File,");
115
+            strSql.Append("F_IsPerform=@F_IsPerform "); 
112
             strSql.Append(" where F_Id=@F_Id");
116
             strSql.Append(" where F_Id=@F_Id");
113
             SqlParameter[] parameters = {
117
             SqlParameter[] parameters = {
114
                     new SqlParameter("@F_WorkOrderId", SqlDbType.NVarChar,20),
118
                     new SqlParameter("@F_WorkOrderId", SqlDbType.NVarChar,20),
127
                     new SqlParameter("@F_DeleteUser", SqlDbType.VarChar,50),
131
                     new SqlParameter("@F_DeleteUser", SqlDbType.VarChar,50),
128
                     new SqlParameter("@F_DeleteTime", SqlDbType.DateTime),
132
                     new SqlParameter("@F_DeleteTime", SqlDbType.DateTime),
129
                     new SqlParameter("@F_File", SqlDbType.VarChar,500),
133
                     new SqlParameter("@F_File", SqlDbType.VarChar,500),
134
+                    new SqlParameter("@F_IsPerform", SqlDbType.Int,4),
130
                     new SqlParameter("@F_Id", SqlDbType.Int,4)};
135
                     new SqlParameter("@F_Id", SqlDbType.Int,4)};
131
             parameters[0].Value = model.F_WorkOrderId;
136
             parameters[0].Value = model.F_WorkOrderId;
132
             parameters[1].Value = model.F_AssignedId;
137
             parameters[1].Value = model.F_AssignedId;
144
             parameters[13].Value = model.F_DeleteUser;
149
             parameters[13].Value = model.F_DeleteUser;
145
             parameters[14].Value = model.F_DeleteTime;
150
             parameters[14].Value = model.F_DeleteTime;
146
             parameters[15].Value = model.F_File;
151
             parameters[15].Value = model.F_File;
147
-            parameters[16].Value = model.F_Id;
152
+            parameters[16].Value = model.F_IsPerform;
153
+            parameters[17].Value = model.F_Id;
148
 
154
 
149
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
155
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
150
             if (rows > 0)
156
             if (rows > 0)
208
         {
214
         {
209
 
215
 
210
             StringBuilder strSql = new StringBuilder();
216
             StringBuilder strSql = new StringBuilder();
211
-            strSql.Append("select  top 1 F_Id,F_WorkOrderId,F_AssignedId,F_VisitUser,F_Type,F_IsSatisfie,F_Result,F_LimitTime,F_CallRecordId,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_File from T_Bus_VisitResult ");
217
+            strSql.Append("select  top 1 F_Id,F_WorkOrderId,F_AssignedId,F_VisitUser,F_Type,F_IsSatisfie,F_Result,F_LimitTime,F_CallRecordId,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_File,F_IsPerform from T_Bus_VisitResult ");
212
             strSql.Append(" where F_Id=@F_Id");
218
             strSql.Append(" where F_Id=@F_Id");
213
             SqlParameter[] parameters = {
219
             SqlParameter[] parameters = {
214
                     new SqlParameter("@F_Id", SqlDbType.Int,4)
220
                     new SqlParameter("@F_Id", SqlDbType.Int,4)
304
                 {
310
                 {
305
                     model.F_File = row["F_File"].ToString();
311
                     model.F_File = row["F_File"].ToString();
306
                 }
312
                 }
313
+                if (row["F_IsPerform"] != null && row["F_IsPerform"].ToString() != "")
314
+                {
315
+                    model.F_IsPerform = int.Parse(row["F_IsPerform"].ToString());
316
+                }
317
+                
307
             }
318
             }
308
             return model;
319
             return model;
309
         }
320
         }
314
         public DataSet GetList(string strWhere)
325
         public DataSet GetList(string strWhere)
315
         {
326
         {
316
             StringBuilder strSql = new StringBuilder();
327
             StringBuilder strSql = new StringBuilder();
317
-            strSql.Append("select F_Id,F_WorkOrderId,F_AssignedId,F_VisitUser,F_Type,F_IsSatisfie,F_Result,F_LimitTime,F_CallRecordId,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_File ");
328
+            strSql.Append("select F_Id,F_WorkOrderId,F_AssignedId,F_VisitUser,F_Type,F_IsSatisfie,F_Result,F_LimitTime,F_CallRecordId,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_File,F_IsPerform ");
318
             strSql.Append(" FROM T_Bus_VisitResult ");
329
             strSql.Append(" FROM T_Bus_VisitResult ");
319
             if (strWhere.Trim() != "")
330
             if (strWhere.Trim() != "")
320
             {
331
             {
334
             {
345
             {
335
                 strSql.Append(" top " + Top.ToString());
346
                 strSql.Append(" top " + Top.ToString());
336
             }
347
             }
337
-            strSql.Append(" F_Id,F_WorkOrderId,F_AssignedId,F_VisitUser,F_Type,F_IsSatisfie,F_Result,F_LimitTime,F_CallRecordId,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_File ");
348
+            strSql.Append(" F_Id,F_WorkOrderId,F_AssignedId,F_VisitUser,F_Type,F_IsSatisfie,F_Result,F_LimitTime,F_CallRecordId,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_File,F_IsPerform ");
338
             strSql.Append(" FROM T_Bus_VisitResult ");
349
             strSql.Append(" FROM T_Bus_VisitResult ");
339
             if (strWhere.Trim() != "")
350
             if (strWhere.Trim() != "")
340
             {
351
             {

+ 29 - 4
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

8157
                 return Error("权限不足");
8157
                 return Error("权限不足");
8158
             }
8158
             }
8159
         }
8159
         }
8160
-
8160
+        #region 网格化对接
8161
         /// <summary>
8161
         /// <summary>
8162
         /// 对接网格化办理
8162
         /// 对接网格化办理
8163
         /// </summary>
8163
         /// </summary>
8615
             }
8615
             }
8616
             return optid;
8616
             return optid;
8617
         }
8617
         }
8618
-
8618
+        #endregion
8619
         /// <summary>
8619
         /// <summary>
8620
         /// 派工单
8620
         /// 派工单
8621
         /// </summary>
8621
         /// </summary>
9676
                                     }
9676
                                     }
9677
                                 }
9677
                                 }
9678
                                 #endregion
9678
                                 #endregion
9679
+                                #region
9680
+                                foreach (var item in listT_Bus_VisitResult)
9681
+                                {
9682
+                                    item.F_IsPerform = 1;
9683
+                                    new BLL.T_Bus_VisitResult().Update(item);
9684
+                                }
9685
+                                #endregion
9679
 
9686
 
9680
                                 #region 删除草稿信息
9687
                                 #region 删除草稿信息
9681
                                 var cglist = new BLL.T_Bus_PerformDuties().GetModelList(" F_IsDelete=0 and F_State=0 and F_WorkOrderId='" + modelT_Bus_WorkOrder.F_WorkOrderId + "' and F_CreateUser='" + userModel.F_UserCode + "' ");
9688
                                 var cglist = new BLL.T_Bus_PerformDuties().GetModelList(" F_IsDelete=0 and F_State=0 and F_WorkOrderId='" + modelT_Bus_WorkOrder.F_WorkOrderId + "' and F_CreateUser='" + userModel.F_UserCode + "' ");
9764
                             modelT_Bus_PerformDuties.F_AuditReason = reason;
9771
                             modelT_Bus_PerformDuties.F_AuditReason = reason;
9765
                             new BLL.T_Bus_PerformDuties().Update(modelT_Bus_PerformDuties);
9772
                             new BLL.T_Bus_PerformDuties().Update(modelT_Bus_PerformDuties);
9766
                             #endregion
9773
                             #endregion
9767
-                            string strmsg = ""; var isperform = 1;
9774
+                            string strmsg = ""; var isperform = 1; int IsSatisfie = 0;
9768
                             #region
9775
                             #region
9769
                             if (state == 1)
9776
                             if (state == 1)
9770
                             {
9777
                             {
9771
                                 strmsg = "同意";
9778
                                 strmsg = "同意";
9772
                                 isperform = 2;
9779
                                 isperform = 2;
9780
+                                IsSatisfie = 1;
9773
                             }
9781
                             }
9774
                             else if (state == 2)
9782
                             else if (state == 2)
9775
                             {
9783
                             {
9785
                                 if (model != null)
9793
                                 if (model != null)
9786
                                 {
9794
                                 {
9787
                                     model.F_IsPerform = isperform;
9795
                                     model.F_IsPerform = isperform;
9796
+                                    if (state == 1)//同意此履职界定则修改回访结果为满意
9797
+                                        model.F_IsSatisfie = IsSatisfie;
9788
                                     assignBLL.Update(model);
9798
                                     assignBLL.Update(model);
9799
+
9789
                                 }
9800
                                 }
9790
                             }
9801
                             }
9791
                             #endregion
9802
                             #endregion
9792
-                            
9803
+                            #region 回访记录处理
9804
+                            foreach (var item in modelT_Bus_PerformDuties.F_VisitId.Split(','))
9805
+                            {
9806
+                                var model = new BLL.T_Bus_VisitResult().GetModel(int.Parse(item));
9807
+                                if (model != null)
9808
+                                {
9809
+                                    model.F_IsPerform = isperform;
9810
+                                    if (state == 1)//同意此履职界定则修改回访结果为满意
9811
+                                        model.F_IsSatisfie = IsSatisfie;
9812
+                                    new BLL.T_Bus_VisitResult().Update(model);
9813
+
9814
+                                }
9815
+                            }
9816
+                            #endregion
9817
+
9793
                             #region 插入操作记录
9818
                             #region 插入操作记录
9794
                             Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
9819
                             Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
9795
                             oper.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
9820
                             oper.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;

+ 9 - 0
CallCenterApi/CallCenterApi.Model/T_Bus_VisitResult.cs

27
         private string _f_deleteuser;
27
         private string _f_deleteuser;
28
         private DateTime? _f_deletetime;
28
         private DateTime? _f_deletetime;
29
         private string _f_file;
29
         private string _f_file;
30
+        private int? _f_isperform;
30
         /// <summary>
31
         /// <summary>
31
         /// 
32
         /// 
32
         /// </summary>
33
         /// </summary>
163
             set { _f_file = value; }
164
             set { _f_file = value; }
164
             get { return _f_file; }
165
             get { return _f_file; }
165
         }
166
         }
167
+        /// <summary>
168
+        /// 是否进行履职:0未执行,1提交履职,2履职成功,3履职失败
169
+        /// </summary>
170
+        public int? F_IsPerform
171
+        {
172
+            set { _f_isperform = value; }
173
+            get { return _f_isperform; }
174
+        }
166
         #endregion Model
175
         #endregion Model
167
 
176
 
168
     }
177
     }