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

RMYY_CallCenter_Api.Bll/AddLogBll.cs

@@ -52,7 +52,50 @@ namespace RMYY_CallCenter_Api.Bll
             }
             return res;
         }
+        public long AddLogAboutKey(int woid, int wostate, int type, string content, int itemtype, int opttype, string nextuser, int nextdept, string usercode,int key,string value,string reason ,int F_IsUsed = 0)
+        {
+
+            Model.T_Dis_WorkOrderItem itemModel = new Model.T_Dis_WorkOrderItem();
+            #region 
+            long res = 0;
+            //处理当前工单的记录之前的记录过期
+            var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " and  (F_CreateUser=" + usercode + " or F_NextUser like '%" + usercode + "%')");
+            using (TransactionScope trans = new TransactionScope(TransactionScopeOption.Required, new TimeSpan(0, 10, 0)))
+            {
+                if (F_IsUsed == 0)
+                {
 
+                    if (itemlast.Count > 0)
+                    {
+                        foreach (var it in itemlast)
+                        {
+                            it.F_IsUsed = 1;
+                            itembll.Update(it);
+                        }
+                    }
+                }
+                #endregion
+                itemModel.F_WoID = woid;
+                itemModel.F_WoState = wostate;
+                itemModel.F_WoType = type;
+                itemModel.F_ItemType = itemtype;
+                itemModel.F_OptType = opttype;
+                itemModel.F_OptContent = content;
+                itemModel.F_NextUser = nextuser;
+                itemModel.F_NextDept = nextdept;
+                itemModel.F_IsUsed = F_IsUsed;
+                itemModel.F_CreateTime = DateTime.Now;
+                itemModel.F_CreateUser = usercode;
+
+                itemModel.F_AboutKey = key;
+                itemModel.F_AboutReason = value;
+                itemModel.F_EnterReason = reason;
+
+                res = itembll.Add(itemModel);
+                trans.Complete();
+            }
+            return res;
+        }
 
     }
 }

RMYY_CallCenter_Api.Dal/T_Car_Operation.cs

@@ -47,9 +47,9 @@ namespace RMYY_CallCenter_Api.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Car_Operation(");
-            strSql.Append("F_WorkOrderCode,F_Message,F_AssignID,F_CreateTime,F_State,F_CreateUser,F_IsDelete)");
+            strSql.Append("F_WorkOrderCode,F_Message,F_AssignID,F_CreateTime,F_State,F_CreateUser,F_IsDelete,F_AboutReason ,F_AboutKey,F_EnterReason)");
             strSql.Append(" values (");
-            strSql.Append("@F_WorkOrderCode,@F_Message,@F_AssignID,@F_CreateTime,@F_State,@F_CreateUser,@F_IsDelete)");
+            strSql.Append("@F_WorkOrderCode,@F_Message,@F_AssignID,@F_CreateTime,@F_State,@F_CreateUser,@F_IsDelete,@F_AboutReason ,@F_AboutKey,@F_EnterReason)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WorkOrderCode", SqlDbType.VarChar,50),
@@ -58,7 +58,10 @@ namespace RMYY_CallCenter_Api.DAL
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
                     new SqlParameter("@F_State", SqlDbType.Int,4),
                     new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
-                    new SqlParameter("@F_IsDelete", SqlDbType.Int,4)};
+                    new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
+                new SqlParameter("@F_AboutReason", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_AboutKey", SqlDbType.Int,4),
+                    new SqlParameter("@F_EnterReason", SqlDbType.NVarChar,50)};
             parameters[0].Value = model.F_WorkOrderCode;
             parameters[1].Value = model.F_Message;
             parameters[2].Value = model.F_AssignID;
@@ -67,6 +70,10 @@ namespace RMYY_CallCenter_Api.DAL
             parameters[5].Value = model.F_CreateUser;
             parameters[6].Value = model.F_IsDelete;
 
+            parameters[7].Value = model.F_AboutReason;
+            parameters[8].Value = model.F_AboutKey;
+            parameters[9].Value = model.F_EnterReason;
+
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             {
@@ -172,7 +179,7 @@ namespace RMYY_CallCenter_Api.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_ID,F_WorkOrderCode,F_Message,F_AssignID,F_CreateTime,F_State,F_CreateUser,F_IsDelete from T_Car_Operation ");
+            strSql.Append("select  top 1 F_ID,F_WorkOrderCode,F_Message,F_AssignID,F_CreateTime,F_State,F_CreateUser,F_IsDelete,F_AboutReason ,F_AboutKey,F_EnterReason from T_Car_Operation ");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_ID", SqlDbType.Int,4)
@@ -232,6 +239,19 @@ namespace RMYY_CallCenter_Api.DAL
                 {
                     model.F_IsDelete = int.Parse(row["F_IsDelete"].ToString());
                 }
+                if (row["F_EnterReason"] != null)
+                {
+                    model.F_EnterReason = row["F_EnterReason"].ToString();
+                }
+
+                if (row["F_AboutReason"] != null)
+                {
+                    model.F_AboutReason = row["F_AboutReason"].ToString();
+                }
+                if (row["F_AboutKey"] != null && row["F_AboutKey"].ToString() != "")
+                {
+                    model.F_AboutKey = int.Parse(row["F_AboutKey"].ToString());
+                }
             }
             return model;
         }
@@ -242,7 +262,7 @@ namespace RMYY_CallCenter_Api.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_ID,F_WorkOrderCode,F_Message,F_AssignID,F_CreateTime,F_State,F_CreateUser,F_IsDelete ");
+            strSql.Append("select F_ID,F_WorkOrderCode,F_Message,F_AssignID,F_CreateTime,F_State,F_CreateUser,F_IsDelete,F_AboutReason ,F_AboutKey,F_EnterReason ");
             strSql.Append(" FROM T_Car_Operation ");
             if (strWhere.Trim() != "")
             {

RMYY_CallCenter_Api.Dal/T_Cus_Customer.cs

@@ -38,9 +38,9 @@ namespace RMYY_CallCenter_Api.Dal
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Cus_Customer(");
-            strSql.Append("F_CustomerName,F_CustomerCode,F_Layer,F_Province,F_City,F_County,F_Address,F_Telephone,F_Mobile,F_Fax,F_Email,F_PostCode,F_Sex,F_IdCard,F_CreateBy,F_CreatedOn,F_ModifyBy,F_ModifiedOn,F_DeleteFlag,F_DeleteBy,F_DeleteOn,F_Remark,F_AboutLinkMan)");
+            strSql.Append("F_CustomerName,F_CustomerCode,F_Layer,F_Province,F_City,F_County,F_Address,F_Telephone,F_Mobile,F_Fax,F_Email,F_PostCode,F_Sex,F_IdCard,F_CreateBy,F_CreatedOn,F_ModifyBy,F_ModifiedOn,F_DeleteFlag,F_DeleteBy,F_DeleteOn,F_Remark,F_AboutLinkMan,F_RelationShip)");
             strSql.Append(" values (");
-            strSql.Append("@F_CustomerName,@F_CustomerCode,@F_Layer,@F_Province,@F_City,@F_County,@F_Address,@F_Telephone,@F_Mobile,@F_Fax,@F_Email,@F_PostCode,@F_Sex,@F_IdCard,@F_CreateBy,@F_CreatedOn,@F_ModifyBy,@F_ModifiedOn,@F_DeleteFlag,@F_DeleteBy,@F_DeleteOn,@F_Remark,@F_AboutLinkMan)");
+            strSql.Append("@F_CustomerName,@F_CustomerCode,@F_Layer,@F_Province,@F_City,@F_County,@F_Address,@F_Telephone,@F_Mobile,@F_Fax,@F_Email,@F_PostCode,@F_Sex,@F_IdCard,@F_CreateBy,@F_CreatedOn,@F_ModifyBy,@F_ModifiedOn,@F_DeleteFlag,@F_DeleteBy,@F_DeleteOn,@F_Remark,@F_AboutLinkMan,@F_RelationShip)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_CustomerName", SqlDbType.NVarChar,200),
@@ -65,8 +65,10 @@ namespace RMYY_CallCenter_Api.Dal
                     new SqlParameter("@F_DeleteBy", SqlDbType.VarChar,50),
                     new SqlParameter("@F_DeleteOn", SqlDbType.DateTime),
                     new SqlParameter("@F_Remark", SqlDbType.NText),
-                      new SqlParameter("@F_AboutLinkMan", SqlDbType.VarChar,100)
-                    
+                      new SqlParameter("@F_AboutLinkMan", SqlDbType.VarChar,100),
+                       new SqlParameter("@F_RelationShip", SqlDbType.NVarChar,50)
+                      
+
             };
             parameters[0].Value = model.F_CustomerName;
             parameters[1].Value = model.F_CustomerCode;
@@ -91,7 +93,9 @@ namespace RMYY_CallCenter_Api.Dal
             parameters[20].Value = model.F_DeleteOn;
             parameters[21].Value = model.F_Remark;
             parameters[22].Value = model.F_AboutLinkMan;
-            
+            parameters[23].Value = model.F_RelationShip; 
+
+
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             {

RMYY_CallCenter_Api.Dal/T_Dis_WorkOrderItem.cs

@@ -41,9 +41,9 @@ namespace RMYY_CallCenter_Api.Dal
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Dis_WorkOrderItem(");
-            strSql.Append("F_WoID,F_WoType,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextUserName,F_NexUserPhon,F_NextUserTalkie,F_NextDept,F_IsUsed,F_CreateUser,F_CreateTime)");
+            strSql.Append("F_WoID,F_WoType,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextUserName,F_NexUserPhon,F_NextUserTalkie,F_NextDept,F_IsUsed,F_CreateUser,F_CreateTime,F_AboutReason ,F_AboutKey,F_EnterReason)");
             strSql.Append(" values (");
-            strSql.Append("@F_WoID,@F_WoType,@F_WoState,@F_ItemType,@F_OptType,@F_OptContent,@F_NextUser,@F_NextUserName,@F_NexUserPhon,@F_NextUserTalkie,@F_NextDept,@F_IsUsed,@F_CreateUser,@F_CreateTime)");
+            strSql.Append("@F_WoID,@F_WoType,@F_WoState,@F_ItemType,@F_OptType,@F_OptContent,@F_NextUser,@F_NextUserName,@F_NexUserPhon,@F_NextUserTalkie,@F_NextDept,@F_IsUsed,@F_CreateUser,@F_CreateTime,@F_AboutReason ,@F_AboutKey,@F_EnterReason)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WoID", SqlDbType.BigInt,8),
@@ -59,7 +59,10 @@ namespace RMYY_CallCenter_Api.Dal
                     new SqlParameter("@F_NextDept", SqlDbType.Int,4),
                     new SqlParameter("@F_IsUsed", SqlDbType.Int,4),
                     new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
-                    new SqlParameter("@F_CreateTime", SqlDbType.DateTime)};
+                    new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
+             new SqlParameter("@F_AboutReason", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_AboutKey", SqlDbType.Int,4),
+                    new SqlParameter("@F_EnterReason", SqlDbType.NVarChar,50)};
             parameters[0].Value = model.F_WoID;
             parameters[1].Value = model.F_WoType;
             parameters[2].Value = model.F_WoState;
@@ -75,6 +78,11 @@ namespace RMYY_CallCenter_Api.Dal
             parameters[12].Value = model.F_CreateUser;
             parameters[13].Value = model.F_CreateTime;
 
+
+            parameters[14].Value = model.F_AboutReason;
+            parameters[15].Value = model.F_AboutKey;
+            parameters[16].Value = model.F_EnterReason;
+
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             {
@@ -201,7 +209,7 @@ namespace RMYY_CallCenter_Api.Dal
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_ID,F_WoID,F_WoType,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextUserName,F_NexUserPhon,F_NextUserTalkie,F_NextDept,F_IsUsed,F_CreateUser,F_CreateTime from T_Dis_WorkOrderItem ");
+            strSql.Append("select  top 1 F_ID,F_WoID,F_WoType,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextUserName,F_NexUserPhon,F_NextUserTalkie,F_NextDept,F_IsUsed,F_CreateUser,F_CreateTime, F_AboutReason ,F_AboutKey,F_EnterReason from T_Dis_WorkOrderItem ");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_ID", SqlDbType.BigInt)
@@ -229,6 +237,19 @@ namespace RMYY_CallCenter_Api.Dal
             RMYY_CallCenter_Api.Model.T_Dis_WorkOrderItem model = new RMYY_CallCenter_Api.Model.T_Dis_WorkOrderItem();
             if (row != null)
             {
+                if (row["F_EnterReason"] != null)
+                {
+                    model.F_EnterReason = row["F_EnterReason"].ToString();
+                }
+
+                if (row["F_AboutReason"] != null)
+                {
+                    model.F_AboutReason = row["F_AboutReason"].ToString();
+                }
+                if (row["F_AboutKey"] != null && row["F_AboutKey"].ToString() != "")
+                {
+                    model.F_AboutKey = int.Parse(row["F_AboutKey"].ToString());
+                }
                 if (row["F_ID"] != null && row["F_ID"].ToString() != "")
                 {
                     model.F_ID = long.Parse(row["F_ID"].ToString());

RMYY_CallCenter_Api.Dal/T_FaultRepair_Base.cs

@@ -186,6 +186,8 @@ namespace RMYY_CallCenter_Api.DAL
             strSql.Append("F_AssignUser=@F_AssignUser,");
             strSql.Append("F_ReplayCount=@F_ReplayCount,");
             strSql.Append("MYD=@MYD,");
+            strSql.Append("F_AcceptTime=@F_AcceptTime,");
+            strSql.Append("F_EmergencyTypes=@F_EmergencyTypes,");
             strSql.Append("F_ConfirmEquip=@F_ConfirmEquip");
             
 
@@ -228,6 +230,8 @@ namespace RMYY_CallCenter_Api.DAL
                     new SqlParameter("@F_AssignUser", SqlDbType.NVarChar,100) ,
                   new SqlParameter("@F_ReplayCount", SqlDbType.Int,4),
                   new SqlParameter("@MYD", SqlDbType.Int,4),
+                   new SqlParameter("@F_AcceptTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_EmergencyTypes", SqlDbType.NVarChar,50) ,
 
                   new SqlParameter("@F_ConfirmEquip", SqlDbType.Int,4)
 
@@ -271,7 +275,9 @@ namespace RMYY_CallCenter_Api.DAL
             parameters[31].Value = model.F_AssignUser;
             parameters[32].Value = model.F_ReplayCount;
             parameters[33].Value = model.MYD;
-            parameters[34].Value = model.F_ConfirmEquip;
+            parameters[34].Value = model.F_AcceptTime;
+            parameters[35].Value = model.F_EmergencyTypes;
+            parameters[36].Value = model.F_ConfirmEquip;
 
 
             int rows=DbHelperSQL.ExecuteSql(strSql.ToString(),parameters);
@@ -336,7 +342,7 @@ namespace RMYY_CallCenter_Api.DAL
 		{
 			
 			StringBuilder strSql=new StringBuilder();
-			strSql.Append("select  top 1 F_WorkOrderId,F_WorkOrderCode,F_Applicant,F_ApplicationDept,F_Applicantsphone,F_Phone,F_WorkOrderCategory,F_Content,F_PlaceOfRepair,F_WorkOrderState,F_Maintenancer,F_MaintenanceDept,F_AssignTime,F_Endtime,F_UpdateTime,F_Deadline,F_CreateUser,F_CreateTime,F_CreateUserDept,F_File,F_ReturnNum,F_InternalWorkOrderCode,F_ExternalWorkOrderCode,F_IsDelete,F_IsStop,F_ReplayCount from T_FaultRepair_Base ");
+			strSql.Append("select  top 1 *  from T_FaultRepair_Base ");
 			strSql.Append(" where F_WorkOrderCode=@F_WorkOrderId");
 			SqlParameter[] parameters = {
 					new SqlParameter("@F_WorkOrderId", SqlDbType.VarChar)
@@ -408,7 +414,12 @@ namespace RMYY_CallCenter_Api.DAL
 				{
 					model.F_Maintenancer=row["F_Maintenancer"].ToString();
 				}
-				if(row["F_MaintenanceDept"]!=null)
+
+                if (row["F_EmergencyTypes"] != null)
+                {
+                    model.F_EmergencyTypes = row["F_EmergencyTypes"].ToString();
+                }
+                if (row["F_MaintenanceDept"]!=null)
 				{
 					model.F_MaintenanceDept=row["F_MaintenanceDept"].ToString();
 				}
@@ -420,7 +431,11 @@ namespace RMYY_CallCenter_Api.DAL
 				{
 					model.F_Endtime=DateTime.Parse(row["F_Endtime"].ToString());
 				}
-				if(row["F_UpdateTime"]!=null && row["F_UpdateTime"].ToString()!="")
+                if (row["F_AcceptTime"] != null && row["F_AcceptTime"].ToString() != "")
+                {
+                    model.F_AcceptTime = DateTime.Parse(row["F_AcceptTime"].ToString());
+                }
+                if (row["F_UpdateTime"]!=null && row["F_UpdateTime"].ToString()!="")
 				{
 					model.F_UpdateTime=DateTime.Parse(row["F_UpdateTime"].ToString());
 				}
@@ -485,7 +500,7 @@ namespace RMYY_CallCenter_Api.DAL
 		public DataSet GetList(string strWhere)
 		{
 			StringBuilder strSql=new StringBuilder();
-			strSql.Append("select F_WorkOrderId,F_WorkOrderCode,F_Applicant,F_ApplicationDept,F_Applicantsphone,F_Phone,F_WorkOrderCategory,F_Content,F_PlaceOfRepair,F_WorkOrderState,F_Maintenancer,F_MaintenanceDept,F_AssignTime,F_Endtime,F_UpdateTime,F_Deadline,F_CreateUser,F_CreateTime,F_CreateUserDept,F_File,F_ReturnNum,F_InternalWorkOrderCode,F_ExternalWorkOrderCode,F_IsDelete ,F_IsStop,F_ReplayCount");
+			strSql.Append("select *");
 			strSql.Append(" FROM T_FaultRepair_Base ");
 			if(strWhere.Trim()!="")
 			{

RMYY_CallCenter_Api.Dal/T_FaultRepair_OperationLog.cs

@@ -63,9 +63,9 @@ namespace RMYY_CallCenter_Api.DAL
 		{
 			StringBuilder strSql=new StringBuilder();
 			strSql.Append("insert into T_FaultRepair_OperationLog(");
-			strSql.Append("F_WorkOrderCode,F_Operator,F_LogContent,F_OperationType,F_OperationTime,F_UpdateTime,F_Isdelete)");
+			strSql.Append("F_WorkOrderCode,F_Operator,F_LogContent,F_OperationType,F_OperationTime,F_UpdateTime,F_Isdelete,  F_AboutReason ,F_AboutKey,F_EnterReason)");
 			strSql.Append(" values (");
-			strSql.Append("@F_WorkOrderCode,@F_Operator,@F_LogContent,@F_OperationType,@F_OperationTime,@F_UpdateTime,@F_Isdelete)");
+			strSql.Append("@F_WorkOrderCode,@F_Operator,@F_LogContent,@F_OperationType,@F_OperationTime,@F_UpdateTime,@F_Isdelete,  @F_AboutReason ,@F_AboutKey,@F_EnterReason)");
 			strSql.Append(";select @@IDENTITY");
 			SqlParameter[] parameters = {
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,100),
@@ -74,7 +74,13 @@ namespace RMYY_CallCenter_Api.DAL
 					new SqlParameter("@F_OperationType", SqlDbType.Int,4),
 					new SqlParameter("@F_OperationTime", SqlDbType.DateTime),
 					new SqlParameter("@F_UpdateTime", SqlDbType.DateTime),
-					new SqlParameter("@F_Isdelete", SqlDbType.Int,4)};
+					new SqlParameter("@F_Isdelete", SqlDbType.Int,4),
+
+    
+                    new SqlParameter("@F_AboutReason", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_AboutKey", SqlDbType.Int,4),
+                    new SqlParameter("@F_EnterReason", SqlDbType.NVarChar,50)
+            };
 			parameters[0].Value = model.F_WorkOrderCode;
 			parameters[1].Value = model.F_Operator;
 			parameters[2].Value = model.F_LogContent;
@@ -83,7 +89,10 @@ namespace RMYY_CallCenter_Api.DAL
 			parameters[5].Value = model.F_UpdateTime;
 			parameters[6].Value = model.F_Isdelete;
 
-			object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
+            parameters[7].Value = model.F_AboutReason;
+            parameters[8].Value = model.F_AboutKey;
+            parameters[9].Value = model.F_EnterReason;
+            object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
 			if (obj == null)
 			{
 				return 0;
@@ -188,7 +197,7 @@ namespace RMYY_CallCenter_Api.DAL
 		{
 			
 			StringBuilder strSql=new StringBuilder();
-			strSql.Append("select  top 1 F_OperationId,F_WorkOrderCode,F_Operator,F_LogContent,F_OperationType,F_OperationTime,F_UpdateTime,F_Isdelete from T_FaultRepair_OperationLog ");
+			strSql.Append("select  top 1 F_OperationId,F_WorkOrderCode,F_Operator,F_LogContent,F_OperationType,F_OperationTime,F_UpdateTime,F_Isdelete from T_FaultRepair_OperationLog, F_AboutReason ,F_AboutKey,F_EnterReason ");
 			strSql.Append(" where F_OperationId=@F_OperationId");
 			SqlParameter[] parameters = {
 					new SqlParameter("@F_OperationId", SqlDbType.Int,4)
@@ -245,10 +254,24 @@ namespace RMYY_CallCenter_Api.DAL
 					model.F_UpdateTime=DateTime.Parse(row["F_UpdateTime"].ToString());
 				}
 				if(row["F_Isdelete"]!=null && row["F_Isdelete"].ToString()!="")
-				{
-					model.F_Isdelete=int.Parse(row["F_Isdelete"].ToString());
-				}
-			}
+                {
+                    model.F_Isdelete = int.Parse(row["F_Isdelete"].ToString());
+                }
+
+                if (row["F_EnterReason"] != null)
+                {
+                    model.F_EnterReason = row["F_EnterReason"].ToString();
+                }
+                if (row["F_AboutReason"] != null)
+                {
+                    model.F_AboutReason = row["F_AboutReason"].ToString();
+                }
+                if (row["F_AboutKey"] != null && row["F_AboutKey"].ToString() != "")
+                {
+                    model.F_AboutKey = int.Parse(row["F_AboutKey"].ToString());
+                }
+
+            }
 			return model;
 		}
 

RMYY_CallCenter_Api.Dal/T_FaultRepair_Process.cs

@@ -63,9 +63,9 @@ namespace RMYY_CallCenter_Api.DAL
 		{
 			StringBuilder strSql=new StringBuilder();
 			strSql.Append("insert into T_FaultRepair_Process(");
-			strSql.Append("F_WorkOrderCode,F_Maintenancer,F_MaintenanceDept,F_ProcessingTime,F_Result,F_File,F_ReturnReason,F_Isdelete,F_UpdateTime,F_DealType,F_IsInvolvedEquip,F_ExceptionType)");
+			strSql.Append("F_WorkOrderCode,F_Maintenancer,F_MaintenanceDept,F_ProcessingTime,F_Result,F_File,F_ReturnReason,F_Isdelete,F_UpdateTime,F_DealType,F_IsInvolvedEquip,F_ExceptionType,F_FinishType)");
 			strSql.Append(" values (");
-			strSql.Append("@F_WorkOrderCode,@F_Maintenancer,@F_MaintenanceDept,@F_ProcessingTime,@F_Result,@F_File,@F_ReturnReason,@F_Isdelete,@F_UpdateTime,@F_DealType,@F_IsInvolvedEquip,@F_ExceptionType)");
+			strSql.Append("@F_WorkOrderCode,@F_Maintenancer,@F_MaintenanceDept,@F_ProcessingTime,@F_Result,@F_File,@F_ReturnReason,@F_Isdelete,@F_UpdateTime,@F_DealType,@F_IsInvolvedEquip,@F_ExceptionType,@F_FinishType)");
 			strSql.Append(";select @@IDENTITY");
 			SqlParameter[] parameters = {
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,100),
@@ -79,7 +79,8 @@ namespace RMYY_CallCenter_Api.DAL
 					new SqlParameter("@F_UpdateTime", SqlDbType.DateTime),
 new SqlParameter("@F_DealType", SqlDbType.Int,4),
 new SqlParameter("@F_IsInvolvedEquip", SqlDbType.NVarChar,500),
-new SqlParameter("@F_ExceptionType", SqlDbType.Int,4)
+new SqlParameter("@F_ExceptionType", SqlDbType.Int,4),
+new SqlParameter("@F_FinishType", SqlDbType.NVarChar,500)
 
 
 
@@ -96,7 +97,7 @@ new SqlParameter("@F_ExceptionType", SqlDbType.Int,4)
             parameters[9].Value = model.F_DealType;
             parameters[10].Value = model.F_IsInvolvedEquip;
             parameters[11].Value = model.F_ExceptionType;
-            
+            parameters[12].Value = model.F_FinishType;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
 			if (obj == null)

RMYY_CallCenter_Api.Dal/T_IntegratedScheduling_Base.cs

@@ -64,9 +64,9 @@ namespace RMYY_CallCenter_Api.DAL
 		{
 			StringBuilder strSql=new StringBuilder();
 			strSql.Append("insert into T_IntegratedScheduling_Base(");
-			strSql.Append("F_WorkOrderCode,F_WorkOrderCategory,F_Content,F_Applicant,F_ApplicationDept,F_Phone,F_Location,F_ToPlace,F_WorkOrderState,F_DealMan,F_DealDept,F_ReplayCount,F_RemindCount,F_CallId,F_CallRecordId,F_AssignTime,F_AssignUser,F_Endtime,F_Deadline,F_UpdateTime,F_CreateTime,F_CreateUser,F_CreateUserDept,F_File,F_IsDelete,F_LeaveRecordId,F_CFNum)");
+			strSql.Append("F_WorkOrderCode,F_WorkOrderCategory,F_Content,F_Applicant,F_ApplicationDept,F_Phone,F_Location,F_ToPlace,F_WorkOrderState,F_DealMan,F_DealDept,F_ReplayCount,F_RemindCount,F_CallId,F_CallRecordId,F_AssignTime,F_AssignUser,F_Endtime,F_Deadline,F_UpdateTime,F_CreateTime,F_CreateUser,F_CreateUserDept,F_File,F_IsDelete,F_LeaveRecordId,F_CFNum,F_EmergencyTypes)");
 			strSql.Append(" values (");
-			strSql.Append("@F_WorkOrderCode,@F_WorkOrderCategory,@F_Content,@F_Applicant,@F_ApplicationDept,@F_Phone,@F_Location,@F_ToPlace,@F_WorkOrderState,@F_DealMan,@F_DealDept,@F_ReplayCount,@F_RemindCount,@F_CallId,@F_CallRecordId,@F_AssignTime,@F_AssignUser,@F_Endtime,@F_Deadline,@F_UpdateTime,@F_CreateTime,@F_CreateUser,@F_CreateUserDept,@F_File,@F_IsDelete,@F_LeaveRecordId,@F_CFNum)");
+			strSql.Append("@F_WorkOrderCode,@F_WorkOrderCategory,@F_Content,@F_Applicant,@F_ApplicationDept,@F_Phone,@F_Location,@F_ToPlace,@F_WorkOrderState,@F_DealMan,@F_DealDept,@F_ReplayCount,@F_RemindCount,@F_CallId,@F_CallRecordId,@F_AssignTime,@F_AssignUser,@F_Endtime,@F_Deadline,@F_UpdateTime,@F_CreateTime,@F_CreateUser,@F_CreateUserDept,@F_File,@F_IsDelete,@F_LeaveRecordId,@F_CFNum,@F_EmergencyTypes)");
 			strSql.Append(";select @@IDENTITY");
 			SqlParameter[] parameters = {
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,100),
@@ -96,7 +96,8 @@ namespace RMYY_CallCenter_Api.DAL
 					new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
                     
                     new SqlParameter("@F_LeaveRecordId", SqlDbType.Int,4),
-                    new SqlParameter("@F_CFNum", SqlDbType.Int,4)
+                 new SqlParameter("@F_EmergencyTypes", SqlDbType.NVarChar,50),   
+            new SqlParameter("@F_CFNum", SqlDbType.Int,4)
             };
 			parameters[0].Value = model.F_WorkOrderCode;
 			parameters[1].Value = model.F_WorkOrderCategory;
@@ -124,7 +125,9 @@ namespace RMYY_CallCenter_Api.DAL
 			parameters[23].Value = model.F_File;
 			parameters[24].Value = model.F_IsDelete;
             parameters[25].Value = model.F_LeaveRecordId;
-            parameters[26].Value = model.F_CFNum;
+            parameters[26].Value = model.F_EmergencyTypes;
+
+            parameters[27].Value = model.F_CFNum;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
 			if (obj == null)
@@ -170,6 +173,8 @@ namespace RMYY_CallCenter_Api.DAL
 			strSql.Append("F_IsDelete=@F_IsDelete,");
             strSql.Append("F_Score=@F_Score,");
             strSql.Append("MYD=@MYD,");
+            strSql.Append("F_AcceptTime=@F_AcceptTime,");
+            strSql.Append("F_EmergencyTypes=@F_EmergencyTypes,");
             strSql.Append("F_CFNum=@F_CFNum");
             
 
@@ -204,7 +209,9 @@ namespace RMYY_CallCenter_Api.DAL
 					new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
                     new SqlParameter("@F_Score", SqlDbType.Int,4),
                        new SqlParameter("@MYD", SqlDbType.Int,4),
-                    
+                    new SqlParameter("@F_AcceptTime", SqlDbType.DateTime),
+                      new SqlParameter("@F_EmergencyTypes", SqlDbType.NVarChar,50) ,
+
                     new SqlParameter("@F_CFNum", SqlDbType.Int,4),
                     
 
@@ -236,9 +243,13 @@ namespace RMYY_CallCenter_Api.DAL
 			parameters[24].Value = model.F_IsDelete;
 
             parameters[25].Value = model.F_Score;
-            parameters[26].Value = model.MYD; 
-            parameters[27].Value = model.F_CFNum;
-            parameters[28].Value = model.F_WorkOrderId;
+            parameters[26].Value = model.MYD;
+            parameters[27].Value = model.F_AcceptTime;
+            parameters[28].Value = model.F_EmergencyTypes;
+
+
+            parameters[29].Value = model.F_CFNum;
+            parameters[30].Value = model.F_WorkOrderId;
 
 			int rows=DbHelperSQL.ExecuteSql(strSql.ToString(),parameters);
 			if (rows > 0)
@@ -302,7 +313,7 @@ namespace RMYY_CallCenter_Api.DAL
 		{
 			
 			StringBuilder strSql=new StringBuilder();
-			strSql.Append("select  top 1 F_WorkOrderId,F_WorkOrderCode,F_WorkOrderCategory,F_Content,F_Applicant,F_ApplicationDept,F_Phone,F_Location,F_ToPlace,F_WorkOrderState,F_DealMan,F_DealDept,F_ReplayCount,F_RemindCount,F_CallId,F_CallRecordId,F_AssignTime,F_AssignUser,F_Endtime,F_Deadline,F_UpdateTime,F_CreateTime,F_CreateUser,F_CreateUserDept,F_File,F_IsDelete ,F_LeaveRecordId from T_IntegratedScheduling_Base ");
+			strSql.Append("select  top 1 *  from T_IntegratedScheduling_Base ");
 			strSql.Append(" where F_WorkOrderCode=@F_WorkOrderCode");
 			SqlParameter[] parameters = {
 					new SqlParameter("@F_WorkOrderCode",SqlDbType.NVarChar,100)
@@ -334,7 +345,13 @@ namespace RMYY_CallCenter_Api.DAL
 				{
 					model.F_WorkOrderId=int.Parse(row["F_WorkOrderId"].ToString());
 				}
-				if(row["F_WorkOrderCode"]!=null)
+
+                if (row["F_EmergencyTypes"] != null)
+                {
+                    model.F_EmergencyTypes = row["F_EmergencyTypes"].ToString();
+                }
+
+                if (row["F_WorkOrderCode"]!=null)
 				{
 					model.F_WorkOrderCode=row["F_WorkOrderCode"].ToString();
 				}
@@ -404,7 +421,11 @@ namespace RMYY_CallCenter_Api.DAL
 				{
 					model.F_AssignUser=row["F_AssignUser"].ToString();
 				}
-				if(row["F_Endtime"]!=null && row["F_Endtime"].ToString()!="")
+                if (row["F_AcceptTime"] != null && row["F_AcceptTime"].ToString() != "")
+                {
+                    model.F_AcceptTime = DateTime.Parse(row["F_AcceptTime"].ToString());
+                }
+                if (row["F_Endtime"]!=null && row["F_Endtime"].ToString()!="")
 				{
 					model.F_Endtime=DateTime.Parse(row["F_Endtime"].ToString());
 				}
@@ -452,7 +473,7 @@ namespace RMYY_CallCenter_Api.DAL
 		public DataSet GetList(string strWhere)
 		{
 			StringBuilder strSql=new StringBuilder();
-			strSql.Append("select F_WorkOrderId,F_WorkOrderCode,F_WorkOrderCategory,F_Content,F_Applicant,F_ApplicationDept,F_Phone,F_Location,F_ToPlace,F_WorkOrderState,F_DealMan,F_DealDept,F_ReplayCount,F_RemindCount,F_CallId,F_CallRecordId,F_AssignTime,F_AssignUser,F_Endtime,F_Deadline,F_UpdateTime,F_CreateTime,F_CreateUser,F_CreateUserDept,F_File,F_IsDelete,F_LeaveRecordId ");
+			strSql.Append("select *");
 			strSql.Append(" FROM T_IntegratedScheduling_Base ");
 			if(strWhere.Trim()!="")
 			{

RMYY_CallCenter_Api.Dal/T_IntegratedScheduling_OperationLog.cs

@@ -63,9 +63,9 @@ namespace RMYY_CallCenter_Api.DAL
 		{
 			StringBuilder strSql=new StringBuilder();
 			strSql.Append("insert into T_IntegratedScheduling_OperationLog(");
-			strSql.Append("F_WorkOrderCode,F_Operator,F_LogContent,F_OperationType,F_OperationTime,F_UpdateTime,F_Isdelete)");
+			strSql.Append("F_WorkOrderCode,F_Operator,F_LogContent,F_OperationType,F_OperationTime,F_UpdateTime,F_Isdelete,   F_AboutReason ,F_AboutKey,F_EnterReason)");
 			strSql.Append(" values (");
-			strSql.Append("@F_WorkOrderCode,@F_Operator,@F_LogContent,@F_OperationType,@F_OperationTime,@F_UpdateTime,@F_Isdelete)");
+			strSql.Append("@F_WorkOrderCode,@F_Operator,@F_LogContent,@F_OperationType,@F_OperationTime,@F_UpdateTime,@F_Isdelete,@F_AboutReason ,@F_AboutKey,@F_EnterReason)");
 			strSql.Append(";select @@IDENTITY");
 			SqlParameter[] parameters = {
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,100),
@@ -74,7 +74,11 @@ namespace RMYY_CallCenter_Api.DAL
 					new SqlParameter("@F_OperationType", SqlDbType.Int,4),
 					new SqlParameter("@F_OperationTime", SqlDbType.DateTime),
 					new SqlParameter("@F_UpdateTime", SqlDbType.DateTime),
-					new SqlParameter("@F_Isdelete", SqlDbType.Int,4)};
+					new SqlParameter("@F_Isdelete", SqlDbType.Int,4),
+
+    new SqlParameter("@F_AboutReason", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_AboutKey", SqlDbType.Int,4),
+                    new SqlParameter("@F_EnterReason", SqlDbType.NVarChar,50)};
 			parameters[0].Value = model.F_WorkOrderCode;
 			parameters[1].Value = model.F_Operator;
 			parameters[2].Value = model.F_LogContent;
@@ -82,8 +86,11 @@ namespace RMYY_CallCenter_Api.DAL
 			parameters[4].Value = model.F_OperationTime;
 			parameters[5].Value = model.F_UpdateTime;
 			parameters[6].Value = model.F_Isdelete;
+            parameters[7].Value = model.F_AboutReason;
+            parameters[8].Value = model.F_AboutKey;
+            parameters[9].Value = model.F_EnterReason;
 
-			object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
+            object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
 			if (obj == null)
 			{
 				return 0;
@@ -188,7 +195,7 @@ namespace RMYY_CallCenter_Api.DAL
 		{
 			
 			StringBuilder strSql=new StringBuilder();
-			strSql.Append("select  top 1 F_OperationId,F_WorkOrderCode,F_Operator,F_LogContent,F_OperationType,F_OperationTime,F_UpdateTime,F_Isdelete from T_IntegratedScheduling_OperationLog ");
+			strSql.Append("select  top 1 F_OperationId,F_WorkOrderCode,F_Operator,F_LogContent,F_OperationType,F_OperationTime,F_UpdateTime,F_Isdelete,    F_AboutReason ,F_AboutKey,F_EnterReason from T_IntegratedScheduling_OperationLog ");
 			strSql.Append(" where F_OperationId=@F_OperationId");
 			SqlParameter[] parameters = {
 					new SqlParameter("@F_OperationId", SqlDbType.Int,4)
@@ -248,7 +255,20 @@ namespace RMYY_CallCenter_Api.DAL
 				{
 					model.F_Isdelete=int.Parse(row["F_Isdelete"].ToString());
 				}
-			}
+                if (row["F_EnterReason"] != null)
+                {
+                    model.F_EnterReason = row["F_EnterReason"].ToString();
+                }
+
+                if (row["F_AboutReason"] != null)
+                {
+                    model.F_AboutReason = row["F_AboutReason"].ToString();
+                }
+                if (row["F_AboutKey"] != null && row["F_AboutKey"].ToString() != "")
+                {
+                    model.F_AboutKey = int.Parse(row["F_AboutKey"].ToString());
+                }
+            }
 			return model;
 		}
 

RMYY_CallCenter_Api.Dal/T_Msg_Chat.cs

@@ -47,9 +47,9 @@ namespace RMYY_CallCenter_Api.Dal
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Msg_Chat(");
-            strSql.Append("Content,VoiceUrl,CreateDate,FromUserId,ToUserId,ToRoleId,IsToAll,IsDelete)");
+            strSql.Append("Content,VoiceUrl,CreateDate,FromUserId,ToUserId,ToRoleId,IsToAll,IsDelete,Files)");
             strSql.Append(" values (");
-            strSql.Append("@Content,@VoiceUrl,@CreateDate,@FromUserId,@ToUserId,@ToRoleId,@IsToAll,@IsDelete)");
+            strSql.Append("@Content,@VoiceUrl,@CreateDate,@FromUserId,@ToUserId,@ToRoleId,@IsToAll,@IsDelete,@Files)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@Content", SqlDbType.NText),
@@ -59,7 +59,10 @@ namespace RMYY_CallCenter_Api.Dal
                     new SqlParameter("@ToUserId", SqlDbType.Int,4),
                     new SqlParameter("@ToRoleId", SqlDbType.Int,4),
                     new SqlParameter("@IsToAll", SqlDbType.Int,4),
-                    new SqlParameter("@IsDelete", SqlDbType.Int,4)};
+                    new SqlParameter("@IsDelete", SqlDbType.Int,4),
+                      new SqlParameter("@Files", SqlDbType.NVarChar,100)
+                    
+            };
             parameters[0].Value = model.Content;
             parameters[1].Value = model.VoiceUrl;
             parameters[2].Value = model.CreateDate;
@@ -68,7 +71,7 @@ namespace RMYY_CallCenter_Api.Dal
             parameters[5].Value = model.ToRoleId;
             parameters[6].Value = model.IsToAll;
             parameters[7].Value = model.IsDelete;
-
+            parameters[8].Value = model.Files;
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             {
@@ -177,7 +180,7 @@ namespace RMYY_CallCenter_Api.Dal
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 Id,Content,VoiceUrl,CreateDate,FromUserId,ToUserId,ToRoleId,IsToAll,IsDelete from T_Msg_Chat ");
+            strSql.Append("select  top 1 Id,Content,VoiceUrl,CreateDate,FromUserId,ToUserId,ToRoleId,IsToAll,Files,IsDelete from T_Msg_Chat ");
             strSql.Append(" where Id=@Id");
             SqlParameter[] parameters = {
                     new SqlParameter("@Id", SqlDbType.Int,4)
@@ -213,6 +216,11 @@ namespace RMYY_CallCenter_Api.Dal
                 {
                     model.Content = row["Content"].ToString();
                 }
+                
+ if (row["Files"] != null)
+                {
+                    model.Files = row["Files"].ToString();
+                }
                 if (row["VoiceUrl"] != null)
                 {
                     model.VoiceUrl = row["VoiceUrl"].ToString();
@@ -251,7 +259,7 @@ namespace RMYY_CallCenter_Api.Dal
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select Id,Content,VoiceUrl,CreateDate,FromUserId,ToUserId,ToRoleId,IsToAll,IsDelete ");
+            strSql.Append("select Id,Content,VoiceUrl,CreateDate,FromUserId,ToUserId,ToRoleId,IsToAll,IsDelete ,Files");
             strSql.Append(" FROM T_Msg_Chat ");
             if (strWhere.Trim() != "")
             {

RMYY_CallCenter_Api.Model/T_Car_Operation.cs

@@ -18,6 +18,28 @@ namespace RMYY_CallCenter_Api.Model
         private int? _f_state;
         private string _f_createuser;
         private int? _f_isdelete;
+        private string _f_aboutreason;
+        private int? _f_aboutkey;
+        private string _f_enterreason;
+        //1、返修 2、挂起、3、退单、延时 相关的原因
+        public string F_AboutReason
+        {
+            set { _f_aboutreason = value; }
+            get { return _f_aboutreason; }
+        }
+        /// <summary>
+        /// 返修 2、挂起、3、退单、延时 原因的 key,这个是字典的key
+        /// </summary>
+        public int? F_AboutKey
+        {
+            set { _f_aboutkey = value; }
+            get { return _f_aboutkey; }
+        }
+        public string F_EnterReason
+        {
+            set { _f_enterreason = value; }
+            get { return _f_enterreason; }
+        }
         /// <summary>
         /// 
         /// </summary>

RMYY_CallCenter_Api.Model/T_Car_WorkOrder.cs

@@ -43,11 +43,23 @@ namespace RMYY_CallCenter_Api.Model
         private string _f_assistman;
         private int? _f_isassist = 0;
         private DateTime? _f_finishtime;
+        private DateTime? _f_accepttime;
         private int? _f_carid;
         private string _f_assistmanname;
         private int? _f_myd;
         private int? _f_urgecount;
+        private string _f_emergencytypes;
+        // 所有工单类型增加紧急字段，为单选（一般、紧急），默认为一般
 
+
+        public string F_EmergencyTypes
+
+        {
+            set { _f_emergencytypes = value; }
+
+            get { return _f_emergencytypes; }
+
+        }
         public int? MYD
         {
             set { _f_myd = value; }
@@ -275,13 +287,19 @@ namespace RMYY_CallCenter_Api.Model
             get { return _f_isassist; }
         }
         /// <summary>
-        /// 完成时间
+        /// 评价完成时间
         /// </summary>
         public DateTime? F_FinishTime
         {
             set { _f_finishtime = value; }
             get { return _f_finishtime; }
         }
+        //接单时间
+        public DateTime? F_AcceptTime
+        {
+            set { _f_accepttime = value; }
+            get { return _f_accepttime; }
+        }
         /// <summary>
         /// 用车时间
         /// </summary>
@@ -317,7 +335,7 @@ namespace RMYY_CallCenter_Api.Model
             get;set;
         }
         /// <summary>
-        /// 目的地时间
+        /// 到达目的地时间
         /// </summary>
         public DateTime? F_EndTime
         {
@@ -362,6 +380,8 @@ namespace RMYY_CallCenter_Api.Model
         public string F_TypeName { get; set; }
 
         public string HosName { get; set; }
+        public string SpendTime { get; set; }
+
         public string F_ProposerDeptName { get; set; }
         public string F_CarName { get; set; }
         public string StateName { set; get; }

RMYY_CallCenter_Api.Model/T_Con_WorkOrder.cs

@@ -108,6 +108,27 @@ namespace RMYY_CallCenter_Api.Model
             get { return _f_callrecordid; }
         }
 
+        private DateTime? _f_accepttime;
+
+        public string _f_spendtime;
+        private string _f_emergencytypes;
+        // 所有工单类型增加紧急字段，为单选（一般、紧急），默认为一般
+
+
+        public string F_EmergencyTypes
+
+        {
+            set { _f_emergencytypes = value; }
+
+            get { return _f_emergencytypes; }
+
+        }
+
+        public DateTime? F_AcceptTime
+        {
+            set { _f_accepttime = value; }
+            get { return _f_accepttime; }
+        }
 
 
         /// <summary>
@@ -592,6 +613,13 @@ namespace RMYY_CallCenter_Api.Model
             get { return _f_typename3; }
         }
 
+        public string SpendTime
+        {
+            set { _f_spendtime = value; }
+            get { return _f_spendtime; }
+        }
+
+
         public string  ComplaintSourceName
         {
             set { _f_complaintsourcename = value; }

RMYY_CallCenter_Api.Model/T_Cus_Customer.cs

@@ -35,7 +35,7 @@ namespace RMYY_CallCenter_Api.Model
         private string _remark;
 
         private string _aboutlinkman;
-
+        private string _relationship;
         public string F_AboutLinkMan
         {
             set { _aboutlinkman = value; }
@@ -228,6 +228,12 @@ namespace RMYY_CallCenter_Api.Model
             set { _remark = value; }
             get { return _remark; }
         }
+
+        public string F_RelationShip
+        {
+            set { _relationship = value; }
+            get { return _relationship; }
+        }
         #endregion Model
 
     }

RMYY_CallCenter_Api.Model/T_Dis_WorkOrderItem.cs

@@ -30,6 +30,33 @@ namespace RMYY_CallCenter_Api.Model
         private int? _f_isused = 0;
         private string _f_createuser;
         private DateTime? _f_createtime;
+
+        private string _f_aboutreason;
+        private int? _f_aboutkey;
+        private string _f_enterreason;
+
+
+
+        //1、返修 2、挂起、3、退单、延时 相关的原因
+        public string F_AboutReason
+        {
+            set { _f_aboutreason = value; }
+            get { return _f_aboutreason; }
+        }
+        /// <summary>
+        /// 返修 2、挂起、3、退单、延时 原因的 key,这个是字典的key
+        /// </summary>
+        public int? F_AboutKey
+        {
+            set { _f_aboutkey = value; }
+            get { return _f_aboutkey; }
+        }
+        public string F_EnterReason
+        {
+            set { _f_enterreason = value; }
+            get { return _f_enterreason; }
+        }
+
         /// <summary>
         /// 工单记录ID
         /// </summary>

RMYY_CallCenter_Api.Model/T_FaultRepair_Base.cs

@@ -39,7 +39,10 @@ namespace RMYY_CallCenter_Api.Model
 		private string _f_maintenancer;
 		private string _f_maintenancedept;
 		private DateTime? _f_assigntime;
-		private DateTime? _f_endtime;
+
+        private DateTime? _f_accepttime;
+
+        private DateTime? _f_endtime;
 		private DateTime? _f_updatetime;
 		private DateTime? _f_deadline;
 		private string _f_createuser;
@@ -63,7 +66,14 @@ namespace RMYY_CallCenter_Api.Model
 
         private int f_confirmequip = 0;
 
-        
+        private string _f_emergencytypes;
+       // 所有工单类型增加紧急字段，为单选（一般、紧急），默认为一般
+        public string  F_EmergencyTypes
+        {
+            set { _f_emergencytypes = value; }
+            get { return _f_emergencytypes; }
+        }
+
         /// <summary>
         /// 默认=0，需要确认耗材=1 ，已确认耗材=2
         /// </summary>
@@ -242,10 +252,15 @@ namespace RMYY_CallCenter_Api.Model
 			set{ _f_assigntime=value;}
 			get{return _f_assigntime;}
 		}
-		/// <summary>
-		/// 
-		/// </summary>
-		public DateTime? F_Endtime
+        public DateTime? F_AcceptTime
+        {
+            set { _f_accepttime = value; }
+            get { return _f_accepttime; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? F_Endtime
 		{
 			set{ _f_endtime=value;}
 			get{return _f_endtime;}

RMYY_CallCenter_Api.Model/T_FaultRepair_OperationLog.cs

@@ -34,10 +34,41 @@ namespace RMYY_CallCenter_Api.Model
 		private DateTime? _f_operationtime= DateTime.Now;
 		private DateTime? _f_updatetime;
 		private int? _f_isdelete=0;
-		/// <summary>
-		/// 
-		/// </summary>
-		public int F_OperationId
+
+
+        private string _f_aboutreason;
+        private int? _f_aboutkey;
+        private string _f_enterreason;
+
+       
+
+        //1、返修 2、挂起、3、退单、延时 相关的原因
+        public string F_AboutReason
+        {
+            set { _f_aboutreason = value; }
+            get { return _f_aboutreason; }
+        }
+        /// <summary>
+        /// 返修 2、挂起、3、退单、延时 原因的 key,这个是字典的key
+        /// </summary>
+        public int? F_AboutKey
+        {
+            set { _f_aboutkey = value; }
+            get { return _f_aboutkey; }
+        }
+        public string F_EnterReason
+        {
+            set { _f_enterreason = value; }
+            get { return _f_enterreason; }
+        }
+
+
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int F_OperationId
 		{
 			set{ _f_operationid=value;}
 			get{return _f_operationid;}

RMYY_CallCenter_Api.Model/T_FaultRepair_Process.cs

@@ -34,7 +34,7 @@ namespace RMYY_CallCenter_Api.Model
 		private string _f_result;
 		private string _f_file;
 		private string _f_returnreason;
-      
+        private string _f_finishtype;
         private int  _f_dealtype;
         private int? _f_isdelete=0;
 		private DateTime? _f_updatetime;
@@ -102,10 +102,17 @@ namespace RMYY_CallCenter_Api.Model
 			set{ _f_workordercode=value;}
 			get{return _f_workordercode;}
 		}
-		/// <summary>
-		/// 
-		/// </summary>
-		public string F_Maintenancer
+       //报修工单完工时增加处理方式：“远程”、“现场”，默认现场，另外工单详情中需要显示该字段信息
+        public string F_FinishType
+        {
+            set { _f_finishtype = value; }
+            get { return _f_finishtype; }
+        }
+        
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_Maintenancer
 		{
 			set{ _f_maintenancer=value;}
 			get{return _f_maintenancer;}

RMYY_CallCenter_Api.Model/T_IntegratedScheduling_Base.cs

@@ -45,7 +45,8 @@ namespace RMYY_CallCenter_Api.Model
 		private DateTime? _f_assigntime;
 		private string _f_assignuser;
 		private DateTime? _f_endtime;
-		private DateTime? _f_deadline;
+        private DateTime? _f_accepttime;
+        private DateTime? _f_deadline;
 		private DateTime? _f_updatetime;
 		private DateTime? _f_createtime;
 		private string _f_createuser;
@@ -56,6 +57,24 @@ namespace RMYY_CallCenter_Api.Model
         private int? _f_score;
         private int? _f_myd;
         private int? _f_cfnum;
+        private string _f_emergencytypes;
+        // 所有工单类型增加紧急字段，为单选（一般、紧急），默认为一般
+
+
+        public string  F_EmergencyTypes
+
+        {
+            set { _f_emergencytypes = value; }
+
+            get { return _f_emergencytypes; }
+
+        }
+
+        public DateTime? F_AcceptTime
+        {
+            set { _f_accepttime = value; }
+            get { return _f_accepttime; }
+        }
 
         public int? F_CFNum
         {

RMYY_CallCenter_Api.Model/T_IntegratedScheduling_OperationLog.cs

@@ -34,10 +34,42 @@ namespace RMYY_CallCenter_Api.Model
 		private DateTime? _f_operationtime;
 		private DateTime? _f_updatetime;
 		private int? _f_isdelete;
-		/// <summary>
-		/// 
-		/// </summary>
-		public int F_OperationId
+
+        private string _f_aboutreason;
+        private int? _f_aboutkey;
+        private string _f_enterreason;
+
+
+
+        //1、返修 2、挂起、3、退单、延时 相关的原因的value
+        public string F_AboutReason
+        {
+            set { _f_aboutreason = value; }
+            get { return _f_aboutreason; }
+        }
+        /// <summary>
+        /// 返修 2、挂起、3、退单、延时 原因的 key,这个是字典的key
+        /// </summary>
+        public int? F_AboutKey
+        {
+            set { _f_aboutkey = value; }
+            get { return _f_aboutkey; }
+        }
+        /// <summary>
+        /// 手动输入的 选了其他输入的
+        /// </summary>
+        public string F_EnterReason
+        {
+            set { _f_enterreason = value; }
+            get { return _f_enterreason; }
+        }
+
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int F_OperationId
 		{
 			set{ _f_operationid=value;}
 			get{return _f_operationid;}

RMYY_CallCenter_Api.Model/T_Msg_Chat.cs

@@ -20,6 +20,14 @@ namespace RMYY_CallCenter_Api.Model
         private int? _toroleid;
         private int? _istoall;
         private int? _isdelete;
+        private string _files;
+
+        public string Files
+        {
+            set { _files = value; }
+            get { return _files; }
+        }
+
         /// <summary>
         /// Id
         /// </summary>

RMYY_CallCenter_Api.QuartzWorker/PushWorkorder.cs

@@ -30,6 +30,8 @@ namespace RMYY_CallCenter_Api.QuartzWorker
             string Dataur3 = web.DownloadString(api + "T_Car_WorkOrder/Evaluate");
             string Dataur4 = web.DownloadString(api + "InternalMessages/DingTalkGetMessage");
             string Dataur5 = web.DownloadString(api + "FaultRepair/AutoSendOverTimeMsg");
+            string  Dataur6 = web.DownloadString(api + "FaultRepair/AutoChangeDealMan");
+            
 
 
         }

RMYY_CallCenter_Api/Common/WorkOrderBase.cs

@@ -402,7 +402,7 @@ namespace RMYY_CallCenter_Api
                 #region 故障报修  报修列表页面，如果已经挂起,所有的按钮删除，只留下处理人的完成按钮；挂起的工单 其他页面没有按钮
                 if (menuName == MENUENUM.报修列表)
                 {
-                    if (dr["F_IsStop"] != null && Convert.ToInt32(dr["F_IsStop"].ToString()) == 1)
+                    if (dr["F_IsStop"] != null && Convert.ToInt32(dr["F_IsStop"].ToString()) == 1 && (Convert.ToInt32( dr["F_Status"].ToString())<3 || Convert.ToInt32(dr["F_Status"].ToString()) ==6))
                     {
                         var hasButton = allButtons.Where(p => p.value == "完成").FirstOrDefault();
                         allButtons.Clear();
@@ -411,12 +411,15 @@ namespace RMYY_CallCenter_Api
                         
                     }
                 }
-                else if (thisTypeId == 3000)
+                else if (thisTypeId == 3000   && menuName == MENUENUM.我的提交)
                 {
-                    if (dr["F_IsStop"] != null && Convert.ToInt32(dr["F_IsStop"].ToString()) == 1)
-                    {                       
+                    if (dr["F_IsStop"] != null && Convert.ToInt32(dr["F_IsStop"].ToString()) == 1 && Convert.ToInt32(dr["F_Status"].ToString()) ==3 )
+                    {
+                        var hasButton = allButtons.Where(p => p.value == "评价").FirstOrDefault();
                         allButtons.Clear();
-                      
+                        if (hasButton != null)
+                        { allButtons.Add(hasButton); }
+
                     }
                 }
                 #endregion
@@ -512,11 +515,11 @@ namespace RMYY_CallCenter_Api
             {
                 typeIdArray = new List<int> { -1,0, 1, 2, 3, 4, 5, 6 };
             }
-            else if (type == 1000)
+            else if (type == 1000) //业务咨询
             {
                 typeIdArray = new List<int> { 0, 0, 1, 2, -1, 10, -1, -1,3,4,7 };
             }
-            else if (type == 2000)
+            else if (type == 2000)//综合调度
             {
                 typeIdArray = new List<int> { -1, 0, 1, 2, 3, 4 };
                  
@@ -544,7 +547,7 @@ namespace RMYY_CallCenter_Api
                     strArr = new List<string> { "待提交", "待派单", "待接单", "已接单", "待评价", "已完成", "已完成","已接单","已退回","办理中","待回访" }; break;
                 case MENUENUM.工单列表:
                     if(type==3000)
-                        strArr = new List<string> { "待提交", "待派单", "待查收", "待完成", "已处理", "异常完结", "已完结", "待完成" };
+                        strArr = new List<string> { "待提交", "待派单", "待接单", "待完成", "已处理", "异常完结", "已完结", "待完成" };
                     else
                     strArr = new List<string> { "待提交", "待派单", "待接单", "待完成", "已处理", "已完成", "已完成", "已接单", "已退回", "办理中", "待回访" }; break;
                 case MENUENUM.报修列表:

RMYY_CallCenter_Api/Controllers/CarManage/T_Car_WorkOrderController.cs

@@ -339,7 +339,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
         /// <returns></returns>
         public ActionResult AddWorkOrder(int type,int hosid,string content,   
             int detpid,string startplace,string endplace,string needman,string phon,
-            int cartype,string remark,  string source,string usertime,int birth,string callid ="",int LeaveRecordId=0)
+            int cartype,string remark, string EmergencyTypes, string source,string usertime,int birth,string callid ="",int LeaveRecordId=0)
         {
             if (User!=null)
             {
@@ -378,6 +378,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
                 model.F_State = (int)EnumWorkOrderState.neworder;//0
                 model.F_CreateUser = User.F_UserCode;
                 model.F_IsDel = 0;
+                model.F_EmergencyTypes = EmergencyTypes;
                 if ( LeaveRecordId> 0)
 
                 {
@@ -428,7 +429,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
         /// <returns></returns>
         public ActionResult UpdateWorkOrder(string WorkOrderCode, 
             string usertime,string content, int type,int hosid, int detpid, string startplace, string endplace,
-            string needman,string needmanName, string phon,int birth, int cartype, string remark)
+            string needman,string needmanName,string EmergencyTypes, string phon,int birth, int cartype, string remark)
         {
             int userId = 1;
             if (userId != 0)
@@ -467,6 +468,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
                 model.F_Remark = remark;//备注
                 model.F_State = 0;
                 model.F_Birth = birth;
+                model.F_EmergencyTypes = EmergencyTypes;
                 #endregion
                 bool n = orderbll.Update(model);
                 if (n)
@@ -515,7 +517,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
         /// <returns></returns>
         public ActionResult GetModelDetail(string WorkOrderCode, int type=0,int orderid=0)
         {
-           
+
             switch (type)
             {
                 case 0:
@@ -530,6 +532,24 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
                         model.F_CarName = new Bll.T_Sys_DictionaryValue().GetModel(model.F_CarType.Value)?.F_Name ?? "";
                         model.StateName = GetDescriptionOriginal(model.F_State.ToString());
                         string urgecount = DbHelperSQL.GetSingle("select F_urgecount from[T_Wo_CommonBase] where F_WoCode ='" + WorkOrderCode + "'").ToString();
+                        if (model.F_EndTime == null || model.F_AcceptTime==null)
+                        {
+                            model.SpendTime = "";
+                        }
+                        else
+                        {
+                            string strspend = "";
+                            TimeSpan ts = model.F_EndTime.Value - model.F_AcceptTime.Value;
+                            if (ts.Days != 0)
+                            {
+                                strspend += ts.Days + "天";
+                            }
+                            strspend += ts.Hours + "时";
+                            strspend += ts.Minutes + "分";
+                            strspend += ts.Seconds + "秒";
+                            model.SpendTime = strspend;
+                        }
+
                         if (!string.IsNullOrEmpty(urgecount))
                         {
                             model.F_UrgeCount = Convert.ToInt32(urgecount);
@@ -782,6 +802,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
                 if (model.F_DriverCode != User.F_UserCode)
                     return Error("无此操作权限！");
                 model.F_State = (int)EnumWorkOrderState.receive;//已接单待完成
+                
                 if (new BLL.T_Car_AssignWorkOrder().Update(model))
                 {
                  
@@ -795,6 +816,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
                         foreach (var it in modellist)
                         {
                             it .F_State = (int)EnumWorkOrderState.receive;//已接单待完成
+                            it.F_AcceptTime = DateTime.Now;//接单时间
                             AddOperation(deptname + User.F_UserName + "(" + User.F_UserCode + ")" + "接单", User.F_UserCode, model.F_State.Value,
                           it.F_WorkOrderCode, model.F_ID );
                             orderbll.Update(it);
@@ -815,7 +837,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
         /// </summary>
         /// <param name="orderid"></param>
         /// <returns></returns>
-        public ActionResult BackWorkOrder(int orderid,string reason)
+        public ActionResult BackWorkOrder(int orderid,string reason,int key,string value)
         {
             if (User != null)
             {
@@ -826,8 +848,11 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
                     return Error("无此操作权限！");
                 model.F_State = (int)EnumWorkOrderState.reback;//已退回
                 string reasonmessage = "";
-                if (!string.IsNullOrEmpty(reason))
-                    reasonmessage = ",原因:" + reason;
+                reasonmessage = ",原因:" + value;
+                if (!string.IsNullOrEmpty(reason)) { 
+
+                    reasonmessage = reasonmessage +","+ reason;
+                }
                 if (new BLL.T_Car_AssignWorkOrder().Update(model))
                 {
                     var carmodel = carbll.GetModel(model.F_CarId.Value);
@@ -851,11 +876,12 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
                             it.F_ControlManCode = "";
                             it.F_ControlManName = "";
                             it.F_State = (int)EnumWorkOrderState.neworder;//退回待分配
-                            AddOperation(deptname + User.F_UserName + "(" + User.F_UserCode + ")" + "退单"+ reasonmessage, User.F_UserCode, model.F_State.Value,
-                        it.F_WorkOrderCode, model.F_ID);
+                            it.F_AcceptTime = null;
+                            AddOperationAboutKey(deptname + User.F_UserName + "(" + User.F_UserCode + ")" + "退单"+ reasonmessage, User.F_UserCode, model.F_State.Value,
+                        it.F_WorkOrderCode, model.F_ID,key,value,reason);
                           if (  orderbll.Update(it))
                             {
-                                msg.AddInternalMessagesInfo("您有工单被退回", "您有工单被退回"+"工单编号:" + it.F_WorkOrderCode, model.F_CreateUser 
+                                msg.AddInternalMessagesInfo("您有工单被退回", "您有工单被退回"+"工单编号:" + it.F_WorkOrderCode+ reasonmessage, model.F_CreateUser 
                                     , User.F_UserCode, EnumSmsType.car
                       , 0, it.F_WorkOrderCode );
                             }
@@ -1142,7 +1168,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
                         if (evabll.Add(evamodel) > 0)
                         {
                             model.F_State =10;
-                            model.F_EndTime = DateTime.Now;
+                            model.F_FinishTime = DateTime.Now;
                             model.MYD = 0;
                             orderbll.Update(model);
                             AddOperation(SX + "小时评价自动评价了工单", "", model.F_State.Value,
@@ -1185,7 +1211,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
                 if (evabll.Add(evamodel) > 0)
                 {
                     model.F_State = 10;
-                    model.F_EndTime = DateTime.Now;
+                    model.F_FinishTime = DateTime.Now;
                     
                     if(orderbll.Update(model))
                     {
@@ -1339,5 +1365,31 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
             return n;
         }
 
+           /// <summary>
+        /// 添加操作记录
+        /// </summary>
+        /// <param name="message"></param>
+        /// <param name="user"></param>
+        /// <param name="state"></param>
+        /// <param name="WorkOrderCode"></param>
+        /// <param name="assignid"></param>
+        /// <returns></returns>
+        public int  AddOperationAboutKey(string message,string user,int state,string WorkOrderCode,int assignid,int key,string value,string reason)
+        {
+            Model.T_Car_Operation oper = new Model.T_Car_Operation();
+            oper.F_Message = message;
+            oper.F_CreateUser = user;
+            oper.F_IsDelete = 0;
+            oper.F_State = state;
+            oper.F_WorkOrderCode = WorkOrderCode;
+            oper.F_AssignID = assignid;
+            oper.F_CreateTime = DateTime.Now;
+            oper.F_AboutKey = key;
+            oper.F_AboutReason = value;
+            oper.F_EnterReason = reason;
+            int n = new BLL.T_Car_Operation().Add(oper);
+            return n;
+        }
+
     }
 }

RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

@@ -19,6 +19,8 @@ namespace RMYY_CallCenter_Api.Controllers
 {
     public class FaultRepairController : BaseController
     {
+        private Bll.T_Sys_GroupClass gcBll = new Bll.T_Sys_GroupClass();
+
         private BLL.T_IntegratedScheduling_Base basescheBll = new BLL.T_IntegratedScheduling_Base();
         private BLL.T_FaultRepair_Base baseBll = new BLL.T_FaultRepair_Base();
         private BLL.T_FaultRepair_Evaluate evaBll = new BLL.T_FaultRepair_Evaluate();
@@ -132,6 +134,7 @@ namespace RMYY_CallCenter_Api.Controllers
             model.F_PlaceOfRepair = input.PlaceOfRepair;
             model.F_File = input.File;
             model.F_WorkOrderCode = DateTime.Now.ToString("yyyyMMddHHmmssfff");//工单编号
+            model.F_EmergencyTypes = input.EmergencyTypes;
             string message = "";
             var dicvalue = new Model.T_Sys_GongDan();
             dicvalue = new Bll.T_Sys_GongDan().GetModel(Convert.ToInt32(model.F_WorkOrderCategory));
@@ -323,6 +326,7 @@ namespace RMYY_CallCenter_Api.Controllers
             model.F_Content = input.Content;
             model.F_PlaceOfRepair = input.PlaceOfRepair;
             model.F_File = input.File;
+            model.F_EmergencyTypes = input.EmergencyTypes;
             //  bool addassignlog = false;
 
             //综合保障中心没有直接结束的按钮
@@ -418,7 +422,7 @@ namespace RMYY_CallCenter_Api.Controllers
                     {
                         model.F_Maintenancer = User.F_UserCode;
                     }
-
+                    model.F_AcceptTime = DateTime.Now;
                     model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.dealing;
                     baseBll.Update(model);
                     AddOperatorLog("查收了工单", (int)EnumOperatorType.check, model.F_WorkOrderCode);
@@ -434,9 +438,15 @@ namespace RMYY_CallCenter_Api.Controllers
         }
 
         //处理人退单  
-        public ActionResult BackWorkOrder(string WorkOrderCode, string BackReason)
+        public ActionResult BackWorkOrder(string WorkOrderCode, string BackReason ,int key, string value)
         {
             Model.T_FaultRepair_Base model = baseBll.GetModel(WorkOrderCode);
+            string s = ",退回原因:" + value  ;
+            if (!string.IsNullOrEmpty(BackReason))
+            {
+                s =s+ "，" + BackReason;
+            }
+
             if (model != null)
             {
                 if (model.F_MaintenanceDept == User.F_DeptId.ToString())
@@ -449,14 +459,12 @@ namespace RMYY_CallCenter_Api.Controllers
                     model.F_AssignUser = "";
                     model.F_UpdateTime = DateTime.Now;
                     model.F_Deadline = null;
-
+                    model.F_AcceptTime = null;
                     baseBll.Update(model);
-                    string s = "";
-                    if (!string.IsNullOrEmpty(BackReason))
-                    {
-                        s += ",退回原因:" + BackReason;
-                    }
-                    AddOperatorLog("退回了工单" + s, (int)EnumOperatorType.back, model.F_WorkOrderCode);
+                    
+
+                    
+                    AddOperatorLogAboutKey("退回了工单" + s, (int)EnumOperatorType.back, model.F_WorkOrderCode,value,key,BackReason);
                     msg.AddInternalMessagesInfo("您有工单被退回", "您有工单被退回" + "工单编号:" + model.F_WorkOrderCode+s, assignuser
                                  , User.F_UserCode, EnumSmsType.repair
                    , 0, model.F_WorkOrderCode);
@@ -476,7 +484,7 @@ namespace RMYY_CallCenter_Api.Controllers
         //维修员能看见当前部门的所有的工单 ，对于所有的工单都能去处理
         //处理完成 、异常完结  Type=0 正常完成  Type=1异常完结  判断是不是返修的工单
         //点击正常完成的时候添加“是否涉及设备，是否涉及设备点击是，出现下拉框可多选设备，选择之后可输入对应的数量和价格
-        public ActionResult DealWorkOrder(string WorkOrderCode, int Type, string Result, string File, List<Model.T_InvolvedEquip_RepairProcess> equipmodellist, int ExceptionType = 0, int IsInvolvedEquip = 0)
+        public ActionResult DealWorkOrder(string WorkOrderCode, int Type, string Result, string File, string finishtype,List<Model.T_InvolvedEquip_RepairProcess> equipmodellist, int ExceptionType = 0, int IsInvolvedEquip = 0)
         {
             Model.T_FaultRepair_Base model = baseBll.GetModel(WorkOrderCode);
 
@@ -499,7 +507,7 @@ namespace RMYY_CallCenter_Api.Controllers
                     if (dt != null && dt.Rows.Count > 0)
                     {
                         int procid = Convert.ToInt32(dt.Rows[0]["F_ProcessId"].ToString());
-                        string updatesql = "UPDATE T_FaultRepair_Process set  F_ProcessingTime=GETDATE() ,F_Result='" + Result + "' ,F_File='" + File + "',F_Maintenancer='" + User.F_UserCode + "',F_MaintenanceDept='" + User.F_DeptId + "',F_DealType='" + (int)EnumFaultRepairDealType.normal + "', F_IsInvolvedEquip='" + IsInvolvedEquip + "'  where F_ProcessId='" + procid + "'";
+                        string updatesql = "UPDATE T_FaultRepair_Process set  F_ProcessingTime=GETDATE() ,  F_FinishType='"+finishtype+"',F_Result='" + Result + "' ,F_File='" + File + "',F_Maintenancer='" + User.F_UserCode + "',F_MaintenanceDept='" + User.F_DeptId + "',F_DealType='" + (int)EnumFaultRepairDealType.normal + "', F_IsInvolvedEquip='" + IsInvolvedEquip + "'  where F_ProcessId='" + procid + "'";
                         int updateid = DbHelperSQL.ExecuteSql(updatesql);
                         if (IsInvolvedEquip == 1)
                         {
@@ -530,6 +538,7 @@ namespace RMYY_CallCenter_Api.Controllers
                         {
                             if (model.F_IsStop != 1)
                             { model.F_Endtime = DateTime.Now; }
+
                             baseBll.Update(model);
                             msg.AddInternalMessagesInfo("您提交的工单已处理完毕，请及时进行评价", "您提交的工单已处理完毕，请及时进行评价" + "工单编号:" + model.F_WorkOrderCode, model.F_Applicant, User.F_UserCode, EnumSmsType.repair
                , 0, model.F_WorkOrderCode);
@@ -551,7 +560,7 @@ namespace RMYY_CallCenter_Api.Controllers
                     promodel.F_File = File;
                     promodel.F_WorkOrderCode = WorkOrderCode;
                     promodel.F_IsInvolvedEquip = IsInvolvedEquip;//0 是否 1 是 是
-
+                    promodel.F_FinishType = finishtype; //报修工单完工时增加处理方式：“远程”、“现场”，默认现场，另外工单详情中需要显示该字段信息
 
                     promodel.F_DealType = (int)EnumFaultRepairDealType.normal;
 
@@ -616,7 +625,7 @@ namespace RMYY_CallCenter_Api.Controllers
 
                         //  promodel.F_ExceptionType = ExceptionType;
                         int procid = Convert.ToInt32(dt.Rows[0]["F_ProcessId"].ToString());
-                        string updatesql = "UPDATE T_FaultRepair_Process set  F_ProcessingTime=GETDATE() ,F_Result='" + Result + "' ,F_File='" + File + "',F_UpdateTime= GETDATE(),dealtype='" + dealtype + "' ,F_ExceptionType='" + ExceptionType + "'  where F_ProcessId='" + procid + "'";
+                        string updatesql = "UPDATE T_FaultRepair_Process set  F_ProcessingTime=GETDATE() , F_FinishType='"+finishtype+"',F_Result='" + Result + "' ,F_File='" + File + "',F_UpdateTime= GETDATE(),dealtype='" + dealtype + "' ,F_ExceptionType='" + ExceptionType + "'  where F_ProcessId='" + procid + "'";
                         if (DbHelperSQL.ExecuteSql(updatesql) > 0)
                         {
                             if (model.F_IsStop != 1)
@@ -639,6 +648,7 @@ namespace RMYY_CallCenter_Api.Controllers
                     promodel.F_WorkOrderCode = WorkOrderCode;
                     promodel.F_ExceptionType = ExceptionType;
                     promodel.F_DealType = dealtype;
+                    promodel.F_FinishType = finishtype;
                     if (dealBll.Add(promodel) > 0)
                     {
                         if (model.F_IsStop != 1)
@@ -1118,7 +1128,7 @@ namespace RMYY_CallCenter_Api.Controllers
                     case 0:
                         //基本信息
                         #region
-                        string sql = "select *,[dbo].[GetUserName](F_Applicant) applicantname , (select F_urgecount from [T_Wo_CommonBase] where F_WoCode='"+ strworkorderid + "') F_UrgeCount from T_FaultRepair_Base where F_WorkOrderCode='" + strworkorderid + "'";
+                        string sql = "select *,[dbo].[GetUserName](F_Applicant) applicantname ,(case when F_Endtime= null then '' else dbo.GetConvertSecond(DATEDIFF(s,F_accepttime,F_endtime)) end) SpendTime,(select F_urgecount from [T_Wo_CommonBase] where F_WoCode='" + strworkorderid + "') F_UrgeCount from T_FaultRepair_Base where F_WorkOrderCode='" + strworkorderid + "'";
                         DataTable dtbase = DbHelperSQL.Query(sql).Tables[0];
                         dtbase.Columns.Add("FileUrl", typeof(object));
                         dtbase.Columns.Add("StateName");
@@ -1804,9 +1814,15 @@ namespace RMYY_CallCenter_Api.Controllers
 
         // 返修 是申请人提交的返修
         //退回至维修部门班组长（角色），如果没有该角色退回到原来的处理人
-        public ActionResult ReturnWorkOrder(string WorkOrderCode, string ReturnReason)
+        public ActionResult ReturnWorkOrder(string WorkOrderCode, string ReturnReason,int key,string value)
         {
             Model.T_FaultRepair_Base model = baseBll.GetModel(WorkOrderCode);
+
+            string str = "";
+            if (!string.IsNullOrEmpty(ReturnReason))
+            {
+                str = "," + ReturnReason;
+            }
             if (model != null && model.F_ApplicationDept.Trim() == User.F_DeptId.ToString())
             {
                 //判断返工是不是规定的时间内，工单状态是已完结的工单
@@ -1819,11 +1835,12 @@ namespace RMYY_CallCenter_Api.Controllers
                     promodel.F_Isdelete = 0;
                     promodel.F_MaintenanceDept = User.F_DeptId.ToString();// model.F_MaintenanceDept;
                     promodel.F_Maintenancer = User.F_UserCode;// model.F_Maintenancer;
-                    promodel.F_ReturnReason = ReturnReason;
+                    promodel.F_ReturnReason =value+ ReturnReason;
                     promodel.F_WorkOrderCode = WorkOrderCode;
                     if (dealBll.Add(promodel) > 0)
                     {
-                        AddOperatorLog("提交了返工", (int)EnumOperatorType.submitreturn, WorkOrderCode);
+                       
+                        AddOperatorLogAboutKey("提交了返工,原因："+value+ str, (int)EnumOperatorType.submitreturn, WorkOrderCode,value,key,ReturnReason);
 
                         string sql = " select top 1 F_UserCode from T_Sys_UserAccount where F_RoleId in (select F_RoleId from T_Sys_Role where F_RoleCode = 'WXBZZ')";
 
@@ -1833,11 +1850,8 @@ namespace RMYY_CallCenter_Api.Controllers
                             model.F_Maintenancer = usercode;
                         }
 
-                        string s = "";
-                        if (!string.IsNullOrEmpty(ReturnReason))
-                        {
-                            s = "，返修原因：" + ReturnReason;
-                        }
+                        string s  = "，返修原因：" +value+ str;
+                         
 
                         model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.dealing;
                         model.F_ReturnNum += model.F_ReturnNum + 1;
@@ -2023,6 +2037,23 @@ namespace RMYY_CallCenter_Api.Controllers
             return true;
         }
 
+
+        public bool AddOperatorLogAboutKey(string content, int type, string workordercode,string value,int key,string enterreason)
+        {
+            Model.T_FaultRepair_OperationLog model = new Model.T_FaultRepair_OperationLog();
+            model.F_LogContent = content;
+            model.F_OperationTime = DateTime.Now;
+            model.F_OperationType = type;
+            model.F_Operator = User.F_UserCode;
+            model.F_WorkOrderCode = workordercode;
+            model.F_AboutKey = key;
+            model.F_AboutReason = value;
+            model.F_EnterReason = enterreason;
+            logBll.Add(model);
+            return true;
+        }
+
+
         public void AddAddlog(string workordercode)
         {
             AddOperatorLog("创建报修工单", (int)EnumOperatorType.add, workordercode);
@@ -2044,8 +2075,20 @@ namespace RMYY_CallCenter_Api.Controllers
 
         }
 
+        [AllowAnonymous]
+        public bool AddAutoAssignlog(string workordercode, string dept, string maintenancer)
+        {
+            Model.T_FaultRepair_OperationLog model = new Model.T_FaultRepair_OperationLog();
+            model.F_LogContent = "超过十分钟未接单，自动指派工单给" + GetDeptModel(dept) + "部门" + GetUserModel(maintenancer);
+            model.F_OperationTime = DateTime.Now;
+            model.F_OperationType = (int)EnumOperatorType.assign;
+            model.F_Operator = "";
+            model.F_WorkOrderCode = workordercode;
+            logBll.Add(model);
+            return true;
+        }
 
-
+   
         #endregion
 
 
@@ -2269,7 +2312,7 @@ namespace RMYY_CallCenter_Api.Controllers
 
 
         //挂起
-        public ActionResult HangUp(string workordercode)
+        public ActionResult HangUp(string workordercode, int key, string value,  string reason)
         {
 
             Model.T_FaultRepair_Base model = baseBll.GetModel(workordercode);
@@ -2281,7 +2324,12 @@ namespace RMYY_CallCenter_Api.Controllers
             model.F_StopTime = DateTime.Now;
             model.F_Endtime = DateTime.Now;
             baseBll.Update(model);
-            AddOperatorLog(User.F_UserCode + "挂起了工单", (int)EnumOperatorType.hangup, model.F_WorkOrderCode);
+            string str = "";
+            if (!string.IsNullOrEmpty(reason))
+            {
+                str = "," + reason;
+            }
+            AddOperatorLogAboutKey(User.F_UserCode + "挂起了工单,原因:"+value+ str, (int)EnumOperatorType.hangup, model.F_WorkOrderCode,value,key, reason);
             return Success("挂起成功");
         }
 
@@ -2470,15 +2518,17 @@ namespace RMYY_CallCenter_Api.Controllers
         //延期
         //接单人在接单之后，如果该工单类型上设置的“可延期次数”大于0显示“延期”按钮；点击延期按钮进行验证是否超过设定的延期次数，超过提醒“已超过规定延迟次数”
         //操作流程记录延期
-        public ActionResult frReplay(string workordercode, string days, string type, string workordercategory,string reason)
+        public ActionResult frReplay(string workordercode, string days, string type, string workordercategory,string reason,int key, string value)
         {
             Model.T_Sys_GongDan gdmodel = gdbll.GetModel(Convert.ToInt32(workordercategory));
             Model.T_Wo_CommonBase model = cbbll.GetModel(workordercode);
-            string strreason = "";
+
             if (!string.IsNullOrEmpty(reason))
             {
-                strreason = ",原因：" + reason;
+                reason = "," + reason;
             }
+            string strreason  = ",原因："+value+  reason;
+            
 
             if (gdmodel.F_CanReplayCount > 0)
             {
@@ -2495,7 +2545,7 @@ namespace RMYY_CallCenter_Api.Controllers
                         cwbll.Update(cwmodel);
                        
 
-                        var itemid = Addlogbll.AddLog(cwmodel.F_ID, 0, 0, User.F_UserName + "(" + User.F_UserCode + ")" + "给工单延期" + days + "h"+ strreason, (int)EnumItemType.Delay, 14, "", 0, User.F_UserCode);
+                        var itemid = Addlogbll.AddLogAboutKey(cwmodel.F_ID, 0, 0, User.F_UserName + "(" + User.F_UserCode + ")" + "给工单延期" + days + "h"+ strreason, (int)EnumItemType.Delay, 14, "", 0, User.F_UserCode,key,value, reason);
                     }
                     //故障报工单延期修
                     if (type == "3000")
@@ -2616,6 +2666,60 @@ namespace RMYY_CallCenter_Api.Controllers
             return returnname.ToString();
         }
 
-      
+
+        /// <summary>
+        /// 基建后勤类型,10分钟内未接单转派给基建和后勤保障部的值班人员（根据排班表）
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult AutoChangeDealMan()
+        {
+            string sql = " select F_GDId from T_Sys_GongDan where F_Name='基建后勤类'";
+            int gdid =Convert.ToInt32( DbHelperSQL.GetSingle(sql));
+
+
+         
+            if (gdid > 0)
+            {
+                string allgd = "  select * from T_FaultRepair_Base where F_accepttime is null and   DATEDIFF(MINUTE, F_AssignTime, GETDATE()) > 10 and        F_WorkOrderCategory in (select * from dbo.getvalueid('" + gdid + "'))";
+
+                DataTable dt = DbHelperSQL.Query(allgd).Tables[0];
+                if (dt != null && dt.Rows.Count > 0)
+                {
+                    string sqldept = " select F_DeptId from T_Sys_Department where F_DeptCode='HQBZ'";
+
+                    int deptid = Convert.ToInt32(DbHelperSQL.GetSingle(sqldept));
+                    List<Model.T_Sys_GroupClass> modellist = new List<Model.T_Sys_GroupClass>();
+                    if (deptid > 0)
+                    {
+                          modellist = gcBll.GetModelList("F_IsDelete = 0   and F_Date = CONVERT(varchar, GETDATE(), 120)  and F_ClassCode in (select F_Id from t_sys_class where F_IsDelete = 0 and CONVERT(varchar, GETDATE(), 108) between F_InTime and F_OutTime and F_DeptId = '" + deptid + "')");                 
+                    }
+
+                    foreach (DataRow item in dt.Rows)
+                    {
+                     Model.T_FaultRepair_Base frmodel=    baseBll.GetModel(item["F_WorkOrderCode"].ToString());
+                        if (modellist.Count > 0)
+                        {
+                           var  shaixuanlist = modellist.Where(x => x.F_UserCode != frmodel.F_Maintenancer).ToList();
+                            if (shaixuanlist.Count > 0)
+                            {
+                                frmodel.F_AssignTime = DateTime.Now;
+                                frmodel.F_Maintenancer = shaixuanlist.First().F_UserCode;
+                                frmodel.F_MaintenanceDept = deptid.ToString();
+                                baseBll.Update(frmodel);
+
+                                AddAutoAssignlog(item["F_WorkOrderCode"].ToString(), deptid.ToString(), frmodel.F_Maintenancer);
+
+                            }
+
+                        }
+
+                    }
+                }
+                return Success("执行成功");
+
+            }
+            return Error("基建后勤类型不存在");
+        }
+
     }
 }

RMYY_CallCenter_Api/Controllers/GroupClassController.cs

@@ -408,7 +408,7 @@ namespace RMYY_CallCenter_Api.Controllers
             {
                 string sql = "    select F_UserCode,dbo.GetUserName(F_UserCode) username,F_Date from  T_Sys_GroupClass where F_IsDelete=0   and F_Date = CONVERT(varchar, GETDATE(), 120)  and F_ClassCode in ( select F_Id from t_sys_class where F_IsDelete = 0 and CONVERT(varchar, GETDATE(),108) between F_InTime and F_OutTime and F_DeptId ='"+deptid+"' )  ";
 
-                 var dt=   DbHelperSQL.Query("sql").Tables[0];
+                 var dt=   DbHelperSQL.Query(sql).Tables[0];
                 return Success("根据部门获取值班人员数据成功", dt);
             }
 

RMYY_CallCenter_Api/Controllers/IndexController.cs

@@ -19,6 +19,7 @@ namespace RMYY_CallCenter_Api.Controllers
         private Bll.T_Msg_Chat bllchat = new Bll.T_Msg_Chat();
         private Bll.T_Msg_Chat_Map bllmap = new Bll.T_Msg_Chat_Map();
         private readonly Bll.T_Sys_UserAccount userAccount = new Bll.T_Sys_UserAccount();
+       private Bll.T_Sys_SystemConfig configBll = new Bll.T_Sys_SystemConfig();
         // GET: Index
         /// <summary>
         /// 获取当前用户
@@ -411,6 +412,18 @@ namespace RMYY_CallCenter_Api.Controllers
             return Success("获取成功", dt);
         }
 
+        public DataTable GetFileData(string ids, string prefix)
+        {
+            DataTable dt = DbHelperSQL.Query("select * from T_Sys_Accessories WITH(NOLOCK) where F_FileId in (" + ids + ")").Tables[0];
+
+            foreach (DataRow dr in dt.Rows)
+            {
+                dr["F_FileUrl"] = prefix + dr["F_FileUrl"].ToString();
+            }
+
+            return dt;
+        }
+
         /// <summary>
         /// 即时聊天 - 获取最新通讯(获取双方记录【聊天】)
         /// </summary>
@@ -440,12 +453,30 @@ namespace RMYY_CallCenter_Api.Controllers
                     sql += " and b.CreateDate > '" + start + "' ";
                 }
                 //查询（聊天记录）
-                string sql1 = "SELECT a.Id,a.FromUserId,a.Content,a.IsToAll,a.CreateDate,c.F_UserName FROM dbo.T_Msg_Chat a RIGHT JOIN dbo.T_Msg_Chat_Map b ON b.ChatId = a.Id LEFT JOIN dbo.T_Sys_UserAccount c ON c.F_UserId = a.FromUserId WHERE " + sql + " ORDER BY a.CreateDate ASC";
+                string sql1 = "SELECT a.Id,a.FromUserId,a.Content,a.Files,a.IsToAll,a.CreateDate,c.F_UserName FROM dbo.T_Msg_Chat a RIGHT JOIN dbo.T_Msg_Chat_Map b ON b.ChatId = a.Id LEFT JOIN dbo.T_Sys_UserAccount c ON c.F_UserId = a.FromUserId WHERE " + sql + " ORDER BY a.CreateDate ASC";
                 dt = DbHelperSQL.Query(sql1).Tables[0];
                 recordCount = dt.Rows.Count;
 
-                //修改（设置已读）
-                string sqlwhere = " ISNULL(IsRead,0) = 0 ";
+
+                dt.Columns.Add("FileUrl", typeof(object));
+            
+               var configfj = configBll.GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
+
+                foreach (DataRow dr in dt.Rows)
+                {
+                  
+                    if (configfj != null && !string.IsNullOrEmpty(dr["Files"].ToString()))
+                    {
+                        dr["FileUrl"] = GetFileData(dr["Files"].ToString(), configfj.F_ParamValue);
+                    }
+                }
+
+
+
+
+
+                    //修改（设置已读）
+               string sqlwhere = " ISNULL(IsRead,0) = 0 ";
                 if (fromuserId > 0)
                 {
                     sqlwhere += " and FromUserId = " + fromuserId + " ";
@@ -564,6 +595,7 @@ namespace RMYY_CallCenter_Api.Controllers
             model.ToUserId = input.ToUserId;
             model.ToRoleId = input.ToRoleId;
             model.CreateDate = DateTime.Now;
+            model.Files = input.Files;
             //如果用户和角色都为0，则发送所有人
             if (input.ToUserId == 0 && input.ToRoleId == 0)
             {
@@ -640,9 +672,21 @@ namespace RMYY_CallCenter_Api.Controllers
                 sql += " and ISNULL(b.IsRead,0) = " + isread + " ";
             }
             //查询（聊天记录）
-            string sql1 = "SELECT TOP " + top + " a.Id,b.FromUserId,b.ToUserId,a.Content,a.IsToAll,a.CreateDate,b.IsRead,c.F_UserName,c.F_RoleId,c.F_Sex,c.F_See FROM dbo.T_Msg_Chat a RIGHT JOIN dbo.T_Msg_Chat_Map b ON b.ChatId = a.Id LEFT JOIN dbo.T_Sys_UserAccount c ON c.F_UserId = a.FromUserId WHERE " + sql + " ORDER BY a.CreateDate ASC";
+            string sql1 = "SELECT TOP " + top + " a.Id,b.FromUserId,b.ToUserId,a.Content,a.Files,a.IsToAll,a.CreateDate,b.IsRead,c.F_UserName,c.F_RoleId,c.F_Sex,c.F_See FROM dbo.T_Msg_Chat a RIGHT JOIN dbo.T_Msg_Chat_Map b ON b.ChatId = a.Id LEFT JOIN dbo.T_Sys_UserAccount c ON c.F_UserId = a.FromUserId WHERE " + sql + " ORDER BY a.CreateDate ASC";
             dt = DbHelperSQL.Query(sql1).Tables[0];
             recordCount = dt.Rows.Count;
+            dt.Columns.Add("FileUrl", typeof(object));
+
+            var configfj = configBll.GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
+
+            foreach (DataRow dr in dt.Rows)
+            {
+
+                if (configfj != null && !string.IsNullOrEmpty(dr["Files"].ToString()))
+                {
+                    dr["FileUrl"] = GetFileData(dr["Files"].ToString(), configfj.F_ParamValue);
+                }
+            }
 
             var obj = new
             {

RMYY_CallCenter_Api/Controllers/InfoController.cs

@@ -183,7 +183,7 @@ namespace RMYY_CallCenter_Api.Controllers
             var date = DateTime.Now;
 
 
-            string sqlhw = "       select a. F_GDID F_Type , a.F_Name,(SELECT COUNT(1) FROM T_Car_WorkOrder WHERE   F_IsDel=0 AND F_Typ in( select F_GDId  from [dbo].[GetValueId](a.F_GDID))  " +
+            string sqlhw = "       select a. F_GDID F_Type , a.F_Name,(SELECT COUNT(1) FROM T_Car_WorkOrder WHERE   F_IsDel=0 AND F_Type in( select F_GDId  from [dbo].[GetValueId](a.F_GDID))  " +
                 "    AND datediff(day , F_CreateTime  , getdate())= 0) COUNT    from T_Sys_Gongdan a" +
                 "     where F_ParentID = 4000 AND F_IsDelete = 0   ";
             DataTable dthw = DbHelperSQL.Query(sqlhw).Tables[0];

RMYY_CallCenter_Api/Controllers/WorkOrder/Con_WorkOrderController.cs

@@ -411,6 +411,27 @@ namespace RMYY_CallCenter_Api.Controllers
                 model.typename1 = tybll.GetModel(Convert.ToInt32(model.F_type1))?.F_Name ?? "";
                 model.typename2 = tybll.GetModel(Convert.ToInt32(model.F_type2))?.F_Name ?? "";
                 model.typename3 = tybll.GetModel(Convert.ToInt32(model.F_type3))?.F_Name ?? "";
+
+                //花费时长
+                if (model.F_HandleTime == null || model.F_AcceptTime == null)
+                {
+                    model.SpendTime = "";
+                }
+                else
+                {
+                    string strspend = "";
+                    TimeSpan ts = model.F_HandleTime.Value - model.F_AcceptTime.Value;
+                    if (ts.Days != 0)
+                    {
+                        strspend += ts.Days + "天";
+                    }
+                    strspend += ts.Hours + "时";
+                    strspend += ts.Minutes + "分";
+                    strspend += ts.Seconds + "秒";
+                    model.SpendTime = strspend;
+                }
+
+
                 model.ComplaintSourceName = dvBll.GetModel(Convert.ToInt32(model.F_ComplaintSource))?.F_Name ??"";
                     if (model != null)
                     {
@@ -531,7 +552,18 @@ namespace RMYY_CallCenter_Api.Controllers
                         Bll.T_Call_CallRecords callbll = new Bll.T_Call_CallRecords();
                         Model.T_Call_CallRecords  callmodel=callbll.GetModelByCallId(model.F_CallID);
                         model.F_Satisfaction = callmodel.MYD;
-                    }                 
+                    }
+                    //业务咨询工单添加用户信息
+                    Model.T_Cus_Customer cusmodel = new Model.T_Cus_Customer();
+                    Bll.T_Cus_Customer cusbll = new Bll.T_Cus_Customer();
+                    cusmodel.F_Address = input.F_Address;
+                    cusmodel.F_Telephone = input.F_Phon;
+                    cusmodel.F_Sex = input.F_Sex==0?"男":"女";
+                    cusmodel.F_CustomerName = input.F_Customer;
+                    cusmodel.F_AboutLinkMan = input.F_FullName;//患者姓名
+                    cusmodel.F_IdCard = input.F_IdCard;
+                    cusmodel.F_RelationShip = input.F_Relationship;//与患者关系
+                    cusbll.Add(cusmodel);
 
                     int n = orderbll.Add(model);
                     if (n > 0)
@@ -813,7 +845,7 @@ namespace RMYY_CallCenter_Api.Controllers
             model.F_ComplaintSource = input.F_ComplaintSource;
 
             model.F_ServiceItems = input.F_ServiceItems;//服务项目
-            
+            model.F_EmergencyTypes = input.EmergencyTypes;
         
                 model.F_Address = input.F_Address;//地区
                 model.F_FirstCheckHospital = input.F_FirstCheckHospital;//首次检查医院
@@ -1501,6 +1533,7 @@ namespace RMYY_CallCenter_Api.Controllers
             {
                 #region 处理工单
                 model.F_State = wostate;//已接单待处理
+                model.F_AcceptTime = DateTime.Now;
                 model.F_HandleBy = nowUser.F_UserCode;//已接单待处理
                 orderbll.Update(model);
                 #endregion
@@ -1686,7 +1719,7 @@ namespace RMYY_CallCenter_Api.Controllers
         /// </summary>
         /// <param name="WorkOrderCode"></param>
         /// <returns></returns>
-        public ActionResult BackWorkOrder(string WorkOrderCode,string reason)
+        public ActionResult BackWorkOrder(string WorkOrderCode,string reason,int key,string value)
         {
             if (User != null)
             {
@@ -1715,7 +1748,7 @@ namespace RMYY_CallCenter_Api.Controllers
 
                     }
 
-                    var res = BackWO(User, wmodel, reason);
+                    var res = BackWO(User, wmodel, reason,key,value);
                     if (res)
                         return Success("退单成功");
                     else
@@ -1731,7 +1764,7 @@ namespace RMYY_CallCenter_Api.Controllers
         /// <summary>
         /// 退回工单
         /// </summary>
-        public bool BackWO(Model.T_Sys_UserAccount nowUser, Model.T_Con_WorkOrder model,string reason)
+        public bool BackWO(Model.T_Sys_UserAccount nowUser, Model.T_Con_WorkOrder model,string reason,int key, string value)
         {
             #region 工单处理
             var opt = "退单";
@@ -1752,7 +1785,7 @@ namespace RMYY_CallCenter_Api.Controllers
                 reasonmessage = ",原因:" + reason;
             }
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt+ reasonmessage;
-            var itemid = logbll.AddLog((int)model.F_ID, (int)model.F_type1, wostate, content, (int)EnumItemType.deal, optbut, "", 0, nowUser.F_UserCode);
+            var itemid = logbll.AddLogAboutKey((int)model.F_ID, (int)model.F_type1, wostate, content, (int)EnumItemType.deal, optbut, "", 0, nowUser.F_UserCode,key,value,reason);
             if (itemid > 0)
             {
                 #region 处理工单

RMYY_CallCenter_Api/Controllers/WorkOrderBaseController.cs

@@ -9,6 +9,8 @@ using System.Web;
 using System.Web.Mvc;
 using System.Reflection;
 using RMYY_CallCenter_Api.Models.Dto;
+using RMYY_CallCenter_Api.DB;
+
 namespace RMYY_CallCenter_Api.Controllers
 {
     public class WorkOrderBaseController : BaseController
@@ -100,11 +102,7 @@ namespace RMYY_CallCenter_Api.Controllers
             //return
             //    Error("无操作权限！");
         }
-        /// <summary>
-        /// 获取科室人员信息
-        /// </summary>
-        /// <param name="deptid"></param>
-        /// <returns></returns>
+
         public ActionResult GetPerson(int deptid = 0)
         {
             string sql = "";
@@ -124,17 +122,107 @@ namespace RMYY_CallCenter_Api.Controllers
                 message = "成功",
                 rows = ua.Select(p => new
                 {
-                   
+
                     usercode = p.F_UserCode,
                     username = p.F_UserName,
-                    usertelphone=p.F_Telephone,
-                    userworkphone=p.F_WorkPhone
-                    
+                    usertelphone = p.F_Telephone,
+                    userworkphone = p.F_WorkPhone
+
                 })
             };
             return Content(obj.ToJson());
         }
 
+
+      
+        /// <summary>
+        /// 获取科室人员信息
+        /// </summary>
+        /// <param name="deptid"></param>
+        /// <returns></returns>
+        public ActionResult GetPersonByDeptId(int deptid = 0)
+        {
+            string sql = "";
+            if (deptid != 0)
+            {
+                var dmodel = deptbll.GetModel(deptid);
+                if (dmodel != null)
+                {
+                    sql = "F_DeptId=" + deptid;
+                    sql += "and F_EnableFlag=1";
+                }
+            }
+
+            if (deptid > 0)
+            {
+                Bll.T_Sys_GroupClass gcbll = new Bll.T_Sys_GroupClass();
+                List<Model.T_Sys_GroupClass> grouplist = gcbll.GetModelList(" F_IsDelete=0   and F_Date = CONVERT(varchar, GETDATE(), 120)  and F_ClassCode in ( select F_Id from t_sys_class where F_IsDelete = 0 and CONVERT(varchar, GETDATE(),108) between F_InTime and F_OutTime and F_DeptId ='" + deptid + "' )");
+
+                if (grouplist.Count > 0)
+                {
+                    var obj = new
+                    {
+                        state = "success",
+                        message = "成功",
+                        rows = grouplist.Select(p => new
+                        {
+
+                            usercode = p.F_UserCode,
+                            username = GetUserModel( p.F_UserCode)
+
+                        })
+                    };
+                    return Content(obj.ToJson());
+                }
+                else
+                {
+                    var ua = userbll.GetModelList(sql);
+                    var obj = new
+                    {
+                        state = "success",
+                        message = "成功",
+                        rows = ua.Select(p => new
+                        {
+
+                            usercode = p.F_UserCode,
+                            username = p.F_UserName 
+                        })
+                    };
+                    return Content(obj.ToJson());
+                }
+
+
+              
+            }
+
+            return Error("deptid要大于0");
+
+          
+    
+        }
+
+        public string GetUserModel(string usercode = "")
+        {
+            string sql = " 1=1 ";
+
+            if (!string.IsNullOrWhiteSpace(usercode))
+            {
+                sql += " and F_UserCode='" + usercode + "'";
+            }
+            if (string.IsNullOrEmpty(usercode))
+                return "";
+
+            Model.T_Sys_UserAccount ua = new Bll.T_Sys_UserAccount().GetModelList(sql).FirstOrDefault();
+            if (ua != null)
+            {
+                return ua.F_UserName;
+
+            }
+
+            return "";
+
+        }
+
         /// <summary>
         /// 获取转运人
         /// </summary>

RMYY_CallCenter_Api/Models/Enum/EnumOperatorType.cs

@@ -32,7 +32,7 @@ namespace RMYY_CallCenter_Api.Models.Enum
         [Description("异常完结")]
         exceptionended,
 
-        [Description("异常完结")]
+        [Description("返修")]
         submitreturn,
             [Description("转派")]
          transfer ,

RMYY_CallCenter_Api/Models/Input/ChatInput.cs

@@ -7,6 +7,11 @@ namespace RMYY_CallCenter_Api.Models.Input
 {
     public class ChatInput
     {
+
+        /// <summary>
+        /// 附件内容
+        /// </summary>
+               public string Files { get; set; }
         /// <summary>
         /// Id
         /// </summary>

RMYY_CallCenter_Api/Models/Input/Con_WorkOrderInput.cs

@@ -11,6 +11,12 @@ namespace RMYY_CallCenter_Api.Models.Input
         /// <summary>
         /// 工单ID
         /// </summary>
+
+        public string EmergencyTypes
+
+        {
+            get; set;
+        }
         public int F_ID
         {
             get; set;

RMYY_CallCenter_Api/Models/Input/T_FaultRepairBaseinput.cs

@@ -13,6 +13,8 @@ namespace RMYY_CallCenter_Api.Models.Input
 
         public string  CallId { get; set; }
 
+        public string  EmergencyTypes { get; set; }
+
         public string WorkOrderCode { get; set; }
         /// <summary>
         /// 申请人

RMYY_CallCenter_Api/Models/Input/T_SchedulingBaseInput.cs

@@ -13,6 +13,9 @@ namespace RMYY_CallCenter_Api.Models.Input
 
         public string  CallId { get; set; }
 
+        public string EmergencyTypes { get; set; }
+
+
         public string WorkOrderCode { get; set; }
         /// <summary>
         /// 申请人