浏览代码

2.3.2部分

liyuanyuan 3 年之前
父节点
当前提交
31bf495d95

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

65
     <Compile Include="T_FaultRepair_Process.cs" />
65
     <Compile Include="T_FaultRepair_Process.cs" />
66
     <Compile Include="T_Hos_WorkOrder.cs" />
66
     <Compile Include="T_Hos_WorkOrder.cs" />
67
     <Compile Include="T_Hos_WorkOrderItem.cs" />
67
     <Compile Include="T_Hos_WorkOrderItem.cs" />
68
+    <Compile Include="T_InvolvedEquip_RepairProcess.cs" />
68
     <Compile Include="T_Mat_WorkOrder.cs" />
69
     <Compile Include="T_Mat_WorkOrder.cs" />
69
     <Compile Include="T_Mat_WorkOrderItem.cs" />
70
     <Compile Include="T_Mat_WorkOrderItem.cs" />
70
     <Compile Include="T_Msg_Chat.cs" />
71
     <Compile Include="T_Msg_Chat.cs" />

+ 172 - 0
RMYY_CallCenter_Api.Bll/T_InvolvedEquip_RepairProcess.cs

1
+/**  版本信息模板在安装目录下,可自行修改。
2
+* T_InvolvedEquip_RepairProcess.cs
3
+*
4
+* 功 能: N/A
5
+* 类 名: T_InvolvedEquip_RepairProcess
6
+*
7
+* Ver    变更日期             负责人  变更内容
8
+* ───────────────────────────────────
9
+* V0.01  2022/9/19 10:28:50   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_InvolvedEquip_RepairProcess
26
+	/// </summary>
27
+	public partial class T_InvolvedEquip_RepairProcess
28
+	{
29
+		private readonly RMYY_CallCenter_Api.DAL.T_InvolvedEquip_RepairProcess dal=new RMYY_CallCenter_Api.DAL.T_InvolvedEquip_RepairProcess();
30
+		public T_InvolvedEquip_RepairProcess()
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_ID)
46
+		{
47
+			return dal.Exists(F_ID);
48
+		}
49
+
50
+		/// <summary>
51
+		/// 增加一条数据
52
+		/// </summary>
53
+		public int  Add(RMYY_CallCenter_Api.Model.T_InvolvedEquip_RepairProcess model)
54
+		{
55
+			return dal.Add(model);
56
+		}
57
+
58
+		/// <summary>
59
+		/// 更新一条数据
60
+		/// </summary>
61
+		public bool Update(RMYY_CallCenter_Api.Model.T_InvolvedEquip_RepairProcess model)
62
+		{
63
+			return dal.Update(model);
64
+		}
65
+
66
+		/// <summary>
67
+		/// 删除一条数据
68
+		/// </summary>
69
+		public bool Delete(int F_ID)
70
+		{
71
+			
72
+			return dal.Delete(F_ID);
73
+		}
74
+		/// <summary>
75
+		/// 删除一条数据
76
+		/// </summary>
77
+		public bool DeleteList(string F_IDlist )
78
+		{
79
+			return dal.DeleteList(F_IDlist );
80
+		}
81
+
82
+		/// <summary>
83
+		/// 得到一个对象实体
84
+		/// </summary>
85
+		public RMYY_CallCenter_Api.Model.T_InvolvedEquip_RepairProcess GetModel(int F_ID)
86
+		{
87
+			
88
+			return dal.GetModel(F_ID);
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_InvolvedEquip_RepairProcess> 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_InvolvedEquip_RepairProcess> DataTableToList(DataTable dt)
118
+		{
119
+			List<RMYY_CallCenter_Api.Model.T_InvolvedEquip_RepairProcess> modelList = new List<RMYY_CallCenter_Api.Model.T_InvolvedEquip_RepairProcess>();
120
+			int rowsCount = dt.Rows.Count;
121
+			if (rowsCount > 0)
122
+			{
123
+				RMYY_CallCenter_Api.Model.T_InvolvedEquip_RepairProcess 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

63
     <Compile Include="T_FaultRepair_Process.cs" />
63
     <Compile Include="T_FaultRepair_Process.cs" />
64
     <Compile Include="T_Hos_WorkOrder.cs" />
64
     <Compile Include="T_Hos_WorkOrder.cs" />
65
     <Compile Include="T_Hos_WorkOrderItem.cs" />
65
     <Compile Include="T_Hos_WorkOrderItem.cs" />
66
+    <Compile Include="T_InvolvedEquip_RepairProcess.cs" />
66
     <Compile Include="T_Mat_WorkOrder.cs" />
67
     <Compile Include="T_Mat_WorkOrder.cs" />
67
     <Compile Include="T_Mat_WorkOrderItem.cs" />
68
     <Compile Include="T_Mat_WorkOrderItem.cs" />
68
     <Compile Include="T_Msg_Chat.cs" />
69
     <Compile Include="T_Msg_Chat.cs" />

+ 35 - 13
RMYY_CallCenter_Api.Dal/T_FaultRepair_Base.cs

64
 		{
64
 		{
65
 			StringBuilder strSql=new StringBuilder();
65
 			StringBuilder strSql=new StringBuilder();
66
 			strSql.Append("insert into T_FaultRepair_Base(");
66
 			strSql.Append("insert into T_FaultRepair_Base(");
67
-			strSql.Append("F_WorkOrderCode,F_Applicant,F_ApplicationDept,F_Applicantsphone,F_Phone,F_WorkOrderCategory,F_Content,F_PlaceOfRepair,F_WorkOrderState,F_Maintenancer,F_MaintenanceDept,F_AssignTime,F_Endtime,F_UpdateTime,F_Deadline,F_CreateUser,F_CreateTime,F_CreateUserDept,F_File,F_ReturnNum,F_InternalWorkOrderCode,F_ExternalWorkOrderCode,F_IsDelete,F_LeaveRecordId,F_CallRecordId,F_CallId)");
67
+			strSql.Append("F_WorkOrderCode,F_Applicant,F_ApplicationDept,F_Applicantsphone,F_Phone,F_WorkOrderCategory,F_Content,F_PlaceOfRepair,F_WorkOrderState,F_Maintenancer,F_MaintenanceDept,F_AssignTime,F_Endtime,F_UpdateTime,F_Deadline,F_CreateUser,F_CreateTime,F_CreateUserDept,F_File,F_ReturnNum,F_InternalWorkOrderCode,F_ExternalWorkOrderCode,F_IsDelete,F_LeaveRecordId,F_CallRecordId,F_CallId,F_IsStop)");
68
 			strSql.Append(" values (");
68
 			strSql.Append(" values (");
69
-			strSql.Append("@F_WorkOrderCode,@F_Applicant,@F_ApplicationDept,@F_Applicantsphone,@F_Phone,@F_WorkOrderCategory,@F_Content,@F_PlaceOfRepair,@F_WorkOrderState,@F_Maintenancer,@F_MaintenanceDept,@F_AssignTime,@F_Endtime,@F_UpdateTime,@F_Deadline,@F_CreateUser,@F_CreateTime,@F_CreateUserDept,@F_File,@F_ReturnNum,@F_InternalWorkOrderCode,@F_ExternalWorkOrderCode,@F_IsDelete,@F_LeaveRecordId,@F_CallRecordId,@F_CallId)");
69
+			strSql.Append("@F_WorkOrderCode,@F_Applicant,@F_ApplicationDept,@F_Applicantsphone,@F_Phone,@F_WorkOrderCategory,@F_Content,@F_PlaceOfRepair,@F_WorkOrderState,@F_Maintenancer,@F_MaintenanceDept,@F_AssignTime,@F_Endtime,@F_UpdateTime,@F_Deadline,@F_CreateUser,@F_CreateTime,@F_CreateUserDept,@F_File,@F_ReturnNum,@F_InternalWorkOrderCode,@F_ExternalWorkOrderCode,@F_IsDelete,@F_LeaveRecordId,@F_CallRecordId,@F_CallId,@F_IsStop)");
70
 			strSql.Append(";select @@IDENTITY");
70
 			strSql.Append(";select @@IDENTITY");
71
 			SqlParameter[] parameters = {
71
 			SqlParameter[] parameters = {
72
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,50),
72
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,50),
94
 					new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
94
 					new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
95
                     new SqlParameter("@F_LeaveRecordId", SqlDbType.Int,4),
95
                     new SqlParameter("@F_LeaveRecordId", SqlDbType.Int,4),
96
                          new SqlParameter("@F_CallRecordId", SqlDbType.Int,4),
96
                          new SqlParameter("@F_CallRecordId", SqlDbType.Int,4),
97
-                         new SqlParameter("@F_CallId", SqlDbType.NVarChar,50)
98
-                  
97
+                         new SqlParameter("@F_CallId", SqlDbType.NVarChar,50),
98
+                            new SqlParameter("@F_IsStop", SqlDbType.Int,4)
99
+                         
100
+
99
 
101
 
100
             };
102
             };
101
 			parameters[0].Value = model.F_WorkOrderCode;
103
 			parameters[0].Value = model.F_WorkOrderCode;
125
             parameters[23].Value = model.F_LeaveRecordId;
127
             parameters[23].Value = model.F_LeaveRecordId;
126
             parameters[24].Value = model.F_CallRecordId;
128
             parameters[24].Value = model.F_CallRecordId;
127
             parameters[25].Value = model.F_CallId;
129
             parameters[25].Value = model.F_CallId;
130
+            
131
+                 parameters[26].Value = model.F_IsStop;
128
 
132
 
129
             object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
133
             object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
130
 			if (obj == null)
134
 			if (obj == null)
168
 			strSql.Append("F_IsDelete=@F_IsDelete,");
172
 			strSql.Append("F_IsDelete=@F_IsDelete,");
169
 
173
 
170
            
174
            
171
-strSql.Append("F_LeaveRecordId=@F_LeaveRecordId,");
175
+            strSql.Append("F_LeaveRecordId=@F_LeaveRecordId,");
172
             strSql.Append("F_CallRecordId=@F_CallRecordId,");
176
             strSql.Append("F_CallRecordId=@F_CallRecordId,");
173
             strSql.Append("F_CallId=@F_CallId,");
177
             strSql.Append("F_CallId=@F_CallId,");
174
-            strSql.Append("F_Score=@F_Score");
175
-
176
-
178
+            strSql.Append("F_Score=@F_Score,");
179
+            strSql.Append("F_IsStop=@F_IsStop,");
180
+            strSql.Append("F_StopTime=@F_StopTime,");
181
+            strSql.Append("F_ArriveTime=@F_ArriveTime");
182
+            
177
             strSql.Append(" where F_WorkOrderId=@F_WorkOrderId");
183
             strSql.Append(" where F_WorkOrderId=@F_WorkOrderId");
178
 			SqlParameter[] parameters = {
184
 			SqlParameter[] parameters = {
179
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,50),
185
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,50),
204
                     new SqlParameter("@F_LeaveRecordId", SqlDbType.Int,4),
210
                     new SqlParameter("@F_LeaveRecordId", SqlDbType.Int,4),
205
                     new SqlParameter("@F_CallRecordId", SqlDbType.Int,4),
211
                     new SqlParameter("@F_CallRecordId", SqlDbType.Int,4),
206
                     new SqlParameter("@F_CallId", SqlDbType.NVarChar,50),
212
                     new SqlParameter("@F_CallId", SqlDbType.NVarChar,50),
207
-                      new SqlParameter("@F_Score", SqlDbType.Int,4)
208
-                    
213
+                      new SqlParameter("@F_Score", SqlDbType.Int,4),
214
+                    new SqlParameter("@F_IsStop", SqlDbType.Int,4),
215
+                  new SqlParameter("@F_StopTime", SqlDbType.DateTime),
216
+                 new SqlParameter("@F_ArriveTime", SqlDbType.DateTime)
217
+
218
+
209
 
219
 
210
             };
220
             };
211
 			parameters[0].Value = model.F_WorkOrderCode;
221
 			parameters[0].Value = model.F_WorkOrderCode;
237
             parameters[25].Value = model.F_CallRecordId;
247
             parameters[25].Value = model.F_CallRecordId;
238
             parameters[26].Value = model.F_CallId;
248
             parameters[26].Value = model.F_CallId;
239
             parameters[27].Value = model.F_Score;
249
             parameters[27].Value = model.F_Score;
250
+            parameters[28].Value = model.F_IsStop;
251
+
252
+            parameters[29].Value = model.F_StopTime;
253
+
254
+            parameters[30].Value = model.F_ArriveTime;
240
 
255
 
241
             int rows=DbHelperSQL.ExecuteSql(strSql.ToString(),parameters);
256
             int rows=DbHelperSQL.ExecuteSql(strSql.ToString(),parameters);
242
 			if (rows > 0)
257
 			if (rows > 0)
300
 		{
315
 		{
301
 			
316
 			
302
 			StringBuilder strSql=new StringBuilder();
317
 			StringBuilder strSql=new StringBuilder();
303
-			strSql.Append("select  top 1 F_WorkOrderId,F_WorkOrderCode,F_Applicant,F_ApplicationDept,F_Applicantsphone,F_Phone,F_WorkOrderCategory,F_Content,F_PlaceOfRepair,F_WorkOrderState,F_Maintenancer,F_MaintenanceDept,F_AssignTime,F_Endtime,F_UpdateTime,F_Deadline,F_CreateUser,F_CreateTime,F_CreateUserDept,F_File,F_ReturnNum,F_InternalWorkOrderCode,F_ExternalWorkOrderCode,F_IsDelete from T_FaultRepair_Base ");
318
+			strSql.Append("select  top 1 F_WorkOrderId,F_WorkOrderCode,F_Applicant,F_ApplicationDept,F_Applicantsphone,F_Phone,F_WorkOrderCategory,F_Content,F_PlaceOfRepair,F_WorkOrderState,F_Maintenancer,F_MaintenanceDept,F_AssignTime,F_Endtime,F_UpdateTime,F_Deadline,F_CreateUser,F_CreateTime,F_CreateUserDept,F_File,F_ReturnNum,F_InternalWorkOrderCode,F_ExternalWorkOrderCode,F_IsDelete,F_IsStop from T_FaultRepair_Base ");
304
 			strSql.Append(" where F_WorkOrderCode=@F_WorkOrderId");
319
 			strSql.Append(" where F_WorkOrderCode=@F_WorkOrderId");
305
 			SqlParameter[] parameters = {
320
 			SqlParameter[] parameters = {
306
 					new SqlParameter("@F_WorkOrderId", SqlDbType.VarChar)
321
 					new SqlParameter("@F_WorkOrderId", SqlDbType.VarChar)
424
 				{
439
 				{
425
 					model.F_IsDelete=int.Parse(row["F_IsDelete"].ToString());
440
 					model.F_IsDelete=int.Parse(row["F_IsDelete"].ToString());
426
 				}
441
 				}
427
-			}
442
+                if (row["F_IsStop"] != null && row["F_IsStop"].ToString() != "")
443
+                {
444
+                    model.F_IsStop = int.Parse(row["F_IsStop"].ToString());
445
+                }
446
+
447
+                
448
+
449
+            }
428
 			return model;
450
 			return model;
429
 		}
451
 		}
430
 
452
 
434
 		public DataSet GetList(string strWhere)
456
 		public DataSet GetList(string strWhere)
435
 		{
457
 		{
436
 			StringBuilder strSql=new StringBuilder();
458
 			StringBuilder strSql=new StringBuilder();
437
-			strSql.Append("select F_WorkOrderId,F_WorkOrderCode,F_Applicant,F_ApplicationDept,F_Applicantsphone,F_Phone,F_WorkOrderCategory,F_Content,F_PlaceOfRepair,F_WorkOrderState,F_Maintenancer,F_MaintenanceDept,F_AssignTime,F_Endtime,F_UpdateTime,F_Deadline,F_CreateUser,F_CreateTime,F_CreateUserDept,F_File,F_ReturnNum,F_InternalWorkOrderCode,F_ExternalWorkOrderCode,F_IsDelete ");
459
+			strSql.Append("select F_WorkOrderId,F_WorkOrderCode,F_Applicant,F_ApplicationDept,F_Applicantsphone,F_Phone,F_WorkOrderCategory,F_Content,F_PlaceOfRepair,F_WorkOrderState,F_Maintenancer,F_MaintenanceDept,F_AssignTime,F_Endtime,F_UpdateTime,F_Deadline,F_CreateUser,F_CreateTime,F_CreateUserDept,F_File,F_ReturnNum,F_InternalWorkOrderCode,F_ExternalWorkOrderCode,F_IsDelete ,F_IsStop");
438
 			strSql.Append(" FROM T_FaultRepair_Base ");
460
 			strSql.Append(" FROM T_FaultRepair_Base ");
439
 			if(strWhere.Trim()!="")
461
 			if(strWhere.Trim()!="")
440
 			{
462
 			{

+ 28 - 18
RMYY_CallCenter_Api.Dal/T_FaultRepair_Evaluate.cs

63
 		{
63
 		{
64
 			StringBuilder strSql=new StringBuilder();
64
 			StringBuilder strSql=new StringBuilder();
65
 			strSql.Append("insert into T_FaultRepair_Evaluate(");
65
 			strSql.Append("insert into T_FaultRepair_Evaluate(");
66
-			strSql.Append("F_WorkOrderCode,F_Attitude,F_Quality,F_EvaluateContent,F_EvaluationTime,F_Evaluator,F_Isdelete,F_UpdateTime)");
66
+			strSql.Append("F_WorkOrderCode,F_Attitude,F_Quality,F_EvaluateContent,F_EvaluationTime,F_Evaluator,F_Isdelete,F_UpdateTime,F_Attitude)");
67
 			strSql.Append(" values (");
67
 			strSql.Append(" values (");
68
-			strSql.Append("@F_WorkOrderCode,@F_Attitude,@F_Quality,@F_EvaluateContent,@F_EvaluationTime,@F_Evaluator,@F_Isdelete,@F_UpdateTime)");
68
+			strSql.Append("@F_WorkOrderCode,@F_Attitude,@F_Quality,@F_EvaluateContent,@F_EvaluationTime,@F_Evaluator,@F_Isdelete,@F_UpdateTime,@F_Attitude)");
69
 			strSql.Append(";select @@IDENTITY");
69
 			strSql.Append(";select @@IDENTITY");
70
 			SqlParameter[] parameters = {
70
 			SqlParameter[] parameters = {
71
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,100),
71
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,100),
75
 					new SqlParameter("@F_EvaluationTime", SqlDbType.DateTime),
75
 					new SqlParameter("@F_EvaluationTime", SqlDbType.DateTime),
76
 					new SqlParameter("@F_Evaluator", SqlDbType.NVarChar,50),
76
 					new SqlParameter("@F_Evaluator", SqlDbType.NVarChar,50),
77
 					new SqlParameter("@F_Isdelete", SqlDbType.Int,4),
77
 					new SqlParameter("@F_Isdelete", SqlDbType.Int,4),
78
-					new SqlParameter("@F_UpdateTime", SqlDbType.DateTime)};
78
+					new SqlParameter("@F_UpdateTime", SqlDbType.DateTime),
79
+                  new SqlParameter("@F_Attitude", SqlDbType.Int,4)
80
+            };
79
 			parameters[0].Value = model.F_WorkOrderCode;
81
 			parameters[0].Value = model.F_WorkOrderCode;
80
 			parameters[1].Value = model.F_Attitude;
82
 			parameters[1].Value = model.F_Attitude;
81
 			parameters[2].Value = model.F_Quality;
83
 			parameters[2].Value = model.F_Quality;
84
 			parameters[5].Value = model.F_Evaluator;
86
 			parameters[5].Value = model.F_Evaluator;
85
 			parameters[6].Value = model.F_Isdelete;
87
 			parameters[6].Value = model.F_Isdelete;
86
 			parameters[7].Value = model.F_UpdateTime;
88
 			parameters[7].Value = model.F_UpdateTime;
89
+            parameters[8].Value = model.F_Attitude;
87
 
90
 
88
-			object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
91
+            object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
89
 			if (obj == null)
92
 			if (obj == null)
90
 			{
93
 			{
91
 				return 0;
94
 				return 0;
193
 		{
196
 		{
194
 			
197
 			
195
 			StringBuilder strSql=new StringBuilder();
198
 			StringBuilder strSql=new StringBuilder();
196
-			strSql.Append("select  top 1 F_EvaluateId,F_WorkOrderCode,F_Attitude,F_Quality,F_EvaluateContent,F_EvaluationTime,F_Evaluator,F_Isdelete,F_UpdateTime from T_FaultRepair_Evaluate ");
199
+			strSql.Append("select  top 1 F_EvaluateId,F_WorkOrderCode,F_Attitude,F_Quality,F_EvaluateContent,F_EvaluationTime,F_Evaluator,F_Isdelete,F_UpdateTime,F_Efficiency from T_FaultRepair_Evaluate ");
197
 			strSql.Append(" where F_EvaluateId=@F_EvaluateId");
200
 			strSql.Append(" where F_EvaluateId=@F_EvaluateId");
198
 			SqlParameter[] parameters = {
201
 			SqlParameter[] parameters = {
199
 					new SqlParameter("@F_EvaluateId", SqlDbType.Int,4)
202
 					new SqlParameter("@F_EvaluateId", SqlDbType.Int,4)
231
 				}
234
 				}
232
 				if(row["F_Attitude"]!=null && row["F_Attitude"].ToString()!="")
235
 				if(row["F_Attitude"]!=null && row["F_Attitude"].ToString()!="")
233
 				{
236
 				{
234
-					model.F_Attitude=int.Parse(row["F_Attitude"].ToString());
235
-				}
236
-				if(row["F_Quality"]!=null && row["F_Quality"].ToString()!="")
237
-				{
238
-					model.F_Quality=int.Parse(row["F_Quality"].ToString());
239
-				}
240
-				if(row["F_EvaluateContent"]!=null)
241
-				{
242
-					model.F_EvaluateContent=row["F_EvaluateContent"].ToString();
243
-				}
244
-				if(row["F_EvaluationTime"]!=null && row["F_EvaluationTime"].ToString()!="")
237
+                    model.F_Attitude = int.Parse(row["F_Attitude"].ToString());
238
+                }
239
+                if (row["F_Quality"] != null && row["F_Quality"].ToString() != "")
240
+                {
241
+                    model.F_Quality = int.Parse(row["F_Quality"].ToString());
242
+                }
243
+
244
+                if (row["F_Efficiency"] != null && row["F_Efficiency"].ToString() != "")
245
+                {
246
+                    model.F_Efficiency = int.Parse(row["F_Efficiency"].ToString());
247
+                }
248
+
249
+
250
+                if (row["F_EvaluateContent"] != null)
251
+                {
252
+                    model.F_EvaluateContent = row["F_EvaluateContent"].ToString();
253
+                }
254
+                if (row["F_EvaluationTime"]!=null && row["F_EvaluationTime"].ToString()!="")
245
 				{
255
 				{
246
 					model.F_EvaluationTime=DateTime.Parse(row["F_EvaluationTime"].ToString());
256
 					model.F_EvaluationTime=DateTime.Parse(row["F_EvaluationTime"].ToString());
247
 				}
257
 				}
267
 		public DataSet GetList(string strWhere)
277
 		public DataSet GetList(string strWhere)
268
 		{
278
 		{
269
 			StringBuilder strSql=new StringBuilder();
279
 			StringBuilder strSql=new StringBuilder();
270
-			strSql.Append("select F_EvaluateId,F_WorkOrderCode,F_Attitude,F_Quality,F_EvaluateContent,F_EvaluationTime,F_Evaluator,F_Isdelete,F_UpdateTime ");
280
+			strSql.Append("select F_EvaluateId,F_WorkOrderCode,F_Attitude,F_Quality,F_EvaluateContent,F_EvaluationTime,F_Evaluator,F_Isdelete,F_UpdateTime ,F_Efficiency");
271
 			strSql.Append(" FROM T_FaultRepair_Evaluate ");
281
 			strSql.Append(" FROM T_FaultRepair_Evaluate ");
272
 			if(strWhere.Trim()!="")
282
 			if(strWhere.Trim()!="")
273
 			{
283
 			{
287
 			{
297
 			{
288
 				strSql.Append(" top "+Top.ToString());
298
 				strSql.Append(" top "+Top.ToString());
289
 			}
299
 			}
290
-			strSql.Append(" F_EvaluateId,F_WorkOrderCode,F_Attitude,F_Quality,F_EvaluateContent,F_EvaluationTime,F_Evaluator,F_Isdelete,F_UpdateTime ");
300
+			strSql.Append(" F_EvaluateId,F_WorkOrderCode,F_Attitude,F_Quality,F_EvaluateContent,F_EvaluationTime,F_Evaluator,F_Isdelete,F_UpdateTime,F_Efficiency ");
291
 			strSql.Append(" FROM T_FaultRepair_Evaluate ");
301
 			strSql.Append(" FROM T_FaultRepair_Evaluate ");
292
 			if(strWhere.Trim()!="")
302
 			if(strWhere.Trim()!="")
293
 			{
303
 			{

+ 24 - 9
RMYY_CallCenter_Api.Dal/T_FaultRepair_Process.cs

63
 		{
63
 		{
64
 			StringBuilder strSql=new StringBuilder();
64
 			StringBuilder strSql=new StringBuilder();
65
 			strSql.Append("insert into T_FaultRepair_Process(");
65
 			strSql.Append("insert into T_FaultRepair_Process(");
66
-			strSql.Append("F_WorkOrderCode,F_Maintenancer,F_MaintenanceDept,F_ProcessingTime,F_Result,F_File,F_ReturnReason,F_Isdelete,F_UpdateTime,F_DealType)");
66
+			strSql.Append("F_WorkOrderCode,F_Maintenancer,F_MaintenanceDept,F_ProcessingTime,F_Result,F_File,F_ReturnReason,F_Isdelete,F_UpdateTime,F_DealType,F_IsInvolvedEquip,F_ExceptionType)");
67
 			strSql.Append(" values (");
67
 			strSql.Append(" values (");
68
-			strSql.Append("@F_WorkOrderCode,@F_Maintenancer,@F_MaintenanceDept,@F_ProcessingTime,@F_Result,@F_File,@F_ReturnReason,@F_Isdelete,@F_UpdateTime,@F_DealType)");
68
+			strSql.Append("@F_WorkOrderCode,@F_Maintenancer,@F_MaintenanceDept,@F_ProcessingTime,@F_Result,@F_File,@F_ReturnReason,@F_Isdelete,@F_UpdateTime,@F_DealType,@F_IsInvolvedEquip,@F_ExceptionType)");
69
 			strSql.Append(";select @@IDENTITY");
69
 			strSql.Append(";select @@IDENTITY");
70
 			SqlParameter[] parameters = {
70
 			SqlParameter[] parameters = {
71
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,100),
71
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,100),
77
 					new SqlParameter("@F_ReturnReason", SqlDbType.NVarChar,500),
77
 					new SqlParameter("@F_ReturnReason", SqlDbType.NVarChar,500),
78
 					new SqlParameter("@F_Isdelete", SqlDbType.Int,4),
78
 					new SqlParameter("@F_Isdelete", SqlDbType.Int,4),
79
 					new SqlParameter("@F_UpdateTime", SqlDbType.DateTime),
79
 					new SqlParameter("@F_UpdateTime", SqlDbType.DateTime),
80
-new SqlParameter("@F_DealType", SqlDbType.Int,4)
81
-                    
80
+new SqlParameter("@F_DealType", SqlDbType.Int,4),
81
+new SqlParameter("@F_IsInvolvedEquip", SqlDbType.NVarChar,500),
82
+new SqlParameter("@F_ExceptionType", SqlDbType.Int,4)
83
+
84
+
85
+
82
             };
86
             };
83
 			parameters[0].Value = model.F_WorkOrderCode;
87
 			parameters[0].Value = model.F_WorkOrderCode;
84
 			parameters[1].Value = model.F_Maintenancer;
88
 			parameters[1].Value = model.F_Maintenancer;
90
 			parameters[7].Value = model.F_Isdelete;
94
 			parameters[7].Value = model.F_Isdelete;
91
 			parameters[8].Value = model.F_UpdateTime;
95
 			parameters[8].Value = model.F_UpdateTime;
92
             parameters[9].Value = model.F_DealType;
96
             parameters[9].Value = model.F_DealType;
93
-
97
+            parameters[10].Value = model.F_IsInvolvedEquip;
98
+            parameters[11].Value = model.F_ExceptionType;
99
+            
94
 
100
 
95
             object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
101
             object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
96
 			if (obj == null)
102
 			if (obj == null)
117
 			strSql.Append("F_File=@F_File,");
123
 			strSql.Append("F_File=@F_File,");
118
 			strSql.Append("F_ReturnReason=@F_ReturnReason,");
124
 			strSql.Append("F_ReturnReason=@F_ReturnReason,");
119
 			strSql.Append("F_Isdelete=@F_Isdelete,");
125
 			strSql.Append("F_Isdelete=@F_Isdelete,");
120
-			strSql.Append("F_UpdateTime=@F_UpdateTime");
121
-			strSql.Append(" where F_ProcessId=@F_ProcessId");
126
+			strSql.Append("F_UpdateTime=@F_UpdateTime,");
127
+            strSql.Append("F_EquipDetail=@F_EquipDetail");
128
+
129
+
130
+
131
+            strSql.Append(" where F_ProcessId=@F_ProcessId");
122
 			SqlParameter[] parameters = {
132
 			SqlParameter[] parameters = {
123
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,100),
133
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,100),
124
 					new SqlParameter("@F_Maintenancer", SqlDbType.NVarChar,100),
134
 					new SqlParameter("@F_Maintenancer", SqlDbType.NVarChar,100),
129
 					new SqlParameter("@F_ReturnReason", SqlDbType.NVarChar,500),
139
 					new SqlParameter("@F_ReturnReason", SqlDbType.NVarChar,500),
130
 					new SqlParameter("@F_Isdelete", SqlDbType.Int,4),
140
 					new SqlParameter("@F_Isdelete", SqlDbType.Int,4),
131
 					new SqlParameter("@F_UpdateTime", SqlDbType.DateTime),
141
 					new SqlParameter("@F_UpdateTime", SqlDbType.DateTime),
132
-					new SqlParameter("@F_ProcessId", SqlDbType.Int,4)};
142
+                            new SqlParameter("@F_EquipDetail", SqlDbType.NVarChar,500),
143
+
144
+
145
+
146
+                    new SqlParameter("@F_ProcessId", SqlDbType.Int,4)};
133
 			parameters[0].Value = model.F_WorkOrderCode;
147
 			parameters[0].Value = model.F_WorkOrderCode;
134
 			parameters[1].Value = model.F_Maintenancer;
148
 			parameters[1].Value = model.F_Maintenancer;
135
 			parameters[2].Value = model.F_MaintenanceDept;
149
 			parameters[2].Value = model.F_MaintenanceDept;
139
 			parameters[6].Value = model.F_ReturnReason;
153
 			parameters[6].Value = model.F_ReturnReason;
140
 			parameters[7].Value = model.F_Isdelete;
154
 			parameters[7].Value = model.F_Isdelete;
141
 			parameters[8].Value = model.F_UpdateTime;
155
 			parameters[8].Value = model.F_UpdateTime;
142
-			parameters[9].Value = model.F_ProcessId;
143
 
156
 
157
+            parameters[9].Value = model.F_EquipDetail;
158
+            parameters[10].Value = model.F_ProcessId;
144
 			int rows=DbHelperSQL.ExecuteSql(strSql.ToString(),parameters);
159
 			int rows=DbHelperSQL.ExecuteSql(strSql.ToString(),parameters);
145
 			if (rows > 0)
160
 			if (rows > 0)
146
 			{
161
 			{

+ 379 - 0
RMYY_CallCenter_Api.Dal/T_InvolvedEquip_RepairProcess.cs

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

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

64
     <Compile Include="T_FaultRepair_Process.cs" />
64
     <Compile Include="T_FaultRepair_Process.cs" />
65
     <Compile Include="T_Hos_WorkOrder.cs" />
65
     <Compile Include="T_Hos_WorkOrder.cs" />
66
     <Compile Include="T_Hos_WorkOrderItem.cs" />
66
     <Compile Include="T_Hos_WorkOrderItem.cs" />
67
+    <Compile Include="T_InvolvedEquip_RepairProcess.cs" />
67
     <Compile Include="T_Mat_WorkOrder.cs" />
68
     <Compile Include="T_Mat_WorkOrder.cs" />
68
     <Compile Include="T_Mat_WorkOrderItem.cs" />
69
     <Compile Include="T_Mat_WorkOrderItem.cs" />
69
     <Compile Include="T_Msg_Chat.cs" />
70
     <Compile Include="T_Msg_Chat.cs" />

+ 24 - 0
RMYY_CallCenter_Api.Model/T_FaultRepair_Base.cs

55
         private int? _f_leaverecordid;
55
         private int? _f_leaverecordid;
56
         private string _f_callid;
56
         private string _f_callid;
57
         private int? _f_score;
57
         private int? _f_score;
58
+        private DateTime? _f_stoptime;
59
+        private DateTime? _f_arrivetime;
60
+
61
+        //到达时间
62
+        public DateTime? F_ArriveTime
63
+        {
64
+            set { _f_arrivetime = value; }
65
+            get { return _f_arrivetime; }
66
+        }
67
+
68
+        //挂起时间
69
+        public DateTime?  F_StopTime
70
+        {
71
+            set { _f_stoptime = value; }
72
+            get { return _f_stoptime; }
73
+        }
74
+
75
+
76
+        private int? _f_isstop = 0;
77
+        public int?  F_IsStop
78
+        {
79
+            set { _f_isstop = value; }
80
+            get { return _f_isstop; }
81
+        }
58
 
82
 
59
         public int? F_Score
83
         public int? F_Score
60
         {
84
         {

+ 12 - 4
RMYY_CallCenter_Api.Model/T_FaultRepair_Evaluate.cs

59
 			set{ _f_attitude=value;}
59
 			set{ _f_attitude=value;}
60
 			get{return _f_attitude;}
60
 			get{return _f_attitude;}
61
 		}
61
 		}
62
-		/// <summary>
63
-		/// 
64
-		/// </summary>
65
-		public int? F_Quality
62
+        //完工时效
63
+        public int? F_Efficiency
64
+        {
65
+            set { _f_attitude = value; }
66
+            get { return _f_attitude; }
67
+        }
68
+        
69
+
70
+        /// <summary>
71
+        /// 
72
+        /// </summary>
73
+        public int? F_Quality
66
 		{
74
 		{
67
 			set{ _f_quality=value;}
75
 			set{ _f_quality=value;}
68
 			get{return _f_quality;}
76
 			get{return _f_quality;}

+ 43 - 1
RMYY_CallCenter_Api.Model/T_FaultRepair_Process.cs

34
 		private string _f_result;
34
 		private string _f_result;
35
 		private string _f_file;
35
 		private string _f_file;
36
 		private string _f_returnreason;
36
 		private string _f_returnreason;
37
-
37
+      
38
         private int  _f_dealtype;
38
         private int  _f_dealtype;
39
         private int? _f_isdelete=0;
39
         private int? _f_isdelete=0;
40
 		private DateTime? _f_updatetime;
40
 		private DateTime? _f_updatetime;
41
 
41
 
42
+        private string f_equipdetail;
43
+
44
+        private int? f_exceptiontype;//异常类型
45
+
46
+        private int? _f_isinvolvedequip; // 是否 涉及设备
47
+
48
+        public string F_EquipDetail
49
+        {
50
+            set { f_equipdetail = value; }
51
+            get { return f_equipdetail; }
52
+        }
53
+
54
+        //private int? _f_equipamount; // 设备数量
55
+        //private double? _f_equipprice;// 设备价格
56
+
57
+        //public double?  F_EquipPrice
58
+        //{
59
+        //    set { _f_equipprice = value; }
60
+        //    get { return _f_equipprice; }
61
+        //}
62
+
63
+
64
+        //public int? F_EquipAmount
65
+        //{
66
+        //    set { _f_equipamount = value; }
67
+        //    get { return _f_equipamount; }
68
+        //}
69
+
70
+
71
+        public int? F_IsInvolvedEquip
72
+        {
73
+            set { _f_isinvolvedequip = value; }
74
+            get { return _f_isinvolvedequip; }
75
+        }
76
+        public int? F_ExceptionType
77
+        {
78
+            set { f_exceptiontype = value; }
79
+            get { return f_exceptiontype; }
80
+        }
81
+
82
+        
83
+
42
         public int  F_DealType
84
         public int  F_DealType
43
         {
85
         {
44
             set { _f_dealtype = value; }
86
             set { _f_dealtype = value; }

+ 114 - 0
RMYY_CallCenter_Api.Model/T_InvolvedEquip_RepairProcess.cs

1
+/**  版本信息模板在安装目录下,可自行修改。
2
+* T_InvolvedEquip_RepairProcess.cs
3
+*
4
+* 功 能: N/A
5
+* 类 名: T_InvolvedEquip_RepairProcess
6
+*
7
+* Ver    变更日期             负责人  变更内容
8
+* ───────────────────────────────────
9
+* V0.01  2022/9/19 10:28:50   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_InvolvedEquip_RepairProcess:实体类(属性说明自动提取数据库字段的描述信息)
22
+	/// </summary>
23
+	[Serializable]
24
+	public partial class T_InvolvedEquip_RepairProcess
25
+	{
26
+		public T_InvolvedEquip_RepairProcess()
27
+		{}
28
+		#region Model
29
+		private int _f_id;
30
+		private int? _f_repairprocessid;
31
+		private string _f_workordercode;
32
+		private string _f_equipname;
33
+		private int? _f_dicid;
34
+		private decimal? _f_equipprice;
35
+		private int? _f_equipamount;
36
+		private DateTime? _f_createtime;
37
+		private int? _f_isdelete;
38
+		/// <summary>
39
+		/// 
40
+		/// </summary>
41
+		public int F_ID
42
+		{
43
+			set{ _f_id=value;}
44
+			get{return _f_id;}
45
+		}
46
+		/// <summary>
47
+		/// 
48
+		/// </summary>
49
+		public int? F_RepairProcessId
50
+		{
51
+			set{ _f_repairprocessid=value;}
52
+			get{return _f_repairprocessid;}
53
+		}
54
+		/// <summary>
55
+		/// 
56
+		/// </summary>
57
+		public string F_WorkOrderCode
58
+		{
59
+			set{ _f_workordercode=value;}
60
+			get{return _f_workordercode;}
61
+		}
62
+		/// <summary>
63
+		/// 
64
+		/// </summary>
65
+		public string F_EquipName
66
+		{
67
+			set{ _f_equipname=value;}
68
+			get{return _f_equipname;}
69
+		}
70
+		/// <summary>
71
+		/// 
72
+		/// </summary>
73
+		public int? F_DicId
74
+		{
75
+			set{ _f_dicid=value;}
76
+			get{return _f_dicid;}
77
+		}
78
+		/// <summary>
79
+		/// 
80
+		/// </summary>
81
+		public decimal? F_EquipPrice
82
+		{
83
+			set{ _f_equipprice=value;}
84
+			get{return _f_equipprice;}
85
+		}
86
+		/// <summary>
87
+		/// 
88
+		/// </summary>
89
+		public int? F_EquipAmount
90
+		{
91
+			set{ _f_equipamount=value;}
92
+			get{return _f_equipamount;}
93
+		}
94
+		/// <summary>
95
+		/// 
96
+		/// </summary>
97
+		public DateTime? F_CreateTime
98
+		{
99
+			set{ _f_createtime=value;}
100
+			get{return _f_createtime;}
101
+		}
102
+		/// <summary>
103
+		/// 
104
+		/// </summary>
105
+		public int? F_IsDelete
106
+		{
107
+			set{ _f_isdelete=value;}
108
+			get{return _f_isdelete;}
109
+		}
110
+		#endregion Model
111
+
112
+	}
113
+}
114
+

+ 1 - 1
RMYY_CallCenter_Api/Common/Common.cs

58
         /// <returns></returns>
58
         /// <returns></returns>
59
         public static List<string> GetRoleButtons(int roleId)
59
         public static List<string> GetRoleButtons(int roleId)
60
         {
60
         {
61
-            var actions = CacheHelper.Get<List<string>>("RoleButtons_" + roleId);
61
+            var actions = CacheHelper.Get<List<string>>("RoleButtons1_" + roleId);
62
             if (actions != null && actions.Count > 0)
62
             if (actions != null && actions.Count > 0)
63
             {
63
             {
64
                 return actions;
64
                 return actions;

+ 4 - 4
RMYY_CallCenter_Api/Common/WorkOrderBase.cs

412
 
412
 
413
             if (type == 3000)
413
             if (type == 3000)
414
             {
414
             {
415
-                typeIdArray = new List<int> { 0, 1, 2, 3, 4, 5, 6 };
415
+                typeIdArray = new List<int> { -1,0, 1, 2, 3, 4, 5, 6 };
416
             }
416
             }
417
             else if (type == 1000)
417
             else if (type == 1000)
418
             {
418
             {
434
             switch (menuName)
434
             switch (menuName)
435
             {
435
             {
436
                 case MENUENUM.我的提交:
436
                 case MENUENUM.我的提交:
437
-                    strArr = new List<string> { "待接单", "待接单", "已接单", "待评价", "已完成", "已完成" }; break;
437
+                    strArr = new List<string> { "待提交", "待接单", "待接单", "已接单", "待评价", "已完成", "已完成","已接单" }; break;
438
                 case MENUENUM.工单列表:
438
                 case MENUENUM.工单列表:
439
-                    strArr = new List<string> { "待派工", "待接单", "已到达", "已处理", "异常完成", "已完成" }; break;
439
+                    strArr = new List<string> { "待提交", "待派工", "待接单", "待完成", "已处理", "异常完成", "已完成", "已接单" }; break;
440
                 case MENUENUM.报修列表:
440
                 case MENUENUM.报修列表:
441
-                    strArr = new List<string> { "-", "待接单", "已到达", "已完成", "已完成", "已完成" }; break;
441
+                    strArr = new List<string> { "待提交", "-", "待接单", "待完成", "已完成", "已完成", "已完成", "已接单" }; break;
442
                 default: break;
442
                 default: break;
443
             }
443
             }
444
             int index = typeIdArray.IndexOf(state);
444
             int index = typeIdArray.IndexOf(state);

文件差异内容过多而无法显示
+ 456 - 198
RMYY_CallCenter_Api/Controllers/FaultRepairController.cs


+ 6 - 1
RMYY_CallCenter_Api/Controllers/WorkOrder/WorkCommonController.cs

12
 {
12
 {
13
     public class WorkCommonController : BaseController
13
     public class WorkCommonController : BaseController
14
     {
14
     {
15
+ 
16
+
15
         /// <summary>
17
         /// <summary>
16
         /// 我的提交
18
         /// 我的提交
17
         /// </summary>
19
         /// </summary>
27
             if (User != null)
29
             if (User != null)
28
             {
30
             {
29
                 int recordCount = 0;
31
                 int recordCount = 0;
30
-                string sql = $" and F_Proposer='{User.F_UserCode}' and F_IsDelete = 0";
32
+                string sql = $" and F_ProposerDept='{User.F_DeptId}' and F_IsDelete = 0";
31
                 if (!string.IsNullOrEmpty(wocode))
33
                 if (!string.IsNullOrEmpty(wocode))
32
                 {
34
                 {
33
                     sql += $" and  F_WoCode like'%{wocode}%'";
35
                     sql += $" and  F_WoCode like'%{wocode}%'";
156
             }
158
             }
157
             return Error("无操作权限!");
159
             return Error("无操作权限!");
158
         }
160
         }
161
+
162
+ 
163
+
159
     }
164
     }
160
 }
165
 }

+ 7 - 2
RMYY_CallCenter_Api/Models/Enum/EnumFaultRepairWorkOrderState.cs

8
 {
8
 {
9
     public enum  EnumFaultRepairWorkOrderState
9
     public enum  EnumFaultRepairWorkOrderState
10
     {
10
     {
11
+        
12
+        [Description("待提交")]
13
+          waitsubmit=-1,
11
         [Description("待派单")]
14
         [Description("待派单")]
12
         neworder,
15
         neworder,
13
 
16
 
25
         exceptionended,
28
         exceptionended,
26
 
29
 
27
         [Description("已完结")]
30
         [Description("已完结")]
28
-        finish
29
-       
31
+        finish,
32
+             [Description("已到达")]
33
+         arrive
34
+
30
 
35
 
31
     }
36
     }
32
 }
37
 }

+ 13 - 1
RMYY_CallCenter_Api/Models/Enum/EnumOperatorType.cs

35
         [Description("异常完结")]
35
         [Description("异常完结")]
36
         submitreturn,
36
         submitreturn,
37
             [Description("转派")]
37
             [Description("转派")]
38
-         transfer 
38
+         transfer ,
39
+
40
+        [Description("到达")]
41
+        arrive,
42
+        [Description("退回")]
43
+         reback,
44
+        [Description("撤回")]
45
+         retract,
46
+
47
+        [Description("撤回")]
48
+        myretract,
49
+        [Description("挂起")]
50
+        hangup
39
 
51
 
40
        
52
        
41
     }
53
     }