830提交

RMYY_CallCenter_Api/Controllers/DictionaryType/GongDanTypeController.cs

@@ -106,6 +106,8 @@ namespace RMYY_CallCenter_Api.Controllers
                     remark = entity_ModuleInfo.F_Remark,
                     sort = entity_ModuleInfo.F_Sort,
                     fid=entity_ModuleInfo.F_ParentID,
+                    cstime=entity_ModuleInfo.F_TimeOut,
+                    fxtime=entity_ModuleInfo.F_RepairTimeLimit,
                     tid=entity_ModuleInfo.F_TypeId
                 });
             }

RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

@@ -24,7 +24,7 @@ namespace RMYY_CallCenter_Api.Controllers
         Bll.T_Sys_GongDan gdbll = new Bll.T_Sys_GongDan();
         private Bll.T_Sys_SystemConfig configBll = new Bll.T_Sys_SystemConfig();
         private  Bll.T_Sys_DictionaryValue dictionaryValueBLL = new  Bll.T_Sys_DictionaryValue();
-
+        private Bll.T_Sys_Department departmentBLL = new Bll.T_Sys_Department();
         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];
@@ -136,7 +136,7 @@ namespace RMYY_CallCenter_Api.Controllers
                
                 if ( !string.IsNullOrEmpty(input.MaintenanceDept))
                 {
-                    AddAssignlog(model.F_WorkOrderCode, input.MaintenanceDept);
+                    AddAssignlog(model.F_WorkOrderCode, input.MaintenanceDept,input.Maintenancer);
                    
                 }
                 if (input.IsEnd == 1)
@@ -207,7 +207,7 @@ namespace RMYY_CallCenter_Api.Controllers
             {                   
                 if (addassignlog)
                 {
-                    AddAssignlog(model.F_WorkOrderCode, input.MaintenanceDept);
+                    AddAssignlog(model.F_WorkOrderCode, input.MaintenanceDept,  input.Maintenancer);
                 }
                 if (input.IsEnd == 1)
                 {
@@ -293,7 +293,7 @@ namespace RMYY_CallCenter_Api.Controllers
             Model.T_FaultRepair_Base model = baseBll.GetModel(WorkOrderCode);
 
             //判断是不是返修的，
-            string sql = "select * from T_FaultRepair_Process where  F_WorkOrderCode='" + WorkOrderCode + "' and F_ReturnReason is not null and F_Maintenancer='" + User.F_UserCode + "'";
+            string sql = "select * from T_FaultRepair_Process where  F_WorkOrderCode='" + WorkOrderCode + "' and F_ReturnReason is not null    and F_Maintenancer='" + User.F_UserCode + "'";
             DataTable dt = DbHelperSQL.Query(sql).Tables[0];
             if (model != null)
             {
@@ -346,7 +346,7 @@ namespace RMYY_CallCenter_Api.Controllers
                     model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.exceptionended;
                     model.F_Endtime = DateTime.Now;
                     //是返修的工单
-                    if (dt != null && dt.Columns.Count > 0)
+                    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_UpdateTime= GETDATE() where F_ProcessId='" + procid + "'";
@@ -430,7 +430,7 @@ namespace RMYY_CallCenter_Api.Controllers
                   
                     if (!string.IsNullOrEmpty(Maintenancer))
                     {
-                        AddAssignlog(newmodel.F_WorkOrderCode, Maintenancer);                      
+                        AddAssignlog(newmodel.F_WorkOrderCode,model.F_MaintenanceDept, Maintenancer);                      
                     }
                     //更新model
 
@@ -886,8 +886,9 @@ namespace RMYY_CallCenter_Api.Controllers
                 var btns = new List<FaultButtonGroup.button>();
 
                 //待接单 已接单 -自行解决
+            
                 if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.neworder ||
-                   Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.receive ||
+                    Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.receive ||
                      Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.dealing
                     )
                 {
@@ -895,11 +896,11 @@ namespace RMYY_CallCenter_Api.Controllers
 
                 }
                 //待评价  评价
-                if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.dealed)
+              else  if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.dealed)
                 {
                     btns.Add(FaultButtonGroup.evaluate());
                 }
-                if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.exceptionended ||
+               else if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.exceptionended ||
                     Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.finish
                     )
                 {
@@ -1022,7 +1023,7 @@ namespace RMYY_CallCenter_Api.Controllers
                                 }
                                 #endregion
                             }
-                            else  
+                            else  //报修人
                             {
                                 #region  展示的工单状态
                                 if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.neworder || Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.receive)
@@ -1043,8 +1044,7 @@ namespace RMYY_CallCenter_Api.Controllers
                                     dr["StateName"] = "已完成";
                                 }
                                 #endregion
-                            }
-                            
+                            }                           
 
 
                         }
@@ -1221,7 +1221,7 @@ namespace RMYY_CallCenter_Api.Controllers
             {
                 model.F_Maintenancer = ToUserCode;
                 model.F_UpdateTime = DateTime.Now;
-                AddOperatorLog("转派工单给" + ToUserCode, (int)EnumOperatorType.transfer, WorkOrderCode);
+                AddOperatorLog("转派工单给" +GetDeptModel(model.F_MaintenanceDept)+"部门" +GetUserModel(ToUserCode), (int)EnumOperatorType.transfer, WorkOrderCode);
 
                 baseBll.Update(model);
                 return Success("转派成功");
@@ -1347,9 +1347,9 @@ namespace RMYY_CallCenter_Api.Controllers
             AddOperatorLog("创建报修工单", (int)EnumOperatorType.add, workordercode);
         }
 
-        public void AddAssignlog(string workordercode,string maintenancer)
+        public void AddAssignlog(string workordercode,string dept, string maintenancer)
         {
-            AddOperatorLog("指派工单给" + maintenancer, (int)EnumOperatorType.assign, workordercode);
+            AddOperatorLog("指派工单给" + GetDeptModel(dept)+"部门"+ GetUserModel(maintenancer), (int)EnumOperatorType.assign, workordercode);
            
         }
         public void AddInternalasslog(string workordercode,  string newworkordercode)
@@ -1363,7 +1363,49 @@ namespace RMYY_CallCenter_Api.Controllers
             
         }
 
-       #endregion
+
+
+        #endregion
+
+
+        public string GetDeptModel( string deptcode = "")
+        {
+            string sql = " 1=1 ";
+          
+            if (!string.IsNullOrWhiteSpace(deptcode))
+            {
+                sql += " and F_DeptCode='" + deptcode + "'";
+            }
+            if (string.IsNullOrWhiteSpace(sql))
+                return "";
+
+            var role = departmentBLL.GetModelList(sql).FirstOrDefault();
+            string name = role.F_DeptName;
+
+            return  name;
+        }
+
+        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 "";
+          
+        }
 
     }
 }