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

RMYY_CallCenter_Api.Dal/T_Equipment.cs

@@ -249,7 +249,7 @@ namespace RMYY_CallCenter_Api.DAL
 		public DataSet GetList(string strWhere)
 		{
 			StringBuilder strSql=new StringBuilder();
-			strSql.Append("select F_EquipID,F_EquipName,F_EquipNumber,F_EquipPrice,F_State,F_CreateUser,F_CreateTime ");
+			strSql.Append("select F_EquipID,F_EquipName,F_EquipNumber, convert(varchar(50),F_EquipPrice) as F_EquipPrice,F_State,F_CreateUser,F_CreateTime ");
 			strSql.Append(" FROM T_Equipment ");
 			if(strWhere.Trim()!="")
 			{

RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

@@ -1063,7 +1063,7 @@ namespace RMYY_CallCenter_Api.Controllers
                                 {
                                     dr["StateName"] = "待接单";
                                 }
-                                else if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.dealing)
+                                else if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.dealing || Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.arrive)
                                 {
                                     dr["StateName"] = "待完成";
                                 }

RMYY_CallCenter_Api/Controllers/WorkOrder/Con_WorkOrderController.cs

@@ -49,11 +49,23 @@ namespace RMYY_CallCenter_Api.Controllers
                         dtbase.Columns.Add("DealUser");
                         dtbase.Columns.Add("DealDeptName");
                         dtbase.Columns.Add("DealUserName");
+                        dtbase.Columns.Add("SourceName");
 
                         foreach (DataRow dr in dtbase.Rows)
                         {
                             dr["TypeName"] = "业务咨询";
 
+                            if (dr["F_ComplaintSource"] != null && dr["F_ComplaintSource"].ToString()!="")
+                            {
+                                Model.T_Sys_DictionaryValue dvmodel = dvBll.GetModel(Convert.ToInt32(dr ["F_ComplaintSource"].ToString()));
+
+                                dr["SourceName"] = dvmodel.F_Name;
+                            }
+                           
+                                
+                           
+
+
                             if (Convert.ToInt32(dr["F_State"]) == (int)EnumWorkOrderState.neworder)
                             {
                                 dr["StateName"] = "新工单";
@@ -74,7 +86,7 @@ namespace RMYY_CallCenter_Api.Controllers
                             {
                                 dr["StateName"] = "待审核";
                             }
-
+                            
                         }
                         string Wosql = "select *, dbo.GetDepName(F_DealDept) DealDept,[dbo].[GetUserNameByUserId](F_DealUser) UserName" +
                            "  from T_Wo_CommonBase where F_WoCode='" + strworkorderid + "'";
@@ -87,7 +99,10 @@ namespace RMYY_CallCenter_Api.Controllers
                             dtbase.Rows[0]["DealUserName"] = wodtbase.Rows[0]["UserName"].ToString();
                             
                         }
-                     
+
+                       
+
+
 
                         var CommonBase = new BLL.T_Wo_CommonBase().GetModelList($"F_WoCode='{dtbase.Rows[0]["F_WorkOrderCode"].ToString () }' and F_IsDelete=0");
                         return Success("获取成功", dtbase);

RMYY_CallCenter_Api/Controllers/WorkOrder/WorkOrderReportController.cs

@@ -211,7 +211,11 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                         break;
                     case (int)EnumFaultRepairWorkOrderState.dealing:
                         WstateName = "已接单";
-                        break;                   
+                        break;
+                      
+                   case (int)EnumFaultRepairWorkOrderState.arrive:
+                        WstateName = "已到达";
+                        break;
                     case (int)EnumFaultRepairWorkOrderState.dealed:
                         WstateName = "待评价";
                         break;