去

RMYY_CallCenter_Api.Dal/T_FaultRepair_Base.cs

             strSql.Append("F_DeviceEncode=@F_DeviceEncode,");
             strSql.Append("F_Picture=@F_Picture,");
             strSql.Append("F_OrderSource=@F_OrderSource,");
-            strSql.Append("F_OrderNo=@F_OrderNo");
+            strSql.Append("F_OrderNo=@F_OrderNo,");
+            strSql.Append("F_ExceptFinishTime=@F_ExceptFinishTime");
+            
 
 
 
 new SqlParameter("@F_DeviceEncode", SqlDbType.NVarChar,50),
 new SqlParameter("@F_Picture", SqlDbType.NVarChar,200),
   new SqlParameter("@F_OrderSource", SqlDbType.NVarChar,50),
-                     new SqlParameter("@F_OrderNo", SqlDbType.NVarChar,50)
+                     new SqlParameter("@F_OrderNo", SqlDbType.NVarChar,50),
+                          new SqlParameter("@F_ExceptFinishTime", SqlDbType.DateTime)
+                     
+
 
 
 >>>>>>> .merge_file_a34564
             parameters[38].Value = model.F_Picture;
             parameters[39].Value = model.F_OrderSource;
             parameters[40].Value = model.F_OrderNo;
+<<<<<<< .merge_file_a41392
 >>>>>>> .merge_file_a34564
+=======
+            parameters[41].Value = model.F_ExceptFinishTime;
+            
+>>>>>>> .merge_file_a09180
 
             int rows=DbHelperSQL.ExecuteSql(strSql.ToString(),parameters);
 			if (rows > 0)
 			}
 		}
 
+<<<<<<< .merge_file_a41392
 
 		/// <summary>
 		/// 得到一个对象实体
 				return null;
 			}
 		}
+=======
+                if (row["F_ExceptFinishTime"] != null && row["F_ExceptFinishTime"].ToString() != "")
+                {
+                    model.F_ExceptFinishTime = DateTime.Parse(row["F_ExceptFinishTime"].ToString());
+                }
+                if (row["F_OrderSource"] != null)
+                {
+                    model.F_OrderSource = row["F_OrderSource"].ToString();
+                }
+                if (row["F_OrderNo"] != null)
+                {
+                    model.F_OrderNo = row["F_OrderNo"].ToString();
+                }
+>>>>>>> .merge_file_a09180
 
 
 		/// <summary>
                 {
                     model.F_EmergencyTypes = row["F_EmergencyTypes"].ToString();
                 }
+<<<<<<< .merge_file_a41392
                 if (row["F_MaintenanceDept"]!=null)
 				{
 					model.F_MaintenanceDept=row["F_MaintenanceDept"].ToString();
 				{
 					model.F_Endtime=DateTime.Parse(row["F_Endtime"].ToString());
 				}
+=======
+                if (row["F_MaintenanceDept"] != null)
+                {
+                    model.F_MaintenanceDept = row["F_MaintenanceDept"].ToString();
+                }
+                if (row["F_AssignTime"] != null && row["F_AssignTime"].ToString() != "")
+                {
+                    model.F_AssignTime = DateTime.Parse(row["F_AssignTime"].ToString());
+                }
+              
+                
+                if (row["F_Endtime"] != null && row["F_Endtime"].ToString() != "")
+                {
+                    model.F_Endtime = DateTime.Parse(row["F_Endtime"].ToString());
+                }
+>>>>>>> .merge_file_a09180
                 if (row["F_AcceptTime"] != null && row["F_AcceptTime"].ToString() != "")
                 {
                     model.F_AcceptTime = DateTime.Parse(row["F_AcceptTime"].ToString());
                 
 
             }
+<<<<<<< .merge_file_a41392
 			return model;
 		}
 
 =======
             strSql.Append(" 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_ReplayCount,F_AcceptTime,F_EmergencyTypes,F_DeviceEncode,     F_Picture,F_OrderSource,F_OrderNo");
 >>>>>>> .merge_file_a22276
+=======
+            strSql.Append(" 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_ReplayCount,F_AcceptTime,F_EmergencyTypes,F_DeviceEncode,     F_Picture,F_OrderSource,F_OrderNo,F_ExceptFinishTime");
+>>>>>>> .merge_file_a09180
 			strSql.Append(" FROM T_FaultRepair_Base ");
 			if(strWhere.Trim()!="")
 			{

RMYY_CallCenter_Api.Model/T_FaultRepair_Base.cs

         private int? _f_score;
         private int? _f_myd;
         private DateTime? _f_stoptime;
+        private DateTime? _f_exceptfinishtime;        
         private DateTime? _f_arrivetime;
         private string _f_assignuser;
         private int f_replaycount = 0;
             set { _f_stoptime = value; }
             get { return _f_stoptime; }
         }
-
+        //挂起的时候增加预计完成时间
+        public DateTime? F_ExceptFinishTime
+        {
+            set { _f_exceptfinishtime = value; }
+            get { return _f_exceptfinishtime; }
+        }
+        
 
         private int? _f_isstop = 0;
 

RMYY_CallCenter_Api/Controllers/DictionaryType/GongDanTypeController.cs

         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        public ActionResult AddGongDan(T_Sys_GongDan input,  List<AutoDept> autodept)
+        public ActionResult AddGongDan(T_Sys_GongDan input,  List<AutoDept> autodept=null)
         {
+            
+
             T_Sys_GongDan model = new T_Sys_GongDan();
             model.F_TimeOut = input.F_TimeOut;
           model.F_RepairTimeLimit = input.F_RepairTimeLimit;
             model.F_ParentID = input.F_ParentID;
             model.F_CreateTime = DateTime.Now;
             model.F_TypeId = input.F_TypeId;
-            model.F_AutoDept = autodept.ToString();
+            if (autodept != null)
+            {
+                model.F_AutoDept = autodept.ToJson();
+            }
+            // 
             model.F_CanReplayCount = input.F_CanReplayCount;
             //if (!string .IsNullOrEmpty (input.F_Identification))
             //{
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost]
-        public ActionResult EditGongDan(T_Sys_GongDan input,List<AutoDept> autodept)
+        public ActionResult EditGongDan(T_Sys_GongDan input, List<AutoDept> autodept = null)
         {
             var ModuleInfo = gongdanBll.GetModel(input.F_GDId);
             if (ModuleInfo != null)
                 ModuleInfo.F_Sort = input.F_Sort;
                 ModuleInfo.F_TypeId = input.F_TypeId;
                 ModuleInfo.F_TimeOut = input.F_TimeOut;
-                ModuleInfo.F_AutoDept = autodept.ToJson();
+                if (autodept != null)
+                {
+                    ModuleInfo.F_AutoDept = autodept.ToJson();
+                }              
                 ModuleInfo.F_CanReplayCount = input.F_CanReplayCount;
                 ModuleInfo.F_CanUrgeCount = input.F_CanUrgeCount;
                 //if (!string.IsNullOrEmpty(input.F_Identification))

RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

                 try
                 {
                     Dictionary<string, object> dic = new Dictionary<string, object>();
+                    dic.Add("fkIncidentNo", model.F_WorkOrderCode);
                     dic.Add("incidentTitle", model.F_Content);//咱的项目没有标题
                     dic.Add("incidentDescription", model.F_Content);
                     dic.Add("departmentNo", model.F_ApplicationDept);
 
         //操作：挂起（挂起的工单超时时限不记录到超时时限中，只有处理中未完结的工单可挂起），另外列表显示一列“是否挂起”字段
         //挂起
-        public ActionResult HangUp(string workordercode, int key, string value, string reason)
+        public ActionResult HangUp(string workordercode, int key, string value, string reason,string expectfinishtime)
         {
 
             Model.T_FaultRepair_Base model = baseBll.GetModel(workordercode);
             model.F_IsStop = 1;
             model.F_StopTime = DateTime.Now;
             model.F_Endtime = DateTime.Now;
+            model.F_ExceptFinishTime = expectfinishtime.ToDateTime();
             baseBll.Update(model);
             string str = "";
             if (!string.IsNullOrEmpty(reason))

RMYY_CallCenter_Api/Controllers/WorkOrder/WorkCommonController.cs

                 // 部门主管
                 //  判断当前登录人是不是部门主管角色 
                 
-                if (User.F_RoleCode== "BMZG")
+                if (User.F_RoleCode== "BMZG" || User.F_RoleCode== "jcgn")
                 {
                     sql += $" and ((F_ProposerDept in(select F_DeptId from [dbo].[GetDeptid] ({User .F_DeptId })) and F_Type!=1000) or (F_DealDept in(select F_DeptId from [dbo].[GetDeptid] ({User.F_DeptId })) and F_Type=1000)  )";
                 }