Bladeren bron

提交内容

zhangkun 5 jaren geleden
bovenliggende
commit
708d239380

+ 5 - 5
web/BaseCallCenter.BLL/T_Wo_WorkOrderHistory.cs

@@ -239,12 +239,12 @@ namespace YTSoft.BaseCallCenter.BLL
239 239
             return dal.GetListByPage(strWhere, orderby, startIndex, endIndex);
240 240
         }
241 241
         /// <summary>
242
-        /// 分页获取数据列表
242
+        /// 获取订单的相关责任部门
243 243
         /// </summary>
244
-        //public DataSet GetList(int PageSize,int PageIndex,string strWhere)
245
-        //{
246
-        //return dal.GetList(PageSize,PageIndex,strWhere);
247
-        //}
244
+        public DataSet GetListDZ(string strWhere)
245
+        {
246
+            return dal.GetListDZ(strWhere);
247
+        }
248 248
 
249 249
         #endregion  Method
250 250
     }

+ 9 - 2
web/BaseCallCenter.DAL/COM/T_Com_Tag.cs

@@ -82,6 +82,7 @@ namespace YTSoft.BaseCallCenter.DAL
82 82
             strSql.Append("F_AddTime=@F_AddTime,");
83 83
             strSql.Append("F_Rate=@F_Rate,");
84 84
             strSql.Append("F_Table=@F_Table,");
85
+            strSql.Append("F_About=@F_About,");
85 86
             strSql.Append("F_TableId=@F_TableId");
86 87
             strSql.Append(" where F_Id=@F_Id");
87 88
             SqlParameter[] parameters = {
@@ -95,7 +96,8 @@ namespace YTSoft.BaseCallCenter.DAL
95 96
                     new SqlParameter("@F_Rate", SqlDbType.Int,4),
96 97
                     new SqlParameter("@F_Table", SqlDbType.VarChar,50),
97 98
                     new SqlParameter("@F_TableId", SqlDbType.VarChar,32),
98
-                    new SqlParameter("@F_Id", SqlDbType.Int,4)};
99
+                    new SqlParameter("@F_Id", SqlDbType.Int,4),
100
+                    new SqlParameter("@F_About", SqlDbType.VarChar, 500)};
99 101
             parameters[0].Value = model.F_TagName;
100 102
             parameters[1].Value = model.F_Type;
101 103
             parameters[2].Value = model.F_Content;
@@ -107,6 +109,7 @@ namespace YTSoft.BaseCallCenter.DAL
107 109
             parameters[8].Value = model.F_Table;
108 110
             parameters[9].Value = model.F_TableId;
109 111
             parameters[10].Value = model.F_Id;
112
+            parameters[11].Value = model.F_About;
110 113
 
111 114
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
112 115
             if (rows > 0)
@@ -170,7 +173,7 @@ namespace YTSoft.BaseCallCenter.DAL
170 173
         {
171 174
 
172 175
             StringBuilder strSql = new StringBuilder();
173
-            strSql.Append("select  top 1 F_TagName,F_Type,F_Content,F_AddUser,F_AddUserName,F_Sort,F_AddTime,F_Id,F_Rate,F_Table,F_TableId from T_Com_Tag ");
176
+            strSql.Append("select  top 1 F_TagName,F_Type,F_Content,F_AddUser,F_AddUserName,F_Sort,F_AddTime,F_Id,F_Rate,F_Table,F_TableId,F_About from T_Com_Tag ");
174 177
             strSql.Append(" where F_Id=@F_Id");
175 178
             SqlParameter[] parameters = {
176 179
                     new SqlParameter("@F_Id", SqlDbType.Int,4)
@@ -242,6 +245,10 @@ namespace YTSoft.BaseCallCenter.DAL
242 245
                 {
243 246
                     model.F_TableId = row["F_TableId"].ToString();
244 247
                 }
248
+
249
+                model.F_About = row["F_About"].ToMyString();
250
+
251
+                
245 252
             }
246 253
             return model;
247 254
         }

+ 1 - 1
web/BaseCallCenter.DAL/T_Wo_WorkOrderHistory.cs

@@ -387,7 +387,7 @@ namespace YTSoft.BaseCallCenter.DAL
387 387
         public DataSet GetListDZ(string strWhere)
388 388
         {
389 389
             StringBuilder strSql = new StringBuilder();
390
-            strSql.Append("select distinct  ");
390
+            strSql.Append("select distinct F_OPTBTNID,F_NEXTOWNERARRID ");
391 391
             strSql.Append(" FROM T_Wo_WorkOrderHistory ");
392 392
             if (strWhere.Trim() != "")
393 393
             {

+ 2 - 2
web/YTSoft.BaseCallCenter.MVCWeb/Controllers/Order/WorkOrderController.cs

@@ -356,10 +356,10 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
356 356
 
357 357
         #region 待定责
358 358
 
359
-        public string DZDeptList(int workorderid)
359
+        public string DZDeptList(int workid)
360 360
         {
361 361
             DataTable dt = null;
362
-            DataSet ds = historyBll.GetList(string.Format(" F_INSTANCEID={0} ", workorderid));
362
+            DataSet ds = historyBll.GetListDZ(string.Format(" F_INSTANCEID={0} ", workid));
363 363
             if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
364 364
             {
365 365
                 dt = ds.Tables[0];

+ 1 - 1
web/YTSoft.BaseCallCenter.MVCWeb/YTSoft.BaseCallCenter.MVCWeb.csproj

@@ -117,7 +117,7 @@
117 117
     <Compile Include="Controllers\MainController.cs" />
118 118
     <Compile Include="Controllers\OCXOptController.cs" />
119 119
     <Compile Include="Controllers\OptLogsController.cs" />
120
-    <Compile Include="Controllers\Order\WorkOrderController.cs" />
120
+    <Compile Include="Controllers\Order\OrderController.cs" />
121 121
     <Compile Include="Controllers\OtherPageController.cs" />
122 122
     <Compile Include="Controllers\QualityManagementController.cs" />
123 123
     <Compile Include="Controllers\ReportController.cs" />