加了一个转派人等

RMYY_CallCenter_Api.Dal/T_FaultRepair_Base.cs

@@ -64,9 +64,9 @@ namespace RMYY_CallCenter_Api.DAL
 		{
 			StringBuilder strSql=new StringBuilder();
 			strSql.Append("insert into T_FaultRepair_Base(");
-			strSql.Append("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_LeaveRecordId,F_CallRecordId,F_CallId,F_IsStop)");
+			strSql.Append("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_LeaveRecordId,F_CallRecordId,F_CallId,F_IsStop,F_AssignUser)");
 			strSql.Append(" values (");
-			strSql.Append("@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_LeaveRecordId,@F_CallRecordId,@F_CallId,@F_IsStop)");
+			strSql.Append("@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_LeaveRecordId,@F_CallRecordId,@F_CallId,@F_IsStop,@F_AssignUser)");
 			strSql.Append(";select @@IDENTITY");
 			SqlParameter[] parameters = {
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,50),
@@ -95,8 +95,9 @@ namespace RMYY_CallCenter_Api.DAL
                     new SqlParameter("@F_LeaveRecordId", SqlDbType.Int,4),
                          new SqlParameter("@F_CallRecordId", SqlDbType.Int,4),
                          new SqlParameter("@F_CallId", SqlDbType.NVarChar,50),
-                            new SqlParameter("@F_IsStop", SqlDbType.Int,4)
-                         
+                            new SqlParameter("@F_IsStop", SqlDbType.Int,4),
+                            new SqlParameter("@F_AssignUser", SqlDbType.NVarChar,100)    
+
 
 
             };
@@ -129,6 +130,8 @@ namespace RMYY_CallCenter_Api.DAL
             parameters[25].Value = model.F_CallId;
             
                  parameters[26].Value = model.F_IsStop;
+            parameters[27].Value = model.F_AssignUser;
+            
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
 			if (obj == null)
@@ -178,8 +181,11 @@ namespace RMYY_CallCenter_Api.DAL
             strSql.Append("F_Score=@F_Score,");
             strSql.Append("F_IsStop=@F_IsStop,");
             strSql.Append("F_StopTime=@F_StopTime,");
-            strSql.Append("F_ArriveTime=@F_ArriveTime");
+            strSql.Append("F_ArriveTime=@F_ArriveTime,");
+            strSql.Append("F_AssignUser=@F_AssignUser");
             
+
+
             strSql.Append(" where F_WorkOrderId=@F_WorkOrderId");
 			SqlParameter[] parameters = {
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,50),
@@ -213,7 +219,8 @@ namespace RMYY_CallCenter_Api.DAL
                       new SqlParameter("@F_Score", SqlDbType.Int,4),
                     new SqlParameter("@F_IsStop", SqlDbType.Int,4),
                   new SqlParameter("@F_StopTime", SqlDbType.DateTime),
-                 new SqlParameter("@F_ArriveTime", SqlDbType.DateTime)
+                 new SqlParameter("@F_ArriveTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_AssignUser", SqlDbType.NVarChar,100) 
 
 
 
@@ -253,6 +260,8 @@ namespace RMYY_CallCenter_Api.DAL
 
             parameters[30].Value = model.F_ArriveTime;
 
+            parameters[31].Value = model.F_AssignUser;
+
             int rows=DbHelperSQL.ExecuteSql(strSql.ToString(),parameters);
 			if (rows > 0)
 			{

RMYY_CallCenter_Api.Model/T_FaultRepair_Base.cs

@@ -58,6 +58,15 @@ namespace RMYY_CallCenter_Api.Model
         private DateTime? _f_stoptime;
         private DateTime? _f_arrivetime;
 
+        private string _f_assignuser;
+         
+        public string F_AssignUser
+        {
+            set { _f_assignuser = value; }
+            get { return _f_assignuser; }
+        }
+
+
         //到达时间
         public DateTime? F_ArriveTime
         {

RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

@@ -125,6 +125,7 @@ namespace RMYY_CallCenter_Api.Controllers
                 {
                     model.F_Maintenancer = input.Maintenancer;
                     model.F_AssignTime = DateTime.Now;
+                    model.F_AssignUser = User.F_UserCode;
                     List<Model.T_Sys_GongDan> listgd = gdbll.GetModelList(" F_GDId='"+model.F_WorkOrderCategory+"'");
                     int timeout = listgd.First().F_TimeOut;
                     model.F_Deadline = DateTime.Now.AddHours(timeout);
@@ -137,6 +138,7 @@ namespace RMYY_CallCenter_Api.Controllers
                         model.F_Maintenancer = user[0];
                         input.Maintenancer = user[0];
                         model.F_AssignTime = DateTime.Now;
+                        model.F_AssignUser = User.F_UserCode;
                         List<Model.T_Sys_GongDan> listgd = gdbll.GetModelList(" F_GDId='" + model.F_WorkOrderCategory + "'");
                         int timeout = listgd.First().F_TimeOut;
                         model.F_Deadline = DateTime.Now.AddHours(timeout);
@@ -263,7 +265,7 @@ namespace RMYY_CallCenter_Api.Controllers
                 if (!string.IsNullOrEmpty(input.MaintenanceDept))
                 {
                     model.F_AssignTime = DateTime.Now;
-
+                    model.F_AssignUser = User.F_UserCode;
                     List<Model.T_Sys_GongDan> listgd = gdbll.GetModelList(" F_GDId='" + model.F_WorkOrderCategory + "'");
                     int timeout = listgd.First().F_TimeOut;
                     model.F_Deadline = DateTime.Now.AddHours(timeout);
@@ -354,6 +356,7 @@ namespace RMYY_CallCenter_Api.Controllers
                     model.F_Maintenancer = "";
                     model.F_MaintenanceDept = "";
                     model.F_AssignTime = null;
+                    model.F_AssignUser = "";
                     model.F_UpdateTime = DateTime.Now;
                     model.F_Deadline = null;
 
@@ -378,7 +381,7 @@ namespace RMYY_CallCenter_Api.Controllers
         }
 
 
-
+        //维修员能看见当前部门的所有的工单 ，对于所有的工单都能去处理
         //处理完成 、异常完结  Type=0 正常完成  Type=1异常完结  判断是不是返修的工单
         //点击正常完成的时候添加“是否涉及设备，是否涉及设备点击是，出现下拉框可多选设备，选择之后可输入对应的数量和价格
         public ActionResult DealWorkOrder(string WorkOrderCode, int Type, string Result,string File, int IsInvolvedEquip,List<Model.T_InvolvedEquip_RepairProcess> equipmodellist, int ExceptionType = 0)
@@ -574,6 +577,7 @@ namespace RMYY_CallCenter_Api.Controllers
                 newmodel.F_Maintenancer = Maintenancer;
                 newmodel.F_MaintenanceDept = model.F_MaintenanceDept;
                 newmodel.F_AssignTime = DateTime.Now;
+                newmodel.F_AssignUser = User.F_UserCode;
                 newmodel.F_File = model.F_File;
 
                 List<Model.T_Sys_GongDan> listgd = gdbll.GetModelList(" F_GDId='" + model.F_WorkOrderCategory + "'");
@@ -1274,8 +1278,8 @@ namespace RMYY_CallCenter_Api.Controllers
             Model.T_FaultRepair_Base model = baseBll.GetModel(WorkOrderCode);
             if (model != null  && !string.IsNullOrEmpty(ToUserCode) && !string.IsNullOrEmpty(ToDept))
             {
-               
 
+                model.F_AssignUser = User.F_UserCode;
                 model.F_AssignTime = DateTime.Now;
 
                 List<Model.T_Sys_GongDan> listgd = gdbll.GetModelList(" F_GDId='" + model.F_WorkOrderCategory + "'");
@@ -1438,6 +1442,7 @@ namespace RMYY_CallCenter_Api.Controllers
                 foreach (var model in FaultRepair_Base)
                 {
                     model.F_AssignTime = DateTime.Now;
+                    model.F_AssignUser = User.F_UserCode;
                     List<Model.T_Sys_GongDan> listgd = gdbll.GetModelList(" F_GDId='" + model.F_WorkOrderCategory + "'");
                     int timeout = listgd.First().F_TimeOut;
                     model.F_Deadline = DateTime.Now.AddHours(timeout);
@@ -2049,7 +2054,7 @@ namespace RMYY_CallCenter_Api.Controllers
             if (!string.IsNullOrEmpty(maintenanceDept))
             {
                 model.F_AssignTime = DateTime.Now;
-
+                model.F_AssignUser = User.F_UserCode;
                 List<Model.T_Sys_GongDan> listgd = gdbll.GetModelList(" F_GDId='" + model.F_WorkOrderCategory + "'");
                 int timeout = listgd.First().F_TimeOut;
                 model.F_Deadline = DateTime.Now.AddHours(timeout);

RMYY_CallCenter_Api/Controllers/System/UserAccountController.cs

@@ -133,7 +133,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
 
         // [Authority]
         //修改用户信息
-        public ActionResult EditUsers(int userid, string Usercode, string Username, string Password, int DeptId, int RoleId, int IsSeat, int? SeatGroup, string Remark, string Phon, string sex, string companyphone, string address, string job, string Extno = "")
+        public ActionResult EditUsers(int userid, string Usercode, string Username, string Password, int DeptId, int RoleId,   int? SeatGroup, string Remark, string Phon, string sex, string companyphone, string address, string job, string Extno = "")
         {
             var umodel = userbll.GetModelList("  F_UserId = " + userid).FirstOrDefault();
             if (umodel == null)
@@ -149,7 +149,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
             umodel.F_DeptId = DeptId;
             umodel.F_RoleId = RoleId;
             umodel.F_SeatGroup = SeatGroup;
-            if (SeatGroup > 0)
+            if (SeatGroup!=null &&SeatGroup > 0)
             {
                 umodel.F_SeatFlag = 1;
             }