zhangkun лет назад: 5
Родитель
Сommit
b2c33e6c34

+ 0 - 1
web/BaseCallCenter.DAL/T_Sys_DictionaryBase.cs

332
         /// <returns></returns>
332
         /// <returns></returns>
333
         public TreeNodeStrModel GetTreeModel(DataTable table, TreeNodeStrModel model)
333
         public TreeNodeStrModel GetTreeModel(DataTable table, TreeNodeStrModel model)
334
         {
334
         {
335
-            DataRow[] rows = table.Select("F_ParentId=" + model.code);
336
             foreach (DataRow row in table.Rows)
335
             foreach (DataRow row in table.Rows)
337
             {
336
             {
338
                 List<TreeNodeStrModel> modelList = new List<TreeNodeStrModel>();
337
                 List<TreeNodeStrModel> modelList = new List<TreeNodeStrModel>();

+ 5 - 2
web/BaseCallCenter.DAL/T_Wo_WorkOrderHistory.cs

72
             strSql.Append("F_REMARK=@F_REMARK,");
72
             strSql.Append("F_REMARK=@F_REMARK,");
73
             strSql.Append("F_OPTBTNID=@F_OPTBTNID,");
73
             strSql.Append("F_OPTBTNID=@F_OPTBTNID,");
74
             strSql.Append("F_INSTANCEID=@F_INSTANCEID,");
74
             strSql.Append("F_INSTANCEID=@F_INSTANCEID,");
75
-            strSql.Append("F_TASKFLAG=@F_TASKFLAG");
75
+            strSql.Append("F_TASKFLAG=@F_TASKFLAG,");
76
+            strSql.Append("F_StateName=@F_StateName");
76
             strSql.Append(" where F_HISTORYID=@F_HISTORYID");
77
             strSql.Append(" where F_HISTORYID=@F_HISTORYID");
77
             SqlParameter[] parameters = {
78
             SqlParameter[] parameters = {
78
 					new SqlParameter("@F_WORKORDERSTATEID", SqlDbType.Int,4),
79
 					new SqlParameter("@F_WORKORDERSTATEID", SqlDbType.Int,4),
84
 					new SqlParameter("@F_OPTBTNID", SqlDbType.Int,4),
85
 					new SqlParameter("@F_OPTBTNID", SqlDbType.Int,4),
85
 					new SqlParameter("@F_INSTANCEID", SqlDbType.Int,4),
86
 					new SqlParameter("@F_INSTANCEID", SqlDbType.Int,4),
86
 					new SqlParameter("@F_TASKFLAG", SqlDbType.Int,4),
87
 					new SqlParameter("@F_TASKFLAG", SqlDbType.Int,4),
87
-					new SqlParameter("@F_HISTORYID", SqlDbType.Int,4)};
88
+					new SqlParameter("@F_HISTORYID", SqlDbType.Int,4),
89
+                    new SqlParameter("@F_StateName", SqlDbType.VarChar,50)};
88
             parameters[0].Value = model.F_WORKORDERSTATEID;
90
             parameters[0].Value = model.F_WORKORDERSTATEID;
89
             parameters[1].Value = model.F_OPTUSERID;
91
             parameters[1].Value = model.F_OPTUSERID;
90
             parameters[2].Value = model.F_OPTDATE;
92
             parameters[2].Value = model.F_OPTDATE;
95
             parameters[7].Value = model.F_INSTANCEID;
97
             parameters[7].Value = model.F_INSTANCEID;
96
             parameters[8].Value = model.F_TASKFLAG;
98
             parameters[8].Value = model.F_TASKFLAG;
97
             parameters[9].Value = model.F_HISTORYID;
99
             parameters[9].Value = model.F_HISTORYID;
100
+            parameters[10].Value = model.F_StateName;
98
 
101
 
99
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
102
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
100
             if (rows > 0)
103
             if (rows > 0)

+ 1 - 1
web/YTSoft.BaseCallCenter.MVCWeb/Controllers/Com/ClassController.cs

111
                 return Error("请输入值Classname");
111
                 return Error("请输入值Classname");
112
             }
112
             }
113
 
113
 
114
-            string strWhere = string.Format("  请输入值Classname='{0}' and Parentid='{1}' ", model.Classname, model.Parentid);
114
+            string strWhere = string.Format("  Classname='{0}' and Parentid='{1}' ", model.Classname, model.Parentid);
115
             int count = busClass.GetRecordCount(strWhere);
115
             int count = busClass.GetRecordCount(strWhere);
116
             if (count > 0)
116
             if (count > 0)
117
             {
117
             {

+ 1 - 1
web/YTSoft.BaseCallCenter.MVCWeb/Controllers/WorkOrderController.cs

432
         #endregion
432
         #endregion
433
 
433
 
434
 
434
 
435
-        #region 待处理工单
435
+        #region 待处理工单
436
 
436
 
437
         /// <summary>
437
         /// <summary>
438
         /// 获取待办工单  新
438
         /// 获取待办工单  新