提交分支

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

                 if (model.F_Source == "3")
                 {
                     model.F_State = (int)EnumWorkOrderState.customers;
+                    model.F_State2 = (int)EnumWorkOrderState.customers;
                 }
                 else
                 {
                     model.F_State = (int)EnumWorkOrderState.audit;
+                    model.F_State2 = (int)EnumWorkOrderState.audit;
                 }
                 model.F_limit = overtime;
                

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

         /// <param name="input"></param>
         /// <returns></returns>
         [Authority]
-        public ActionResult ReturnvisitOrder(long orderid, string reason, string call, string F_VisitRemarks, int isOver = 0, int sms = 0,int resultscore=0,int effectscore=0,int servicescore=0,int qualityscore=0,int npscore=0)
+        public ActionResult ReturnvisitOrder(long orderid, string reason, string call, string F_VisitRemarks, int isOver = 0, int sms = 0,int resultscore=-1,int effectscore=-1,int servicescore=-1,int qualityscore=-1,int npscore=-1)
         {
             int userId = CurrentUser.UserData.F_UserId;
             string cont = "";
                         //}
                         decimal evaluationscore = 0;
                         evaluationscore =Convert.ToDecimal(Math.Round((double)(resultscore + effectscore + servicescore + qualityscore)/4,1));//9-10非常满意，7-8满意，5-6一般，5分一下不满意
-                        if (evaluationscore < 5)
+                        if (evaluationscore < 5 && evaluationscore!=-1)
                             cont = "不满意";
                         else if (evaluationscore == 5 || evaluationscore == 6)
                             cont = "一般";
                             cont = "一般";
                         else if (evaluationscore == 9 || evaluationscore == 10)
                             cont = "非常满意";
+                        else if (evaluationscore==-1)
+                            cont = "未评价";
                         model.F_VisitResultScore = resultscore;
                         model.F_EffectiveScore = effectscore;
                         model.F_ServiceAttitude = servicescore;