更新

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/AnnotationController.cs

@@ -35,9 +35,9 @@ namespace CallCenterApi.Interface.Controllers
                     pagesize = Convert.ToInt32(strpagesize);
                 }
                 dt = BLL.PagerBLL.GetListPager(
-                    "T_Wo_AnnotationTab",
+                    "T_Wo_AnnotationTab a",
                     "F_Id",
-                    "*",
+                    "(select F_UserName from T_Sys_UserAccount where F_UserCode=a.F_AnnotationPerson) + '('+a.F_AnnotationPerson+')' as F_UserName,*",
                     sql,
                     "ORDER BY F_Id desc",
                     pagesize,

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

@@ -2571,7 +2571,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         private List<ItemListLog> ItemList(List<Model.T_Wo_WorkOrderItem_New> list)
         {
             List<ItemListLog> Modellist = new List<ItemListLog>();
-
+            string strsql = "";
             foreach (var it in list)
             {
                 ItemListLog log = new ItemListLog();
@@ -2584,7 +2584,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         log.F_WoID = workOrder.GetModel(it.F_WoID).F_WorkOrderCode;
                     }
                 }
-
+                var womodel = workOrder.GetModel(it.F_WoID);
                 log.F_WoState = it.F_WoState;
                 log.F_ItemType = it.F_ItemType;
                 log.F_OptType = it.F_OptType;
@@ -2621,7 +2621,22 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
 
                 }
-
+                if (womodel.F_Type == "2")
+                {
+                    int Typeid = int.Parse(womodel.F_QuestionType.Trim());
+                    Model.T_Wo_QuestionManage manage = quesBLL.GetModel(Typeid);
+                    if (manage != null)
+                    {
+                        var Question3 = manage.F_QuestionName;
+                        if (manage.F_Label == "3")
+                        {
+                            var Manage1 = quesBLL.GetModel(int.Parse(manage.F_ParentId.ToString()));//获取问题类别
+                            var Manage2 = quesBLL.GetModel(int.Parse(Manage1.F_ParentId.ToString()));//获取问题类别
+                            var Question1 = Manage2.F_QuestionName;//问题类别1
+                            var Question2 = Manage1.F_QuestionName;//问题类别2
+                        }
+                    }
+                }
                 var configlist = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='NodeLimit' ");
                 if (configlist != null && configlist.Count() > 0)
                 {
@@ -9648,7 +9663,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 foreach (var item in itemlist)
                 {
-                    if (item.F_Type == 1 && model.F_State!=(int)EnumWorkOrderState.evaluate)
+                    if (item.F_Type == 1 && model.F_State != (int)EnumWorkOrderState.evaluate)
                     {
                         model.F_State = wostate;
                         AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.evaluate, optbut, touser, 0, nowUser, model.F_limit, sms, "", 0, 1);
@@ -9658,6 +9673,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         model.F_State2 = wostate;
                         AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.evaluate, optbut, touser, 0, nowUser, model.F_limit, sms, "", 0, 2);
                     }
+                    else if (item.F_Type == 3)
+                    {
+                        model.F_State = wostate;
+                        model.F_State2 = wostate;
+                        AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.evaluate, optbut, touser, 0, nowUser, model.F_limit, sms, "", 0, 3);
+                    }
                 }
             }
             //var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, model.F_limit, sms);