Przeglądaj źródła

业务咨询+来源,设备修改

liyuanyuan 3 lat temu
rodzic
commit
9f70d2fb3a

+ 1 - 1
RMYY_CallCenter_Api.Dal/T_Equipment.cs

249
 		public DataSet GetList(string strWhere)
249
 		public DataSet GetList(string strWhere)
250
 		{
250
 		{
251
 			StringBuilder strSql=new StringBuilder();
251
 			StringBuilder strSql=new StringBuilder();
252
-			strSql.Append("select F_EquipID,F_EquipName,F_EquipNumber,F_EquipPrice,F_State,F_CreateUser,F_CreateTime ");
252
+			strSql.Append("select F_EquipID,F_EquipName,F_EquipNumber, convert(varchar(50),F_EquipPrice) as F_EquipPrice,F_State,F_CreateUser,F_CreateTime ");
253
 			strSql.Append(" FROM T_Equipment ");
253
 			strSql.Append(" FROM T_Equipment ");
254
 			if(strWhere.Trim()!="")
254
 			if(strWhere.Trim()!="")
255
 			{
255
 			{

+ 1 - 1
RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

1063
                                 {
1063
                                 {
1064
                                     dr["StateName"] = "待接单";
1064
                                     dr["StateName"] = "待接单";
1065
                                 }
1065
                                 }
1066
-                                else if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.dealing)
1066
+                                else if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.dealing || Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.arrive)
1067
                                 {
1067
                                 {
1068
                                     dr["StateName"] = "待完成";
1068
                                     dr["StateName"] = "待完成";
1069
                                 }
1069
                                 }

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

49
                         dtbase.Columns.Add("DealUser");
49
                         dtbase.Columns.Add("DealUser");
50
                         dtbase.Columns.Add("DealDeptName");
50
                         dtbase.Columns.Add("DealDeptName");
51
                         dtbase.Columns.Add("DealUserName");
51
                         dtbase.Columns.Add("DealUserName");
52
+                        dtbase.Columns.Add("SourceName");
52
 
53
 
53
                         foreach (DataRow dr in dtbase.Rows)
54
                         foreach (DataRow dr in dtbase.Rows)
54
                         {
55
                         {
55
                             dr["TypeName"] = "业务咨询";
56
                             dr["TypeName"] = "业务咨询";
56
 
57
 
58
+                            if (dr["F_ComplaintSource"] != null && dr["F_ComplaintSource"].ToString()!="")
59
+                            {
60
+                                Model.T_Sys_DictionaryValue dvmodel = dvBll.GetModel(Convert.ToInt32(dr ["F_ComplaintSource"].ToString()));
61
+
62
+                                dr["SourceName"] = dvmodel.F_Name;
63
+                            }
64
+                           
65
+                                
66
+                           
67
+
68
+
57
                             if (Convert.ToInt32(dr["F_State"]) == (int)EnumWorkOrderState.neworder)
69
                             if (Convert.ToInt32(dr["F_State"]) == (int)EnumWorkOrderState.neworder)
58
                             {
70
                             {
59
                                 dr["StateName"] = "新工单";
71
                                 dr["StateName"] = "新工单";
87
                             dtbase.Rows[0]["DealUserName"] = wodtbase.Rows[0]["UserName"].ToString();
99
                             dtbase.Rows[0]["DealUserName"] = wodtbase.Rows[0]["UserName"].ToString();
88
                             
100
                             
89
                         }
101
                         }
90
-                     
102
+
103
+                       
104
+
105
+
91
 
106
 
92
                         var CommonBase = new BLL.T_Wo_CommonBase().GetModelList($"F_WoCode='{dtbase.Rows[0]["F_WorkOrderCode"].ToString () }' and F_IsDelete=0");
107
                         var CommonBase = new BLL.T_Wo_CommonBase().GetModelList($"F_WoCode='{dtbase.Rows[0]["F_WorkOrderCode"].ToString () }' and F_IsDelete=0");
93
                         return Success("获取成功", dtbase);
108
                         return Success("获取成功", dtbase);

+ 5 - 1
RMYY_CallCenter_Api/Controllers/WorkOrder/WorkOrderReportController.cs

211
                         break;
211
                         break;
212
                     case (int)EnumFaultRepairWorkOrderState.dealing:
212
                     case (int)EnumFaultRepairWorkOrderState.dealing:
213
                         WstateName = "已接单";
213
                         WstateName = "已接单";
214
-                        break;                   
214
+                        break;
215
+                      
216
+                   case (int)EnumFaultRepairWorkOrderState.arrive:
217
+                        WstateName = "已到达";
218
+                        break;
215
                     case (int)EnumFaultRepairWorkOrderState.dealed:
219
                     case (int)EnumFaultRepairWorkOrderState.dealed:
216
                         WstateName = "待评价";
220
                         WstateName = "待评价";
217
                         break;
221
                         break;