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

RMYY_CallCenter_Api.Dal/T_FaultRepair_Evaluate.cs

@@ -63,9 +63,9 @@ namespace RMYY_CallCenter_Api.DAL
 		{
 			StringBuilder strSql=new StringBuilder();
 			strSql.Append("insert into T_FaultRepair_Evaluate(");
-			strSql.Append("F_WorkOrderCode,F_Attitude,F_Quality,F_EvaluateContent,F_EvaluationTime,F_Evaluator,F_Isdelete,F_UpdateTime,F_Attitude)");
+			strSql.Append("F_WorkOrderCode,F_Attitude,F_Quality,F_EvaluateContent,F_EvaluationTime,F_Evaluator,F_Isdelete,F_UpdateTime,F_Efficiency)");
 			strSql.Append(" values (");
-			strSql.Append("@F_WorkOrderCode,@F_Attitude,@F_Quality,@F_EvaluateContent,@F_EvaluationTime,@F_Evaluator,@F_Isdelete,@F_UpdateTime,@F_Attitude)");
+			strSql.Append("@F_WorkOrderCode,@F_Attitude,@F_Quality,@F_EvaluateContent,@F_EvaluationTime,@F_Evaluator,@F_Isdelete,@F_UpdateTime,@F_Efficiency)");
 			strSql.Append(";select @@IDENTITY");
 			SqlParameter[] parameters = {
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,100),
@@ -76,7 +76,7 @@ namespace RMYY_CallCenter_Api.DAL
 					new SqlParameter("@F_Evaluator", SqlDbType.NVarChar,50),
 					new SqlParameter("@F_Isdelete", SqlDbType.Int,4),
 					new SqlParameter("@F_UpdateTime", SqlDbType.DateTime),
-                  new SqlParameter("@F_Attitude", SqlDbType.Int,4)
+                  new SqlParameter("@F_Efficiency", SqlDbType.Int,4)
             };
 			parameters[0].Value = model.F_WorkOrderCode;
 			parameters[1].Value = model.F_Attitude;
@@ -86,7 +86,7 @@ namespace RMYY_CallCenter_Api.DAL
 			parameters[5].Value = model.F_Evaluator;
 			parameters[6].Value = model.F_Isdelete;
 			parameters[7].Value = model.F_UpdateTime;
-            parameters[8].Value = model.F_Attitude;
+            parameters[8].Value = model.F_Efficiency;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
 			if (obj == null)

RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

@@ -1318,7 +1318,8 @@ namespace RMYY_CallCenter_Api.Controllers
         /// 自动评价
         /// </summary>
         /// <returns></returns>
-         public ActionResult Evaluate()
+        [AllowAnonymous]
+        public ActionResult Evaluate()
         {
             var dicvalue = new Bll.T_Sys_DictionaryValue().
                GetModelList("F_DictionaryFlag='PJSX' and F_State=1");
@@ -1343,9 +1344,7 @@ namespace RMYY_CallCenter_Api.Controllers
                     Model.T_FaultRepair_Evaluate evamodel = new Model.T_FaultRepair_Evaluate();
                     if (model != null)
                     {
-                        if (model.F_ApplicationDept == User.F_DeptId.ToString())
-                        {
-
+                     
                             evamodel.F_EvaluateContent = SX+ "小时未评价自动评价满意";
                             evamodel.F_Quality = 5;
                             evamodel.F_Attitude = 5;
@@ -1360,14 +1359,14 @@ namespace RMYY_CallCenter_Api.Controllers
                             {
                                 model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.finish;
                                 model.F_UpdateTime = DateTime.Now;
-                                model.F_Score = 5 + 5;
+                                model.F_Score =15;
                                 baseBll.Update(model);
-                                AddOperatorLog("评价了工单", (int)EnumOperatorType.evaluate, model.F_WorkOrderCode);
+                            AddEvaluateOperatorLog("评价了工单", (int)EnumOperatorType.evaluate, model.F_WorkOrderCode);
 
                                 #region 评价的时候如果有协作工单，协作工单评价数据和主工单保持一致，同时需要记录操作流程
                                 if (!string.IsNullOrEmpty(model.F_InternalWorkOrderCode))
                                 {
-
+                                 
                                     string[] codes = model.F_InternalWorkOrderCode.Split(',');
                                     foreach (string item in codes)
                                     {
@@ -1375,7 +1374,7 @@ namespace RMYY_CallCenter_Api.Controllers
                                         evamodel1 = evamodel;
                                         evamodel.F_WorkOrderCode = item;
                                         evabll.Add(evamodel1);
-                                        AddOperatorLog("评价了工单", (int)EnumOperatorType.evaluate, item);
+                                    AddEvaluateOperatorLog("评价了工单", (int)EnumOperatorType.evaluate, item);
                                     }
                                 }
                                 if (!string.IsNullOrEmpty(model.F_ExternalWorkOrderCode))
@@ -1388,7 +1387,7 @@ namespace RMYY_CallCenter_Api.Controllers
                                         evamodel1 = evamodel;
                                         evamodel.F_WorkOrderCode = item;
                                         evabll.Add(evamodel1);
-                                        AddOperatorLog("评价了工单", (int)EnumOperatorType.evaluate, item);
+                                    AddEvaluateOperatorLog("评价了工单", (int)EnumOperatorType.evaluate, item);
                                     }
                                 }
                                 #endregion
@@ -1397,22 +1396,29 @@ namespace RMYY_CallCenter_Api.Controllers
                             }
                             else
                                 continue;
-                        }
-                        else
-                        {
-                            continue;
-                        }
+                       
                     }
                 }
             }
             return Success ("评价完成");
 
         }
-
+        public bool AddEvaluateOperatorLog(string content, int type, string workordercode)
+        {
+            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 = "";
+            model.F_WorkOrderCode = workordercode;
+            logBll.Add(model);
+            return true;
+        }
         /// <summary>
         /// 自动流转
         /// </summary>
         /// <returns></returns>
+        [AllowAnonymous]
         public ActionResult Automatic()
         {
            
@@ -1641,7 +1647,7 @@ namespace RMYY_CallCenter_Api.Controllers
                     {
                         model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.finish;
                         model.F_UpdateTime = DateTime.Now;
-                        model.F_Score = Attitude + Quality;
+                        model.F_Score = Attitude + Quality+ Efficiency;
                         baseBll.Update(model);
                         AddOperatorLog("评价了工单", (int)EnumOperatorType.evaluate, model.F_WorkOrderCode);