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

CallCenterApi/CallCenterApi.DAL/T_Bus_VisitResult.cs

@@ -38,9 +38,9 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Bus_VisitResult(");
-            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)");
+            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)");
             strSql.Append(" values (");
-            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)");
+            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)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WorkOrderId", SqlDbType.NVarChar,20),
@@ -58,7 +58,9 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
                     new SqlParameter("@F_DeleteUser", SqlDbType.VarChar,50),
                     new SqlParameter("@F_DeleteTime", SqlDbType.DateTime),
-                    new SqlParameter("@F_File", SqlDbType.VarChar,500)};
+                    new SqlParameter("@F_File", SqlDbType.VarChar,500),
+                    new SqlParameter("@F_IsPerform", SqlDbType.Int,4)
+            };
             parameters[0].Value = model.F_WorkOrderId;
             parameters[1].Value = model.F_AssignedId;
             parameters[2].Value = model.F_VisitUser;
@@ -75,6 +77,7 @@ namespace CallCenterApi.DAL
             parameters[13].Value = model.F_DeleteUser;
             parameters[14].Value = model.F_DeleteTime;
             parameters[15].Value = model.F_File;
+            parameters[16].Value = model.F_IsPerform;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
@@ -108,7 +111,8 @@ namespace CallCenterApi.DAL
             strSql.Append("F_IsDelete=@F_IsDelete,");
             strSql.Append("F_DeleteUser=@F_DeleteUser,");
             strSql.Append("F_DeleteTime=@F_DeleteTime,");
-            strSql.Append("F_File=@F_File");
+            strSql.Append("F_File=@F_File,");
+            strSql.Append("F_IsPerform=@F_IsPerform "); 
             strSql.Append(" where F_Id=@F_Id");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WorkOrderId", SqlDbType.NVarChar,20),
@@ -127,6 +131,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_DeleteUser", SqlDbType.VarChar,50),
                     new SqlParameter("@F_DeleteTime", SqlDbType.DateTime),
                     new SqlParameter("@F_File", SqlDbType.VarChar,500),
+                    new SqlParameter("@F_IsPerform", SqlDbType.Int,4),
                     new SqlParameter("@F_Id", SqlDbType.Int,4)};
             parameters[0].Value = model.F_WorkOrderId;
             parameters[1].Value = model.F_AssignedId;
@@ -144,7 +149,8 @@ namespace CallCenterApi.DAL
             parameters[13].Value = model.F_DeleteUser;
             parameters[14].Value = model.F_DeleteTime;
             parameters[15].Value = model.F_File;
-            parameters[16].Value = model.F_Id;
+            parameters[16].Value = model.F_IsPerform;
+            parameters[17].Value = model.F_Id;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -208,7 +214,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            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 ");
+            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 ");
             strSql.Append(" where F_Id=@F_Id");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_Id", SqlDbType.Int,4)
@@ -304,6 +310,11 @@ namespace CallCenterApi.DAL
                 {
                     model.F_File = row["F_File"].ToString();
                 }
+                if (row["F_IsPerform"] != null && row["F_IsPerform"].ToString() != "")
+                {
+                    model.F_IsPerform = int.Parse(row["F_IsPerform"].ToString());
+                }
+                
             }
             return model;
         }
@@ -314,7 +325,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            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 ");
+            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 ");
             strSql.Append(" FROM T_Bus_VisitResult ");
             if (strWhere.Trim() != "")
             {
@@ -334,7 +345,7 @@ namespace CallCenterApi.DAL
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            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 ");
+            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 ");
             strSql.Append(" FROM T_Bus_VisitResult ");
             if (strWhere.Trim() != "")
             {

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

@@ -8157,7 +8157,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 return Error("权限不足");
             }
         }
-
+        #region 网格化对接
         /// <summary>
         /// 对接网格化办理
         /// </summary>
@@ -8615,7 +8615,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             return optid;
         }
-
+        #endregion
         /// <summary>
         /// 派工单
         /// </summary>
@@ -9676,6 +9676,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     }
                                 }
                                 #endregion
+                                #region
+                                foreach (var item in listT_Bus_VisitResult)
+                                {
+                                    item.F_IsPerform = 1;
+                                    new BLL.T_Bus_VisitResult().Update(item);
+                                }
+                                #endregion
 
                                 #region 删除草稿信息
                                 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,12 +9771,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             modelT_Bus_PerformDuties.F_AuditReason = reason;
                             new BLL.T_Bus_PerformDuties().Update(modelT_Bus_PerformDuties);
                             #endregion
-                            string strmsg = ""; var isperform = 1;
+                            string strmsg = ""; var isperform = 1; int IsSatisfie = 0;
                             #region
                             if (state == 1)
                             {
                                 strmsg = "同意";
                                 isperform = 2;
+                                IsSatisfie = 1;
                             }
                             else if (state == 2)
                             {
@@ -9785,11 +9793,28 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 if (model != null)
                                 {
                                     model.F_IsPerform = isperform;
+                                    if (state == 1)//同意此履职界定则修改回访结果为满意
+                                        model.F_IsSatisfie = IsSatisfie;
                                     assignBLL.Update(model);
+
                                 }
                             }
                             #endregion
-                            
+                            #region 回访记录处理
+                            foreach (var item in modelT_Bus_PerformDuties.F_VisitId.Split(','))
+                            {
+                                var model = new BLL.T_Bus_VisitResult().GetModel(int.Parse(item));
+                                if (model != null)
+                                {
+                                    model.F_IsPerform = isperform;
+                                    if (state == 1)//同意此履职界定则修改回访结果为满意
+                                        model.F_IsSatisfie = IsSatisfie;
+                                    new BLL.T_Bus_VisitResult().Update(model);
+
+                                }
+                            }
+                            #endregion
+
                             #region 插入操作记录
                             Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
                             oper.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;

CallCenterApi/CallCenterApi.Model/T_Bus_VisitResult.cs

@@ -27,6 +27,7 @@ namespace CallCenterApi.Model
         private string _f_deleteuser;
         private DateTime? _f_deletetime;
         private string _f_file;
+        private int? _f_isperform;
         /// <summary>
         /// 
         /// </summary>
@@ -163,6 +164,14 @@ namespace CallCenterApi.Model
             set { _f_file = value; }
             get { return _f_file; }
         }
+        /// <summary>
+        /// 是否进行履职：0未执行，1提交履职，2履职成功，3履职失败
+        /// </summary>
+        public int? F_IsPerform
+        {
+            set { _f_isperform = value; }
+            get { return _f_isperform; }
+        }
         #endregion Model
 
     }