知识库等文档问题

RMYY_CallCenter_Api.Dal/T_Con_WorkOrder.cs

@@ -792,7 +792,11 @@ namespace RMYY_CallCenter_Api.Dal
                 {
                     model.F_AppointmentTime = DateTime.Parse(row["F_AppointmentTime"].ToString());
                 }
-                
+                if (row["F_ComplaintSource"] != null && row["F_ComplaintSource"].ToString() != "")
+                {
+                    model.F_ComplaintSource  = int.Parse(row["F_ComplaintSource"].ToString());
+                }
+
             }
             return model;
         }

RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

@@ -764,8 +764,17 @@ namespace RMYY_CallCenter_Api.Controllers
         public ActionResult DDZXTransfer(string WorkOrderCode, string ToUserCode, string ToDept)
         {
             Model.T_FaultRepair_Base model = baseBll.GetModel(WorkOrderCode);
+
+
+
             if (model != null)// && !string.IsNullOrEmpty(ToUserCode) && !string.IsNullOrEmpty(ToDept))
             {
+                if (model.F_WorkOrderState == (int)EnumFaultRepairWorkOrderState.receive )
+                {
+                    return Error("工单已经指派");
+                }
+
+
                 string mes = "";
                 var dicvalue = new Model.T_Sys_GongDan();
                 dicvalue = new Bll.T_Sys_GongDan().GetModel(Convert.ToInt32(model.F_WorkOrderCategory));
@@ -908,6 +917,12 @@ namespace RMYY_CallCenter_Api.Controllers
                 return Error("没有获取到工单号");
             }
 
+            if (model.F_WorkOrderState == (int)EnumFaultRepairWorkOrderState.receive)
+            {
+                return Error("工单已经指派");
+            }
+
+
             if (!string.IsNullOrEmpty(maintenanceDept))
             {
                 model.F_AssignTime = DateTime.Now;

RMYY_CallCenter_Api/Controllers/SchedulingController.cs

@@ -608,12 +608,19 @@ namespace RMYY_CallCenter_Api.Controllers
         //调度中心指派
         public ActionResult DDZXTransfer(string WorkOrderCode, string DealMan, string DealDept)
         {
+            Model.T_IntegratedScheduling_Base model = baseBll.GetModel(WorkOrderCode);
+
+            if (model!=null && model.F_WorkOrderState == (int)EnumSchedullingWorkOrderState.receive)
+            {
+                return Error("工单已经指派");
+            }
+
             if (string.IsNullOrEmpty(DealMan))
             {
                 return Error("请选择处理人");
             }
 
-            Model.T_IntegratedScheduling_Base model = baseBll.GetModel(WorkOrderCode);
+           
             if (model != null)
             {
                 string message = "";

RMYY_CallCenter_Api/Controllers/System/KnowledgeController.cs

@@ -32,8 +32,9 @@ namespace RMYY_CallCenter_Api.Controllers.System
                 sql += $" and (F_KeyWords like'%" + keywords.Trim() + "%' or F_Title like '%" + keywords.Trim() + "%' or F_Content like '%" + keywords.Trim() + "%')";
             if (typeid != 0)
             {
-                if(GetKnType(typeid)!="")
-                sql += $" and F_TypeId in (" + GetKnType(typeid) + ")";
+                //if(GetKnType(typeid)!="")
+                //sql += $" and F_TypeId in (" + GetKnType(typeid) + ")";
+                sql += $" and F_TypeId  ='"+typeid+"'";
             }
             int recordCount = 0;
             dt = Bll.PagerBll.GetListPager

RMYY_CallCenter_Api/Controllers/WorkOrder/Con_WorkOrderController.cs

@@ -613,6 +613,10 @@ namespace RMYY_CallCenter_Api.Controllers
                         }
                         else if (opt == 3)//转派
                         {
+                            if (work.F_State == (int)EnumWorkOrderState.assign)
+                            {
+                                return Error("工单已经指派");
+                            }
                             bool tt = AssignWO(User, work, cont, clid, clbm);
                             if (tt)
                             {
@@ -727,6 +731,11 @@ namespace RMYY_CallCenter_Api.Controllers
                         }
                         else if (opt == 3)//转派
                         {
+                            if (model.F_State == (int)EnumWorkOrderState.assign)
+                            {
+                                return Error("工单已经指派");
+                            }
+
                             bool tt = AssignWO(User, model, cont, clid , clbm );
                             if (tt)
                             {
@@ -1275,6 +1284,12 @@ namespace RMYY_CallCenter_Api.Controllers
                         if (AuditState == 1)
                         {
                             res =logbll.AddLog(wmodel.F_ID, wmodel.F_State.Value,(int)wmodel.F_type1, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "工单审批：已同意审批" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, ua.F_UserCode, ua.F_DeptId, ua.F_UserCode);
+                            if (wmodel.F_State == (int)EnumWorkOrderState.assign)
+                            {
+                                return Error("工单已经指派");
+                            }
+
+
                             AssignWO(User, wmodel, "", "", (int)clbm);
                             wmodel.F_State = (int)EnumWorkOrderState.assign;//待处理
                             wmodel.F_AuditState = 1;