Bladeren bron

Merge branch 'master' of http://192.168.1.222:3000/zhoufan/RMYY_CallCenter_Api

1550076451 3 jaren geleden
bovenliggende
commit
0a636168df

+ 1 - 0
RMYY_CallCenter_Api.Bll/RMYY_CallCenter_Api.Bll.csproj

@@ -59,6 +59,7 @@
59 59
     <Compile Include="T_Dev_WorkOrderItem.cs" />
60 60
     <Compile Include="T_Dis_WorkOrder.cs" />
61 61
     <Compile Include="T_Dis_WorkOrderItem.cs" />
62
+    <Compile Include="T_Equipment.cs" />
62 63
     <Compile Include="T_FaultRepair_Base.cs" />
63 64
     <Compile Include="T_FaultRepair_Evaluate.cs" />
64 65
     <Compile Include="T_FaultRepair_OperationLog.cs" />

+ 172 - 0
RMYY_CallCenter_Api.Bll/T_Equipment.cs

@@ -0,0 +1,172 @@
1
+/**  版本信息模板在安装目录下,可自行修改。
2
+* T_Equipment.cs
3
+*
4
+* 功 能: N/A
5
+* 类 名: T_Equipment
6
+*
7
+* Ver    变更日期             负责人  变更内容
8
+* ───────────────────────────────────
9
+* V0.01  2022/10/9 09:54:19   N/A    初版
10
+*
11
+* Copyright (c) 2012 Maticsoft Corporation. All rights reserved.
12
+*┌──────────────────────────────────┐
13
+*│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │
14
+*│ 版权所有:动软卓越(北京)科技有限公司              │
15
+*└──────────────────────────────────┘
16
+*/
17
+using System;
18
+using System.Data;
19
+using System.Collections.Generic;
20
+ 
21
+using RMYY_CallCenter_Api.Model;
22
+namespace RMYY_CallCenter_Api.BLL
23
+{
24
+	/// <summary>
25
+	/// T_Equipment
26
+	/// </summary>
27
+	public partial class T_Equipment
28
+	{
29
+		private readonly RMYY_CallCenter_Api.DAL.T_Equipment dal=new RMYY_CallCenter_Api.DAL.T_Equipment();
30
+		public T_Equipment()
31
+		{}
32
+		#region  BasicMethod
33
+
34
+		/// <summary>
35
+		/// 得到最大ID
36
+		/// </summary>
37
+		public int GetMaxId()
38
+		{
39
+			return dal.GetMaxId();
40
+		}
41
+
42
+		/// <summary>
43
+		/// 是否存在该记录
44
+		/// </summary>
45
+		public bool Exists(int F_EquipID)
46
+		{
47
+			return dal.Exists(F_EquipID);
48
+		}
49
+
50
+		/// <summary>
51
+		/// 增加一条数据
52
+		/// </summary>
53
+		public int  Add(RMYY_CallCenter_Api.Model.T_Equipment model)
54
+		{
55
+			return dal.Add(model);
56
+		}
57
+
58
+		/// <summary>
59
+		/// 更新一条数据
60
+		/// </summary>
61
+		public bool Update(RMYY_CallCenter_Api.Model.T_Equipment model)
62
+		{
63
+			return dal.Update(model);
64
+		}
65
+
66
+		/// <summary>
67
+		/// 删除一条数据
68
+		/// </summary>
69
+		public bool Delete(int F_EquipID)
70
+		{
71
+			
72
+			return dal.Delete(F_EquipID);
73
+		}
74
+		/// <summary>
75
+		/// 删除一条数据
76
+		/// </summary>
77
+		public bool DeleteList(string F_EquipIDlist )
78
+		{
79
+			return dal.DeleteList(F_EquipIDlist );
80
+		}
81
+
82
+		/// <summary>
83
+		/// 得到一个对象实体
84
+		/// </summary>
85
+		public RMYY_CallCenter_Api.Model.T_Equipment GetModel(int F_EquipID)
86
+		{
87
+			
88
+			return dal.GetModel(F_EquipID);
89
+		}
90
+
91
+	 
92
+		/// <summary>
93
+		/// 获得数据列表
94
+		/// </summary>
95
+		public DataSet GetList(string strWhere)
96
+		{
97
+			return dal.GetList(strWhere);
98
+		}
99
+		/// <summary>
100
+		/// 获得前几行数据
101
+		/// </summary>
102
+		public DataSet GetList(int Top,string strWhere,string filedOrder)
103
+		{
104
+			return dal.GetList(Top,strWhere,filedOrder);
105
+		}
106
+		/// <summary>
107
+		/// 获得数据列表
108
+		/// </summary>
109
+		public List<RMYY_CallCenter_Api.Model.T_Equipment> GetModelList(string strWhere)
110
+		{
111
+			DataSet ds = dal.GetList(strWhere);
112
+			return DataTableToList(ds.Tables[0]);
113
+		}
114
+		/// <summary>
115
+		/// 获得数据列表
116
+		/// </summary>
117
+		public List<RMYY_CallCenter_Api.Model.T_Equipment> DataTableToList(DataTable dt)
118
+		{
119
+			List<RMYY_CallCenter_Api.Model.T_Equipment> modelList = new List<RMYY_CallCenter_Api.Model.T_Equipment>();
120
+			int rowsCount = dt.Rows.Count;
121
+			if (rowsCount > 0)
122
+			{
123
+				RMYY_CallCenter_Api.Model.T_Equipment model;
124
+				for (int n = 0; n < rowsCount; n++)
125
+				{
126
+					model = dal.DataRowToModel(dt.Rows[n]);
127
+					if (model != null)
128
+					{
129
+						modelList.Add(model);
130
+					}
131
+				}
132
+			}
133
+			return modelList;
134
+		}
135
+
136
+		/// <summary>
137
+		/// 获得数据列表
138
+		/// </summary>
139
+		public DataSet GetAllList()
140
+		{
141
+			return GetList("");
142
+		}
143
+
144
+		/// <summary>
145
+		/// 分页获取数据列表
146
+		/// </summary>
147
+		public int GetRecordCount(string strWhere)
148
+		{
149
+			return dal.GetRecordCount(strWhere);
150
+		}
151
+		/// <summary>
152
+		/// 分页获取数据列表
153
+		/// </summary>
154
+		public DataSet GetListByPage(string strWhere, string orderby, int startIndex, int endIndex)
155
+		{
156
+			return dal.GetListByPage( strWhere,  orderby,  startIndex,  endIndex);
157
+		}
158
+		/// <summary>
159
+		/// 分页获取数据列表
160
+		/// </summary>
161
+		//public DataSet GetList(int PageSize,int PageIndex,string strWhere)
162
+		//{
163
+			//return dal.GetList(PageSize,PageIndex,strWhere);
164
+		//}
165
+
166
+		#endregion  BasicMethod
167
+		#region  ExtensionMethod
168
+
169
+		#endregion  ExtensionMethod
170
+	}
171
+}
172
+

+ 1 - 0
RMYY_CallCenter_Api.Dal/RMYY_CallCenter_Api.Dal.csproj

@@ -57,6 +57,7 @@
57 57
     <Compile Include="T_Dev_WorkOrderItem.cs" />
58 58
     <Compile Include="T_Dis_WorkOrder.cs" />
59 59
     <Compile Include="T_Dis_WorkOrderItem.cs" />
60
+    <Compile Include="T_Equipment.cs" />
60 61
     <Compile Include="T_FaultRepair_Base.cs" />
61 62
     <Compile Include="T_FaultRepair_Evaluate.cs" />
62 63
     <Compile Include="T_FaultRepair_OperationLog.cs" />

File diff suppressed because it is too large
+ 14 - 9
RMYY_CallCenter_Api.Dal/T_Con_WorkOrder.cs


+ 360 - 0
RMYY_CallCenter_Api.Dal/T_Equipment.cs

@@ -0,0 +1,360 @@
1
+/**  版本信息模板在安装目录下,可自行修改。
2
+* T_Equipment.cs
3
+*
4
+* 功 能: N/A
5
+* 类 名: T_Equipment
6
+*
7
+* Ver    变更日期             负责人  变更内容
8
+* ───────────────────────────────────
9
+* V0.01  2022/10/9 09:54:19   N/A    初版
10
+*
11
+* Copyright (c) 2012 Maticsoft Corporation. All rights reserved.
12
+*┌──────────────────────────────────┐
13
+*│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │
14
+*│ 版权所有:动软卓越(北京)科技有限公司              │
15
+*└──────────────────────────────────┘
16
+*/
17
+using System;
18
+using System.Data;
19
+using System.Text;
20
+using System.Data.SqlClient;
21
+using RMYY_CallCenter_Api.DB;
22
+
23
+namespace RMYY_CallCenter_Api.DAL
24
+{
25
+	/// <summary>
26
+	/// 数据访问类:T_Equipment
27
+	/// </summary>
28
+	public partial class T_Equipment
29
+	{
30
+		public T_Equipment()
31
+		{}
32
+		#region  BasicMethod
33
+
34
+		/// <summary>
35
+		/// 得到最大ID
36
+		/// </summary>
37
+		public int GetMaxId()
38
+		{
39
+		return DbHelperSQL.GetMaxID("F_EquipID", "T_Equipment"); 
40
+		}
41
+
42
+		/// <summary>
43
+		/// 是否存在该记录
44
+		/// </summary>
45
+		public bool Exists(int F_EquipID)
46
+		{
47
+			StringBuilder strSql=new StringBuilder();
48
+			strSql.Append("select count(1) from T_Equipment");
49
+			strSql.Append(" where F_EquipID=@F_EquipID");
50
+			SqlParameter[] parameters = {
51
+					new SqlParameter("@F_EquipID", SqlDbType.Int,4)
52
+			};
53
+			parameters[0].Value = F_EquipID;
54
+
55
+			return DbHelperSQL.Exists(strSql.ToString(),parameters);
56
+		}
57
+
58
+
59
+		/// <summary>
60
+		/// 增加一条数据
61
+		/// </summary>
62
+		public int Add(RMYY_CallCenter_Api.Model.T_Equipment model)
63
+		{
64
+			StringBuilder strSql=new StringBuilder();
65
+			strSql.Append("insert into T_Equipment(");
66
+			strSql.Append("F_EquipName,F_EquipNumber,F_EquipPrice,F_State,F_CreateUser,F_CreateTime)");
67
+			strSql.Append(" values (");
68
+			strSql.Append("@F_EquipName,@F_EquipNumber,@F_EquipPrice,@F_State,@F_CreateUser,@F_CreateTime)");
69
+			strSql.Append(";select @@IDENTITY");
70
+			SqlParameter[] parameters = {
71
+					new SqlParameter("@F_EquipName", SqlDbType.NVarChar,200),
72
+					new SqlParameter("@F_EquipNumber", SqlDbType.NVarChar,200),
73
+					new SqlParameter("@F_EquipPrice", SqlDbType.Decimal,9),
74
+					new SqlParameter("@F_State", SqlDbType.Int,4),
75
+					new SqlParameter("@F_CreateUser", SqlDbType.NVarChar,50),
76
+					new SqlParameter("@F_CreateTime", SqlDbType.DateTime)};
77
+			parameters[0].Value = model.F_EquipName;
78
+			parameters[1].Value = model.F_EquipNumber;
79
+			parameters[2].Value = model.F_EquipPrice;
80
+			parameters[3].Value = model.F_State;
81
+			parameters[4].Value = model.F_CreateUser;
82
+			parameters[5].Value = model.F_CreateTime;
83
+
84
+			object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
85
+			if (obj == null)
86
+			{
87
+				return 0;
88
+			}
89
+			else
90
+			{
91
+				return Convert.ToInt32(obj);
92
+			}
93
+		}
94
+		/// <summary>
95
+		/// 更新一条数据
96
+		/// </summary>
97
+		public bool Update(RMYY_CallCenter_Api.Model.T_Equipment model)
98
+		{
99
+			StringBuilder strSql=new StringBuilder();
100
+			strSql.Append("update T_Equipment set ");
101
+			strSql.Append("F_EquipName=@F_EquipName,");
102
+			strSql.Append("F_EquipNumber=@F_EquipNumber,");
103
+			strSql.Append("F_EquipPrice=@F_EquipPrice,");
104
+			strSql.Append("F_State=@F_State,");
105
+			strSql.Append("F_CreateUser=@F_CreateUser,");
106
+			strSql.Append("F_CreateTime=@F_CreateTime");
107
+			strSql.Append(" where F_EquipID=@F_EquipID");
108
+			SqlParameter[] parameters = {
109
+					new SqlParameter("@F_EquipName", SqlDbType.NVarChar,200),
110
+					new SqlParameter("@F_EquipNumber", SqlDbType.NVarChar,200),
111
+					new SqlParameter("@F_EquipPrice", SqlDbType.Decimal,9),
112
+					new SqlParameter("@F_State", SqlDbType.Int,4),
113
+					new SqlParameter("@F_CreateUser", SqlDbType.NVarChar,50),
114
+					new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
115
+					new SqlParameter("@F_EquipID", SqlDbType.Int,4)};
116
+			parameters[0].Value = model.F_EquipName;
117
+			parameters[1].Value = model.F_EquipNumber;
118
+			parameters[2].Value = model.F_EquipPrice;
119
+			parameters[3].Value = model.F_State;
120
+			parameters[4].Value = model.F_CreateUser;
121
+			parameters[5].Value = model.F_CreateTime;
122
+			parameters[6].Value = model.F_EquipID;
123
+
124
+			int rows=DbHelperSQL.ExecuteSql(strSql.ToString(),parameters);
125
+			if (rows > 0)
126
+			{
127
+				return true;
128
+			}
129
+			else
130
+			{
131
+				return false;
132
+			}
133
+		}
134
+
135
+		/// <summary>
136
+		/// 删除一条数据
137
+		/// </summary>
138
+		public bool Delete(int F_EquipID)
139
+		{
140
+			
141
+			StringBuilder strSql=new StringBuilder();
142
+			strSql.Append("delete from T_Equipment ");
143
+			strSql.Append(" where F_EquipID=@F_EquipID");
144
+			SqlParameter[] parameters = {
145
+					new SqlParameter("@F_EquipID", SqlDbType.Int,4)
146
+			};
147
+			parameters[0].Value = F_EquipID;
148
+
149
+			int rows=DbHelperSQL.ExecuteSql(strSql.ToString(),parameters);
150
+			if (rows > 0)
151
+			{
152
+				return true;
153
+			}
154
+			else
155
+			{
156
+				return false;
157
+			}
158
+		}
159
+		/// <summary>
160
+		/// 批量删除数据
161
+		/// </summary>
162
+		public bool DeleteList(string F_EquipIDlist )
163
+		{
164
+			StringBuilder strSql=new StringBuilder();
165
+			strSql.Append("delete from T_Equipment ");
166
+			strSql.Append(" where F_EquipID in ("+F_EquipIDlist + ")  ");
167
+			int rows=DbHelperSQL.ExecuteSql(strSql.ToString());
168
+			if (rows > 0)
169
+			{
170
+				return true;
171
+			}
172
+			else
173
+			{
174
+				return false;
175
+			}
176
+		}
177
+
178
+
179
+		/// <summary>
180
+		/// 得到一个对象实体
181
+		/// </summary>
182
+		public RMYY_CallCenter_Api.Model.T_Equipment GetModel(int F_EquipID)
183
+		{
184
+			
185
+			StringBuilder strSql=new StringBuilder();
186
+			strSql.Append("select  top 1 F_EquipID,F_EquipName,F_EquipNumber,F_EquipPrice,F_State,F_CreateUser,F_CreateTime from T_Equipment ");
187
+			strSql.Append(" where F_EquipID=@F_EquipID");
188
+			SqlParameter[] parameters = {
189
+					new SqlParameter("@F_EquipID", SqlDbType.Int,4)
190
+			};
191
+			parameters[0].Value = F_EquipID;
192
+
193
+			RMYY_CallCenter_Api.Model.T_Equipment model=new RMYY_CallCenter_Api.Model.T_Equipment();
194
+			DataSet ds=DbHelperSQL.Query(strSql.ToString(),parameters);
195
+			if(ds.Tables[0].Rows.Count>0)
196
+			{
197
+				return DataRowToModel(ds.Tables[0].Rows[0]);
198
+			}
199
+			else
200
+			{
201
+				return null;
202
+			}
203
+		}
204
+
205
+
206
+		/// <summary>
207
+		/// 得到一个对象实体
208
+		/// </summary>
209
+		public RMYY_CallCenter_Api.Model.T_Equipment DataRowToModel(DataRow row)
210
+		{
211
+			RMYY_CallCenter_Api.Model.T_Equipment model=new RMYY_CallCenter_Api.Model.T_Equipment();
212
+			if (row != null)
213
+			{
214
+				if(row["F_EquipID"]!=null && row["F_EquipID"].ToString()!="")
215
+				{
216
+					model.F_EquipID=int.Parse(row["F_EquipID"].ToString());
217
+				}
218
+				if(row["F_EquipName"]!=null)
219
+				{
220
+					model.F_EquipName=row["F_EquipName"].ToString();
221
+				}
222
+				if(row["F_EquipNumber"]!=null)
223
+				{
224
+					model.F_EquipNumber=row["F_EquipNumber"].ToString();
225
+				}
226
+				if(row["F_EquipPrice"]!=null && row["F_EquipPrice"].ToString()!="")
227
+				{
228
+					model.F_EquipPrice=decimal.Parse(row["F_EquipPrice"].ToString());
229
+				}
230
+				if(row["F_State"]!=null && row["F_State"].ToString()!="")
231
+				{
232
+					model.F_State=int.Parse(row["F_State"].ToString());
233
+				}
234
+				if(row["F_CreateUser"]!=null)
235
+				{
236
+					model.F_CreateUser=row["F_CreateUser"].ToString();
237
+				}
238
+				if(row["F_CreateTime"]!=null && row["F_CreateTime"].ToString()!="")
239
+				{
240
+					model.F_CreateTime=DateTime.Parse(row["F_CreateTime"].ToString());
241
+				}
242
+			}
243
+			return model;
244
+		}
245
+
246
+		/// <summary>
247
+		/// 获得数据列表
248
+		/// </summary>
249
+		public DataSet GetList(string strWhere)
250
+		{
251
+			StringBuilder strSql=new StringBuilder();
252
+			strSql.Append("select F_EquipID,F_EquipName,F_EquipNumber,F_EquipPrice,F_State,F_CreateUser,F_CreateTime ");
253
+			strSql.Append(" FROM T_Equipment ");
254
+			if(strWhere.Trim()!="")
255
+			{
256
+				strSql.Append(" where "+strWhere);
257
+			}
258
+			return DbHelperSQL.Query(strSql.ToString());
259
+		}
260
+
261
+		/// <summary>
262
+		/// 获得前几行数据
263
+		/// </summary>
264
+		public DataSet GetList(int Top,string strWhere,string filedOrder)
265
+		{
266
+			StringBuilder strSql=new StringBuilder();
267
+			strSql.Append("select ");
268
+			if(Top>0)
269
+			{
270
+				strSql.Append(" top "+Top.ToString());
271
+			}
272
+			strSql.Append(" F_EquipID,F_EquipName,F_EquipNumber,F_EquipPrice,F_State,F_CreateUser,F_CreateTime ");
273
+			strSql.Append(" FROM T_Equipment ");
274
+			if(strWhere.Trim()!="")
275
+			{
276
+				strSql.Append(" where "+strWhere);
277
+			}
278
+			strSql.Append(" order by " + filedOrder);
279
+			return DbHelperSQL.Query(strSql.ToString());
280
+		}
281
+
282
+		/// <summary>
283
+		/// 获取记录总数
284
+		/// </summary>
285
+		public int GetRecordCount(string strWhere)
286
+		{
287
+			StringBuilder strSql=new StringBuilder();
288
+			strSql.Append("select count(1) FROM T_Equipment ");
289
+			if(strWhere.Trim()!="")
290
+			{
291
+				strSql.Append(" where "+strWhere);
292
+			}
293
+			object obj = DbHelperSQL.GetSingle(strSql.ToString());
294
+			if (obj == null)
295
+			{
296
+				return 0;
297
+			}
298
+			else
299
+			{
300
+				return Convert.ToInt32(obj);
301
+			}
302
+		}
303
+		/// <summary>
304
+		/// 分页获取数据列表
305
+		/// </summary>
306
+		public DataSet GetListByPage(string strWhere, string orderby, int startIndex, int endIndex)
307
+		{
308
+			StringBuilder strSql=new StringBuilder();
309
+			strSql.Append("SELECT * FROM ( ");
310
+			strSql.Append(" SELECT ROW_NUMBER() OVER (");
311
+			if (!string.IsNullOrEmpty(orderby.Trim()))
312
+			{
313
+				strSql.Append("order by T." + orderby );
314
+			}
315
+			else
316
+			{
317
+				strSql.Append("order by T.F_EquipID desc");
318
+			}
319
+			strSql.Append(")AS Row, T.*  from T_Equipment T ");
320
+			if (!string.IsNullOrEmpty(strWhere.Trim()))
321
+			{
322
+				strSql.Append(" WHERE " + strWhere);
323
+			}
324
+			strSql.Append(" ) TT");
325
+			strSql.AppendFormat(" WHERE TT.Row between {0} and {1}", startIndex, endIndex);
326
+			return DbHelperSQL.Query(strSql.ToString());
327
+		}
328
+
329
+		/*
330
+		/// <summary>
331
+		/// 分页获取数据列表
332
+		/// </summary>
333
+		public DataSet GetList(int PageSize,int PageIndex,string strWhere)
334
+		{
335
+			SqlParameter[] parameters = {
336
+					new SqlParameter("@tblName", SqlDbType.VarChar, 255),
337
+					new SqlParameter("@fldName", SqlDbType.VarChar, 255),
338
+					new SqlParameter("@PageSize", SqlDbType.Int),
339
+					new SqlParameter("@PageIndex", SqlDbType.Int),
340
+					new SqlParameter("@IsReCount", SqlDbType.Bit),
341
+					new SqlParameter("@OrderType", SqlDbType.Bit),
342
+					new SqlParameter("@strWhere", SqlDbType.VarChar,1000),
343
+					};
344
+			parameters[0].Value = "T_Equipment";
345
+			parameters[1].Value = "F_EquipID";
346
+			parameters[2].Value = PageSize;
347
+			parameters[3].Value = PageIndex;
348
+			parameters[4].Value = 0;
349
+			parameters[5].Value = 0;
350
+			parameters[6].Value = strWhere;	
351
+			return DbHelperSQL.RunProcedure("UP_GetRecordByPage",parameters,"ds");
352
+		}*/
353
+
354
+		#endregion  BasicMethod
355
+		#region  ExtensionMethod
356
+
357
+		#endregion  ExtensionMethod
358
+	}
359
+}
360
+

+ 14 - 6
RMYY_CallCenter_Api.Dal/T_InvolvedEquip_RepairProcess.cs

@@ -64,9 +64,9 @@ namespace RMYY_CallCenter_Api.DAL
64 64
 		{
65 65
 			StringBuilder strSql=new StringBuilder();
66 66
 			strSql.Append("insert into T_InvolvedEquip_RepairProcess(");
67
-			strSql.Append("F_RepairProcessId,F_WorkOrderCode,F_EquipName,F_DicId,F_EquipPrice,F_EquipAmount,F_CreateTime,F_IsDelete)");
67
+			strSql.Append("F_RepairProcessId,F_WorkOrderCode,F_EquipName,F_DicId,F_EquipPrice,F_EquipAmount,F_CreateTime,F_IsDelete,F_EquipNumber)");
68 68
 			strSql.Append(" values (");
69
-			strSql.Append("@F_RepairProcessId,@F_WorkOrderCode,@F_EquipName,@F_DicId,@F_EquipPrice,@F_EquipAmount,@F_CreateTime,@F_IsDelete)");
69
+			strSql.Append("@F_RepairProcessId,@F_WorkOrderCode,@F_EquipName,@F_DicId,@F_EquipPrice,@F_EquipAmount,@F_CreateTime,@F_IsDelete,@F_EquipNumber)");
70 70
 			strSql.Append(";select @@IDENTITY");
71 71
 			SqlParameter[] parameters = {
72 72
 					new SqlParameter("@F_RepairProcessId", SqlDbType.Int,4),
@@ -76,7 +76,9 @@ namespace RMYY_CallCenter_Api.DAL
76 76
 					new SqlParameter("@F_EquipPrice", SqlDbType.Decimal,9),
77 77
 					new SqlParameter("@F_EquipAmount", SqlDbType.Int,4),
78 78
 					new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
79
-					new SqlParameter("@F_IsDelete", SqlDbType.Int,4)};
79
+					new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
80
+                  new SqlParameter("@F_EquipNumber", SqlDbType.NVarChar,50)  
81
+            };
80 82
 			parameters[0].Value = model.F_RepairProcessId;
81 83
 			parameters[1].Value = model.F_WorkOrderCode;
82 84
 			parameters[2].Value = model.F_EquipName;
@@ -85,8 +87,8 @@ namespace RMYY_CallCenter_Api.DAL
85 87
 			parameters[5].Value = model.F_EquipAmount;
86 88
 			parameters[6].Value = model.F_CreateTime;
87 89
 			parameters[7].Value = model.F_IsDelete;
88
-
89
-			object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
90
+            parameters[8].Value = model.F_EquipNumber;
91
+            object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
90 92
 			if (obj == null)
91 93
 			{
92 94
 				return 0;
@@ -238,7 +240,13 @@ namespace RMYY_CallCenter_Api.DAL
238 240
 				{
239 241
 					model.F_EquipName=row["F_EquipName"].ToString();
240 242
 				}
241
-				if(row["F_DicId"]!=null && row["F_DicId"].ToString()!="")
243
+
244
+                if (row["F_EquipNumber"] != null)
245
+                {
246
+                    model.F_EquipNumber = row["F_EquipNumber"].ToString();
247
+                }
248
+
249
+                if (row["F_DicId"]!=null && row["F_DicId"].ToString()!="")
242 250
 				{
243 251
 					model.F_DicId=int.Parse(row["F_DicId"].ToString());
244 252
 				}

+ 1 - 0
RMYY_CallCenter_Api.Model/RMYY_CallCenter_Api.Model.csproj

@@ -58,6 +58,7 @@
58 58
     <Compile Include="T_Dev_WorkOrderItem.cs" />
59 59
     <Compile Include="T_Dis_WorkOrder.cs" />
60 60
     <Compile Include="T_Dis_WorkOrderItem.cs" />
61
+    <Compile Include="T_Equipment.cs" />
61 62
     <Compile Include="T_FaultRepair_Base.cs" />
62 63
     <Compile Include="T_FaultRepair_Evaluate.cs" />
63 64
     <Compile Include="T_FaultRepair_OperationLog.cs" />

+ 19 - 0
RMYY_CallCenter_Api.Model/T_Con_WorkOrder.cs

@@ -72,9 +72,21 @@ namespace RMYY_CallCenter_Api.Model
72 72
         private string _f_typename1;
73 73
         private string _f_typename2;
74 74
         private string _f_typename3;
75
+        private string _f_complaintsourcename;
76
+
77
+
75 78
         private int? _f_callrecordid;
76 79
         private int? _f_leaverecordid;
77 80
 
81
+        private int? _f_complaintsource;
82
+
83
+        public int? F_ComplaintSource
84
+        {
85
+            set { _f_complaintsource = value; }
86
+            get { return _f_complaintsource; }
87
+        }
88
+
89
+
78 90
         public int? F_LeaveRecordId
79 91
         {
80 92
             set { _f_leaverecordid = value; }
@@ -565,6 +577,13 @@ namespace RMYY_CallCenter_Api.Model
565 577
             set { _f_typename3 = value; }
566 578
             get { return _f_typename3; }
567 579
         }
580
+
581
+        public string  ComplaintSourceName
582
+        {
583
+            set { _f_complaintsourcename = value; }
584
+            get { return _f_complaintsourcename; }
585
+        }
586
+
568 587
         /// <summary>
569 588
         /// 工单状态名称
570 589
         /// </summary>

+ 96 - 0
RMYY_CallCenter_Api.Model/T_Equipment.cs

@@ -0,0 +1,96 @@
1
+/**  版本信息模板在安装目录下,可自行修改。
2
+* T_Equipment.cs
3
+*
4
+* 功 能: N/A
5
+* 类 名: T_Equipment
6
+*
7
+* Ver    变更日期             负责人  变更内容
8
+* ───────────────────────────────────
9
+* V0.01  2022/10/9 09:54:19   N/A    初版
10
+*
11
+* Copyright (c) 2012 Maticsoft Corporation. All rights reserved.
12
+*┌──────────────────────────────────┐
13
+*│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │
14
+*│ 版权所有:动软卓越(北京)科技有限公司              │
15
+*└──────────────────────────────────┘
16
+*/
17
+using System;
18
+namespace RMYY_CallCenter_Api.Model
19
+{
20
+	/// <summary>
21
+	/// T_Equipment:实体类(属性说明自动提取数据库字段的描述信息)
22
+	/// </summary>
23
+	[Serializable]
24
+	public partial class T_Equipment
25
+	{
26
+		public T_Equipment()
27
+		{}
28
+		#region Model
29
+		private int _f_equipid;
30
+		private string _f_equipname;
31
+		private string _f_equipnumber;
32
+		private decimal? _f_equipprice;
33
+		private int? _f_state;
34
+		private string _f_createuser;
35
+		private DateTime? _f_createtime;
36
+		/// <summary>
37
+		/// 
38
+		/// </summary>
39
+		public int F_EquipID
40
+		{
41
+			set{ _f_equipid=value;}
42
+			get{return _f_equipid;}
43
+		}
44
+		/// <summary>
45
+		/// 
46
+		/// </summary>
47
+		public string F_EquipName
48
+		{
49
+			set{ _f_equipname=value;}
50
+			get{return _f_equipname;}
51
+		}
52
+		/// <summary>
53
+		/// 
54
+		/// </summary>
55
+		public string F_EquipNumber
56
+		{
57
+			set{ _f_equipnumber=value;}
58
+			get{return _f_equipnumber;}
59
+		}
60
+		/// <summary>
61
+		/// 
62
+		/// </summary>
63
+		public decimal? F_EquipPrice
64
+		{
65
+			set{ _f_equipprice=value;}
66
+			get{return _f_equipprice;}
67
+		}
68
+		/// <summary>
69
+		/// 
70
+		/// </summary>
71
+		public int? F_State
72
+		{
73
+			set{ _f_state=value;}
74
+			get{return _f_state;}
75
+		}
76
+		/// <summary>
77
+		/// 
78
+		/// </summary>
79
+		public string F_CreateUser
80
+		{
81
+			set{ _f_createuser=value;}
82
+			get{return _f_createuser;}
83
+		}
84
+		/// <summary>
85
+		/// 
86
+		/// </summary>
87
+		public DateTime? F_CreateTime
88
+		{
89
+			set{ _f_createtime=value;}
90
+			get{return _f_createtime;}
91
+		}
92
+		#endregion Model
93
+
94
+	}
95
+}
96
+

+ 13 - 5
RMYY_CallCenter_Api.Model/T_InvolvedEquip_RepairProcess.cs

@@ -30,7 +30,9 @@ namespace RMYY_CallCenter_Api.Model
30 30
 		private int? _f_repairprocessid;
31 31
 		private string _f_workordercode;
32 32
 		private string _f_equipname;
33
-		private int? _f_dicid;
33
+        private string _f_equipnumber;
34
+        
35
+        private int? _f_dicid;
34 36
 		private decimal? _f_equipprice;
35 37
 		private int? _f_equipamount;
36 38
 		private DateTime? _f_createtime;
@@ -67,10 +69,16 @@ namespace RMYY_CallCenter_Api.Model
67 69
 			set{ _f_equipname=value;}
68 70
 			get{return _f_equipname;}
69 71
 		}
70
-		/// <summary>
71
-		/// 
72
-		/// </summary>
73
-		public int? F_DicId
72
+        public string F_EquipNumber
73
+        {
74
+            set { _f_equipnumber = value; }
75
+            get { return _f_equipnumber; }
76
+        }
77
+        
78
+        /// <summary>
79
+        /// 
80
+        /// </summary>
81
+        public int? F_DicId
74 82
 		{
75 83
 			set{ _f_dicid=value;}
76 84
 			get{return _f_dicid;}

+ 130 - 0
RMYY_CallCenter_Api/Controllers/EquipmentController.cs

@@ -0,0 +1,130 @@
1
+using RMYY_CallCenter_Api.DB;
2
+using RMYY_CallCenter_Api.Models;
3
+using RMYY_CallCenter_Api.Models.Enum;
4
+using RMYY_CallCenter_Api.Models.Input;
5
+using RMYY_CallCenter_Api.Utility;
6
+using System;
7
+using System.Collections.Generic;
8
+using System.ComponentModel;
9
+using System.Data;
10
+using System.IO;
11
+using System.Linq;
12
+using System.Reflection;
13
+using System.Text;
14
+using System.Web;
15
+using System.Web.Mvc;
16
+
17
+namespace RMYY_CallCenter_Api.Controllers
18
+{
19
+    public class EquipmentController : BaseController
20
+    {
21
+      private BLL.T_Equipment          equipbll = new BLL.T_Equipment();
22
+
23
+
24
+        /// <summary>
25
+        /// 获取设备列表
26
+        /// </summary>
27
+        /// <returns></returns>
28
+        public ActionResult GetList(string equipmentname,int PageSize = 10,int PageIndex=1)
29
+        {
30
+            var sql = " ";
31
+            if(!string.IsNullOrEmpty(equipmentname))
32
+            {
33
+                sql += " and F_EquipName='" + equipmentname + "'";
34
+            }           
35
+            var recordCount = 0;
36
+            var dt = RMYY_CallCenter_Api.Bll.PagerBll.GetListPager(
37
+              "T_Equipment",
38
+              "F_EquipID",
39
+              "*,,(case F_state when 0 then '无效'    when 1 then '有效' else '' end ) statename",
40
+              sql,
41
+              "ORDER BY F_CreateTime desc ",
42
+               PageSize,
43
+               PageIndex,
44
+              true,
45
+              out recordCount);
46
+             
47
+           
48
+            return Success("设备列表读取成功",dt);
49
+        }
50
+
51
+
52
+
53
+        /// <summary>
54
+        /// 添加字典
55
+        /// </summary>
56
+        /// <param name="input"></param>
57
+        /// <returns></returns>
58
+        public ActionResult AddEquip(string equipname, string equipnumber, decimal equipprice, int state)
59
+        {
60
+            Model.T_Equipment equipModel = new Model.T_Equipment();
61
+
62
+            equipModel.F_EquipName = equipname;
63
+            equipModel.F_EquipNumber = equipnumber;
64
+            equipModel.F_State = state;
65
+            equipModel.F_EquipPrice = equipprice;
66
+            equipModel.F_CreateTime = DateTime.Now;
67
+            equipModel.F_CreateUser =User.F_UserCode;
68
+            if (equipbll.Add(equipModel)>0)
69
+           
70
+            return Success("设备添加成功");
71
+            else
72
+                return Error("设备添加失败");
73
+        }
74
+
75
+
76
+
77
+        /// <summary>
78
+        /// 编辑设备
79
+        /// </summary>
80
+        /// <param name="input"></param>
81
+        /// <returns></returns>
82
+        public ActionResult EditEquip(int equipid,string equipname,string equipnumber,decimal equipprice,int state)
83
+        {
84
+            Model.T_Equipment equipModel = equipbll.GetModel(equipid);
85
+            if (equipModel == null)
86
+                return Error("设备对象不存在");
87
+            equipModel.F_EquipName = equipname;
88
+            equipModel.F_EquipNumber = equipnumber;
89
+            equipModel.F_State = state;
90
+            equipModel.F_EquipPrice = equipprice;
91
+            if (equipbll.Update(equipModel))
92
+                return Success("设备修改成功");
93
+            else
94
+                return Error("设备修改失败");
95
+        }
96
+
97
+
98
+        //[Authority]
99
+        /// <summary>
100
+        /// 删除字典
101
+        /// </summary>
102
+        /// <param name="ids"></param>
103
+        /// <returns></returns>
104
+        public ActionResult DelEquips(string[] ids)
105
+        {
106
+            if (ids == null || ids.Length <= 0)
107
+                return Error("获取参数失败");
108
+            StringBuilder sb = new StringBuilder();
109
+            foreach (var item in ids)
110
+            {
111
+                sb.Append("'" + item + "',");
112
+            }
113
+            if (equipbll.DeleteList(sb.ToString().Trim(',')))
114
+                return Success("删除成功");
115
+            else
116
+                return Error("删除失败");
117
+        }
118
+
119
+
120
+        //获取设备值列表
121
+        public ActionResult GetAllList()
122
+        {
123
+            DataTable dt = new DataTable();
124
+            dt = equipbll.GetList("   F_state=1 ").Tables[0];
125
+            return Success("列表加载成功", dt);
126
+
127
+        }
128
+
129
+    }
130
+}

+ 9 - 1
RMYY_CallCenter_Api/Controllers/WorkOrder/Con_WorkOrderController.cs

@@ -23,6 +23,9 @@ namespace RMYY_CallCenter_Api.Controllers
23 23
         private Bll.T_Sys_GongDan tybll = new Bll.T_Sys_GongDan();
24 24
         private Bll.AddLogBll logbll = new Bll.AddLogBll();
25 25
         private Bll.T_Sys_SystemConfig configBll = new Bll.T_Sys_SystemConfig();
26
+        private Bll.T_Sys_DictionaryValue dvBll = new Bll.T_Sys_DictionaryValue();
27
+        
28
+
26 29
         //工单详情
27 30
 
28 31
         public ActionResult GetWorkOrder()
@@ -388,7 +391,7 @@ namespace RMYY_CallCenter_Api.Controllers
388 391
                 model.typename1 = tybll.GetModel(Convert.ToInt32(model.F_type1))?.F_Name ?? "";
389 392
                 model.typename2 = tybll.GetModel(Convert.ToInt32(model.F_type2))?.F_Name ?? "";
390 393
                 model.typename3 = tybll.GetModel(Convert.ToInt32(model.F_type3))?.F_Name ?? "";
391
-     
394
+                model.ComplaintSourceName = dvBll.GetModel(Convert.ToInt32(model.F_ComplaintSource))?.F_Name ??"";
392 395
                     if (model != null)
393 396
                     {
394 397
                         var obj = new
@@ -782,6 +785,8 @@ namespace RMYY_CallCenter_Api.Controllers
782 785
             model.F_IDNumber = input.F_IDNumber;
783 786
             model.F_ComplaintDept = input.F_ComplaintDept;
784 787
             model.F_ComplaintUser = input.F_ComplaintUser;
788
+            model.F_ComplaintSource = input.F_ComplaintSource;
789
+
785 790
             model.F_ServiceItems = input.F_ServiceItems;//服务项目
786 791
             
787 792
         
@@ -1039,6 +1044,9 @@ namespace RMYY_CallCenter_Api.Controllers
1039 1044
                     Inputmodel.F_IDNumber = item.F_IDNumber;
1040 1045
                     Inputmodel.F_ComplaintDept = item.F_ComplaintDept;
1041 1046
                     Inputmodel.F_ComplaintUser = item.F_ComplaintUser;
1047
+
1048
+                    Inputmodel.F_ComplaintSource = item.F_ComplaintSource;
1049
+
1042 1050
                     Inputmodel.ComplaintDept = GetDeptModel(item.F_ComplaintDept == null ? 0 : item.F_ComplaintDept);
1043 1051
                     Inputlist.Add(Inputmodel);
1044 1052
                 }

+ 10 - 0
RMYY_CallCenter_Api/Models/Input/Con_WorkOrderInput.cs

@@ -143,6 +143,9 @@ namespace RMYY_CallCenter_Api.Models.Input
143 143
         {
144 144
             get; set;
145 145
         }
146
+     
147
+        
148
+
146 149
         /// <summary>
147 150
         /// 处理方式:1立即办理,2提交审核,3转派(健康事业部)
148 151
         /// </summary>
@@ -428,6 +431,13 @@ namespace RMYY_CallCenter_Api.Models.Input
428 431
         public string F_ComplaintUser { set; get; }
429 432
 
430 433
         public string ComplaintDept { set; get; }
434
+
435
+        //投诉来源
436
+        public int? F_ComplaintSource
437
+        {
438
+            get; set;
439
+        }
440
+
431 441
         #endregion Model
432 442
 
433 443
     }

+ 1 - 0
RMYY_CallCenter_Api/RMYY_CallCenter_Api.csproj

@@ -154,6 +154,7 @@
154 154
     <Compile Include="Controllers\CarManage\T_Car_WorkOrderController.cs" />
155 155
     <Compile Include="Controllers\ClassController.cs" />
156 156
     <Compile Include="Controllers\CustomFiledController.cs" />
157
+    <Compile Include="Controllers\EquipmentController.cs" />
157 158
     <Compile Include="Controllers\FaultRepairController.cs" />
158 159
     <Compile Include="Controllers\GroupClassController.cs" />
159 160
     <Compile Include="Controllers\HospitalUserController.cs" />