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

CallCenterApi/CallCenterApi.DAL/T_Bus_AppealInfo.cs

@@ -41,9 +41,9 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Bus_AppealInfo(");
-            strSql.Append("F_WorkOrderId,F_Title,F_Content,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_DeptIds,F_NoticeID,F_NoticeInfo,F_SureTime,F_NCId,F_Files,F_Basis,F_Requirement,F_Type,F_TypeID)");
+            strSql.Append("F_WorkOrderId,F_Title,F_Content,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_DeptIds,F_NoticeID,F_NoticeInfo,F_SureTime,F_NCId,F_Files,F_Basis,F_Requirement,F_Type,F_TypeID,F_Reason)");
             strSql.Append(" values (");
-            strSql.Append("@F_WorkOrderId,@F_Title,@F_Content,@F_Remark,@F_State,@F_CreateUser,@F_CreateTime,@F_IsDelete,@F_DeleteUser,@F_DeleteTime,@F_DeptIds,@F_NoticeID,@F_NoticeInfo,@F_SureTime,@F_NCId,@F_Files,@F_Basis,@F_Requirement,@F_Type,@F_TypeID)");
+            strSql.Append("@F_WorkOrderId,@F_Title,@F_Content,@F_Remark,@F_State,@F_CreateUser,@F_CreateTime,@F_IsDelete,@F_DeleteUser,@F_DeleteTime,@F_DeptIds,@F_NoticeID,@F_NoticeInfo,@F_SureTime,@F_NCId,@F_Files,@F_Basis,@F_Requirement,@F_Type,@F_TypeID,@F_Reason)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WorkOrderId", SqlDbType.NVarChar,20),
@@ -65,7 +65,8 @@ namespace CallCenterApi.DAL
             new SqlParameter("@F_Basis", SqlDbType.VarChar,500),
             new SqlParameter("@F_Requirement", SqlDbType.VarChar,500),
             new SqlParameter("@F_Type", SqlDbType.VarChar,50),
-            new SqlParameter("@F_TypeID", SqlDbType.Int,4)
+            new SqlParameter("@F_TypeID", SqlDbType.Int,4),
+            new SqlParameter("@F_Reason", SqlDbType.NVarChar,-1)
             };
             parameters[0].Value = model.F_WorkOrderId;
             parameters[1].Value = model.F_Title;
@@ -87,6 +88,7 @@ namespace CallCenterApi.DAL
             parameters[17].Value = model.F_Requirement;
             parameters[18].Value = model.F_Type;
             parameters[19].Value = model.F_TypeID;
+            parameters[20].Value = model.F_Reason;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
@@ -124,7 +126,8 @@ namespace CallCenterApi.DAL
             strSql.Append("F_Basis=@F_Basis,");
             strSql.Append("F_Requirement=@F_Requirement,");
             strSql.Append("F_Type=@F_Type,");
-            strSql.Append("F_TypeID=@F_TypeID");
+            strSql.Append("F_TypeID=@F_TypeID,");
+            strSql.Append("F_Reason=@F_Reason");
             strSql.Append(" where F_Id=@F_Id");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WorkOrderId", SqlDbType.NVarChar,20),
@@ -147,7 +150,8 @@ namespace CallCenterApi.DAL
             new SqlParameter("@F_Basis", SqlDbType.VarChar,500),
             new SqlParameter("@F_Requirement", SqlDbType.VarChar,500),
             new SqlParameter("@F_Type", SqlDbType.VarChar,50),
-            new SqlParameter("@F_TypeID", SqlDbType.Int,4)};
+            new SqlParameter("@F_TypeID", SqlDbType.Int,4),
+            new SqlParameter("@F_Reason", SqlDbType.NVarChar,-1)};
             parameters[0].Value = model.F_WorkOrderId;
             parameters[1].Value = model.F_Title;
             parameters[2].Value = model.F_Content;
@@ -169,6 +173,7 @@ namespace CallCenterApi.DAL
             parameters[18].Value = model.F_Requirement;
             parameters[19].Value = model.F_Type;
             parameters[20].Value = model.F_TypeID;
+            parameters[21].Value = model.F_Reason;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -232,7 +237,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_Id,F_WorkOrderId,F_Title,F_Content,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_DeptIds,F_NoticeID,F_NoticeInfo,F_SureTime,F_NCId,F_Files,F_Basis,F_Requirement,F_Type,F_TypeID from T_Bus_AppealInfo ");
+            strSql.Append("select  top 1 F_Id,F_WorkOrderId,F_Title,F_Content,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_DeptIds,F_NoticeID,F_NoticeInfo,F_SureTime,F_NCId,F_Files,F_Basis,F_Requirement,F_Type,F_TypeID,F_Reason from T_Bus_AppealInfo ");
             strSql.Append(" where F_Id=@F_Id");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_Id", SqlDbType.Int,4)
@@ -346,6 +351,10 @@ namespace CallCenterApi.DAL
                 {
                     model.F_TypeID = int.Parse(row["F_TypeID"].ToString());
                 }
+                if (row["F_Reason"] != null)
+                {
+                    model.F_Reason = row["F_Reason"].ToString();
+                }
             }
             return model;
         }
@@ -356,7 +365,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_Id,F_WorkOrderId,F_Title,F_Content,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_DeptIds,F_NoticeID,F_NoticeInfo,F_SureTime,F_Files,F_Basis,F_Requirement,F_Type,F_TypeID ");
+            strSql.Append("select F_Id,F_WorkOrderId,F_Title,F_Content,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_DeptIds,F_NoticeID,F_NoticeInfo,F_SureTime,F_Files,F_Basis,F_Requirement,F_Type,F_TypeID,F_Reason ");
             strSql.Append(" FROM T_Bus_AppealInfo ");
             if (strWhere.Trim() != "")
             {
@@ -376,7 +385,7 @@ namespace CallCenterApi.DAL
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_Id,F_WorkOrderId,F_Title,F_Content,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_DeptIds,F_NoticeID,F_NoticeInfo,F_SureTime,F_Files,F_Basis,F_Requirement,F_Type,F_TypeID ");
+            strSql.Append(" F_Id,F_WorkOrderId,F_Title,F_Content,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_DeptIds,F_NoticeID,F_NoticeInfo,F_SureTime,F_Files,F_Basis,F_Requirement,F_Type,F_TypeID,F_Reason ");
             strSql.Append(" FROM T_Bus_AppealInfo ");
             if (strWhere.Trim() != "")
             {
@@ -440,7 +449,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_Id,F_WorkOrderId,F_Title,F_Content,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_DeptIds,F_NoticeID,F_NoticeInfo,F_SureTime,F_NCId,F_Files,F_Basis,F_Requirement,F_Type,F_TypeID from T_Bus_AppealInfo ");
+            strSql.Append("select  top 1 F_Id,F_WorkOrderId,F_Title,F_Content,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_DeptIds,F_NoticeID,F_NoticeInfo,F_SureTime,F_NCId,F_Files,F_Basis,F_Requirement,F_Type,F_TypeID,F_Reason from T_Bus_AppealInfo ");
             strSql.Append(" where F_Id=@F_Id");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_Id", SqlDbType.Int,4)

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/AppealController.cs

@@ -255,7 +255,7 @@ namespace CallCenterApi.Interface.Controllers
         
 
         //处理申诉
-        public ActionResult DealAppeal(string nid, int state)
+        public ActionResult DealAppeal(string nid, int state,string reason)
         {
 
             if (nid != null && nid.Trim() != "")
@@ -264,7 +264,10 @@ namespace CallCenterApi.Interface.Controllers
                 if (dModel != null)
                 {                   
                     dModel.F_State = state;
-
+                    if (!string.IsNullOrEmpty(reason))
+                    {
+                        dModel.F_Reason = reason;
+                    }
                     bool b = bll.Update(dModel);
                     if (b)
                     {

CallCenterApi/CallCenterApi.Model/T_Bus_AppealInfo.cs

@@ -36,6 +36,7 @@ namespace CallCenterApi.Model
         private string _f_basis;
         private int _f_type;
         private int _f_typeid;
+        private string _f_reason;
         /// <summary>
         /// 
         /// </summary>
@@ -214,5 +215,14 @@ namespace CallCenterApi.Model
             set { _f_typeid = value; }
             get { return _f_typeid; }
         }
+
+        /// <summary>
+        /// 审核不通过原因
+        /// </summary>
+        public string F_Reason
+        {
+            set { _f_reason = value; }
+            get { return _f_reason; }
+        }
     }
 }