Merge branch 'master' of http://192.168.1.222:3000/duhongyu/HeBi12345_API

CallCenterApi/CallCenterApi.DAL/T_Bus_WorkOrder.cs

                 {
                     model.F_SuperOpinion = row["F_SuperOpinion"].ToString();
                 }
+                if (row["F_Note"] != null)
+                {
+                    model.F_Note = row["F_Note"].ToString();
+                }
             }
             return model;
         }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

         }
         public static button turnnosee()
         {
-            return new button(30,"不督办");
+            return new button(30, "不督办");
         }
         public static button subreload()
         {
             return new button(55, "审核不通过");
         }
         public static button Explain()
-       {
-           return new button(56, "解释");
+        {
+            return new button(56, "解释");
         }
-        public static button AuditReturn ()
+        public static button AuditReturn()
         {
             return new button(58, "退回审核");
         }
         {
             return new button(59, "追加回复");
         }
+        public static button Note()
+        {
+            return new button(60, "注解");
+        }
         /// <summary>
         /// 审核员退回
         /// </summary>
         {
             public int key { get; set; }
             public string value { get; set; }
-            public button(int _key, string _value) {
+            public button(int _key, string _value)
+            {
                 key = _key;
                 value = _value;
             }
         /// <param name="code"></param>
         /// <param name="iszb"></param>
         /// <returns></returns>
-        public static List<button> GetButtons(string state, string code, string iszb="", string iszbdw="",string ispd=""
-            ,int isproresult=0,string InfoSource = "",int issh=0)
+        public static List<button> GetButtons(string state, string code, string iszb = "", string iszbdw = "", string ispd = ""
+            , int isproresult = 0, string InfoSource = "", int issh = 0)
         {
             //中心话务员(ZXHWY) 二级网络单位(WLDW) 管理员(GLY) 坐席班长(ZXBZ) 调度专员(ZXLD)
             //中心领导管理员(ZXLDGLYGLY) 话务主管(ZXBZ) 中心领导(ZXLDGLY) 话务组长(ZXBZ)
             switch (state)
             {
                 case "0":
-                    if (InfoSource=="2580")
+                    if (InfoSource == "2580")
                     {
-                        if (code == "ZXBZ" || code == "SPZ" || code == "SPZJZ" || code == "GLY" || code == "DDZG"|| code == "ZXHWY"|| code == "ZXLD")
+                        if (code == "ZXBZ" || code == "SPZ" || code == "SPZJZ" || code == "GLY" || code == "DDZG" || code == "ZXHWY" || code == "ZXLD")
                         {
                             buttons.Add(Signfor());
                             buttons.Add(Sendback());
                             buttons.Add(edit());
                         }
                     }
-                  
-                   
+
+
                     break;
                 case "1":
                     //质检专员可以进行编辑 zhengbingbing 20191017
                     //调度专员 中心领导管理员 管理员
                     if (code == "ZXLD" || code == "GLY" || code == "ZXLDGLYGLY" || code == "DDZG" || code == "SPZ" || code == "SPZJZ")
                     {
-                      
-                            buttons.Add(edit());
-                            buttons.Add(back());
-                       
-                       
+
+                        buttons.Add(edit());
+                        buttons.Add(back());
+
+
                     }
-                   
+
                     if (code == "ZXHWY")
                     {//待审核交办时可撤单
                         buttons.Add(withdraw());
                     if (code == "GLY" || code == "WLDW")
                     {
                         buttons.Add(receive());
-                       
+
                     }
                     //调度专员 中心领导管理员 管理员
-                    if (code == "ZXLD" || code == "SPZ" || code == "SPZJZ"  || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" )
+                    if (code == "ZXLD" || code == "SPZ" || code == "SPZJZ" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG")
                     {
                         buttons.Add(takeback());
                         buttons.Add(edit());
                         buttons.Add(feedback());// buttons.Add(reback());
                         if (iszbdw == "1" || code == "GLY" || code == "DDZG")
                         {
-                            
-                               if (InfoSource  =="2580")
-                               buttons.Add(ejdelay());
-                            else 
-                            buttons.Add(delay());
+
+                            if (InfoSource == "2580")
+                                buttons.Add(ejdelay());
+                            else
+                                buttons.Add(delay());
                             if (ispd == "0" || ispd == "")
                             {
                                 buttons.Add(split());
                         }
                     }
                     //调度专员 中心领导管理员 管理员
-                    if (code == "ZXLD" || code == "SPZ" || code == "SPZJZ" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" )
+                    if (code == "ZXLD" || code == "SPZ" || code == "SPZJZ" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG")
                     {
                         buttons.Add(takeback());
                         buttons.Add(edit());
                         }
                         if (ispd == "2")
                         {
-                           // buttons.Add(EJredo());
+                            // buttons.Add(EJredo());
                             //三级单位签收后，加个退回按钮，可以退回工单到二级单位，退回时必须输入退回原因
-                           buttons.Add(feedback());
+                            buttons.Add(feedback());
                             //三级单位签收后，加个退回按钮，可以退回工单到二级单位，退回时必须输入退回原因
                         }
                     }
                     //调度专员 中心领导管理员 管理员
                     if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "SPZ" || code == "SPZJZ")
                     {
-                     //   buttons.Add(edit());
+                        //   buttons.Add(edit());
                         buttons.Add(auditdelay());
                     }
                     //三级网络单位
                     break;
                 case "6":
                     #region 
-                   //中心话务员 坐席班长 管理员
-                 //if (code == "ZXHWY" || code == "ZXBZ" || code == "GLY")
-                   //{
-                   //    buttons.Add(visit());
+                    //中心话务员 坐席班长 管理员
+                    //if (code == "ZXHWY" || code == "ZXBZ" || code == "GLY")
+                    //{
+                    //    buttons.Add(visit());
                     //}
                     //20190315提出需求，回访由质检人员操作 (20190327 zhengbingbing)
                     #endregion
                     {
                         if (isproresult == 2)
                         {
-                            if (code == "WLDW" )
+                            if (code == "WLDW")
                             {
-                               buttons.Add(feedback());
+                                buttons.Add(feedback());
                             }
                         }
                         //else if (isproresult == 3)
                         //    if (code == "ZJZY" || code == "GLY" || code == "ZXLD" || code == "YSZY" || code == "DDZG" || code == "MTDD")
                         //    {
                         //        if (user=="省平台")
-                       //            buttons.Add(visits());
+                        //            buttons.Add(visits());
                         //        else
-                       //        buttons.Add(visit());
-                       //        //  buttons.Add(modify());
+                        //        buttons.Add(visit());
+                        //        //  buttons.Add(modify());
                         //    }
-                       //    if (code == "ZXHWY")
-                       //    {
+                        //    if (code == "ZXHWY")
+                        //    {
                         //        if (user == "省平台")
                         //            buttons.Add(visits());
                         //        else
                         }
                     }
                     else
-                   {
-                        if (code == "ZJZY" || code == "GLY" || code == "ZXLD"  || code == "DDZG" || code == "SPZ" || code == "SPZJZ")
+                    {
+                        if (code == "ZJZY" || code == "GLY" || code == "ZXLD" || code == "DDZG" || code == "SPZ" || code == "SPZJZ")
                         {
                             buttons.Add(VisitApproved());
                             buttons.Add(Auditfailed());
-                           buttons.Add(Audittransfer());
+                            buttons.Add(Audittransfer());
 
-                       }
+                        }
                         if (code == "ZXHWY")
-                       {
-                           // buttons.Add(subback());
-                           // buttons.Add(visit());
-                           buttons.Add(VisitApproved());
+                        {
+                            // buttons.Add(subback());
+                            // buttons.Add(visit());
+                            buttons.Add(VisitApproved());
                             buttons.Add(Auditfailed());
                             buttons.Add(Audittransfer());
 
-                       }
+                        }
                     }
                     break;
 
                     {
                         if (isproresult == 2)
                         {
-                            if (code == "WLDW" )
+                            if (code == "WLDW")
                             {
                                 buttons.Add(feedback());
                             }
                         }
                         else if (isproresult == 3)
                         {
-                            if (code == "ZJZY" || code == "GLY" || code == "ZXLD"  || code == "DDZG" || code == "SPZ" || code == "SPZJZ")
+                            if (code == "ZJZY" || code == "GLY" || code == "ZXLD" || code == "DDZG" || code == "SPZ" || code == "SPZJZ")
                             {
-                                if (InfoSource  == "2580")
-                                  buttons.Add(visits());
+                                if (InfoSource == "2580")
+                                    buttons.Add(visits());
                                 else
                                     buttons.Add(visit());
                                 //  buttons.Add(modify());
+                                buttons.Add(Note());
                             }
                             if (code == "ZXHWY")
                             {
-                                if (InfoSource  == "2580")
+                                if (InfoSource == "2580")
                                     buttons.Add(visits());
-                               else
+                                else
                                     buttons.Add(visit());
+                                buttons.Add(Note());
                             }
                         }
                         //调度专员 中心领导管理员 管理员
                     }
                     else
                     {
-                        if (code == "ZJZY"  || code == "GLY" || code == "ZXLD" || code == "DDZG" || code == "SPZ" || code == "SPZJZ")
+                        if (code == "ZJZY" || code == "GLY" || code == "ZXLD" || code == "DDZG" || code == "SPZ" || code == "SPZJZ")
                         {
                             if (InfoSource == "2580")
                                 buttons.Add(visits());
                                 buttons.Add(visit());
                             buttons.Add(subback());
                             buttons.Add(modify());
+                            buttons.Add(Note());
                         }
                         if (code == "ZXHWY")
                         {
                                 buttons.Add(visits());
                             else
                                 buttons.Add(visit());
+                            buttons.Add(Note());
                         }
                     }
                     break;
                 case "8":
                     //二级网络单位 管理员
-                    if (code == "WLDW"|| code == "DDZG")
+                    if (code == "WLDW" || code == "DDZG")
                     {
 
                         buttons.Add(feedback());
                         if (InfoSource == "2580")
                             buttons.Add(ejdelay());
-                        else 
-                          buttons.Add(delay());
+                        else
+                            buttons.Add(delay());
                         buttons.Add(split());
 
-                       // buttons.Add(reback());
+                        // buttons.Add(reback());
 
                     }
                     //调度专员 中心领导管理员 管理员
-                    if (code == "ZXLD"    || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "SPZ" || code == "SPZJZ")
+                    if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "SPZ" || code == "SPZJZ")
                     {
                         buttons.Add(edit());
                         buttons.Add(takeback());
                         }
                         if (ispd == "2")
                         {
-                           // buttons.Add(EJredo());
+                            // buttons.Add(EJredo());
                             //三级单位签收后，加个退回按钮，可以退回工单到二级单位，退回时必须输入退回原因
                             buttons.Add(feedback());
                             //三级单位签收后，加个退回按钮，可以退回工单到二级单位，退回时必须输入退回原因
                     break;
                 case "9":
                     //调度专员 中心领导管理员 管理员
-                    if ((code == "ZXLD"  || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "ZXHWY" || code == "SPZ" || code == "SPZJZ") && iszb == "1")
+                    if ((code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "ZXHWY" || code == "SPZ" || code == "SPZJZ") && iszb == "1")
                     {
 
                         // buttons.Add(back());
                     }
-                    if (code == "ZXLD"  || code == "YSZY" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "ZXHWY" || code == "SPZ" || code == "SPZJZ")
+                    if (code == "ZXLD" || code == "YSZY" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "ZXHWY" || code == "SPZ" || code == "SPZJZ")
                     {
                         buttons.Add(modify());
                     }
                     if (code == "ZJZY" || code == "ZXLD" || code == "GLY" || code == "DDZG" || code == "SPZ" || code == "SPZJZ")
                     {
                         buttons.Add(AuditReturn());
-                        
+
                     }
-                   
+
                     break;
             }
             //buttons.Add(export());
             //调度专员 中心领导管理员 管理员
-            if (state != "0" && state != "9" && (code == "ZXLD"|| code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "SPZ" || code == "SPZJZ"))
+            if (state != "0" && state != "9" && (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "SPZ" || code == "SPZJZ"))
             {
                 if (InfoSource != "2580")
                     buttons.Add(forceend());
         /// <param name="code"></param>
         /// <param name="iszb"></param>
         /// <returns></returns>
-        public static List<button> GetZSKButtons(string state, string rolecode,string createby,string nowuser)
+        public static List<button> GetZSKButtons(string state, string rolecode, string createby, string nowuser)
         {
             //中心话务员(ZXHWY) 二级网络单位(WLDW) 管理员(GLY) 坐席班长(ZXBZ) 调度专员(ZXLD)
             //中心领导管理员(ZXLDGLYGLY) 话务主管(ZXBZ) 中心领导(ZXLDGLY) 话务组长(ZXBZ)
                     }
                     break;
                 case "1":
-                    if (rolecode == "ZXLD"  || rolecode == "ZXLDGLY" || rolecode == "ZXLDGLYGLY" || rolecode == "GLY" || rolecode == "SPZ" || rolecode == "SPZJZ")
+                    if (rolecode == "ZXLD" || rolecode == "ZXLDGLY" || rolecode == "ZXLDGLYGLY" || rolecode == "GLY" || rolecode == "SPZ" || rolecode == "SPZJZ")
                         buttons.Add(zsk_audit());
                     break;
                 case "2":
                 case "5":
-                    if (rolecode == "ZXHWY" || rolecode == "ZXBZ" || rolecode == "ZXLD"  || rolecode == "DBZY" || rolecode == "ZJZY" || rolecode == "GLY" || rolecode == "SPZ" || rolecode == "SPZJZ")
+                    if (rolecode == "ZXHWY" || rolecode == "ZXBZ" || rolecode == "ZXLD" || rolecode == "DBZY" || rolecode == "ZJZY" || rolecode == "GLY" || rolecode == "SPZ" || rolecode == "SPZJZ")
                     {
                         //解决 未解决
                         buttons.Add(zsk_solved()); buttons.Add(zsk_unsolved());
         /// <param name="code"></param>
         /// <param name="iszb"></param>
         /// <returns></returns>
-        public static List<button> GetAPPButtons(string state, string code,string  isproresult = "0")
+        public static List<button> GetAPPButtons(string state, string code, string isproresult = "0")
         {
             //审核组SPZ 审核质检组SPZJZ
             List<button> buttons = new List<button>();
             {
                 case "1":
                     //调度专员 中心领导管理员 管理员
-                    if ( code == "GLY" || code == "SPZ" || code == "SPZJZ")
+                    if (code == "GLY" || code == "SPZ" || code == "SPZJZ")
                     {
                         buttons.Add(assign());
                     }
                     break;
                 case "3":
                     //调度专员 中心领导管理员 管理员
-                    if ( code == "SPZ" || code == "SPZJZ")
+                    if (code == "SPZ" || code == "SPZJZ")
                     {
                         buttons.Add(auditreback());
                     }
                     {
                         buttons.Add(takeback());
                         buttons.Add(edit());
-                     
+
                     }
                     break;
                 case "5":
 
                     }
                     break;
-                 case "7":
+                case "7":
                     //调度专员 中心领导管理员 管理员
                     //if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY")
                     if (isproresult == "2")
                     }
                     else
                     {
-                        if ( code == "SPZ" || code == "SPZJZ")
+                        if (code == "SPZ" || code == "SPZJZ")
                         {
                             buttons.Add(visit());
-                        
+
                         }
                     }
                     break;
                 case "8":
                     //二级网络单位 管理员
-                    if (code == "WLDW" )
+                    if (code == "WLDW")
                     {
 
                         buttons.Add(feedback());
                     }
                     break;
                 case "14":
-                    if ( code == "SPZ" || code == "SPZJZ")
+                    if (code == "SPZ" || code == "SPZJZ")
                     {
                         buttons.Add(AuditReturn());
 
             }
             //buttons.Add(export());
             //调度专员 中心领导管理员 管理员
-           
+
             return buttons;
         }
         #endregion

CallCenterApi/CallCenterApi.Model/T_Bus_WorkOrder.cs

         private int _f_tobereply = 0;
         private int _f_isopen = 0;
         private int _f_business = 0;
+
         /// <summary>
         /// 
         /// </summary>
         /// 领导批示
         /// </summary>
         public string F_SuperOpinion { set; get; }
-     //   public int? F_IsSendBack{ set; get; }
-     /// <summary>
-     /// 修改人工号
-     /// </summary>
+        //   public int? F_IsSendBack{ set; get; }
+        /// <summary>
+        /// 修改人工号
+        /// </summary>
         //   public string F_EditUser
         //  { set; get; }
 
         /// </summary>
         //   public int ? F_IsBusiness { set; get; }//删除
 
+        /// <summary>
+        /// 注解
+        /// </summary>
+        public string F_Note { set; get; }
         #endregion Model
 
     }