更新

RMYY_CallCenter_Api.Dal/T_Dis_WorkOrder.cs

@@ -626,6 +626,7 @@ namespace RMYY_CallCenter_Api.Dal
             {
                 strSql.Append(" where 1=1" + strWhere);
             }
+            strSql.Append($" ORDER BY F_Id desc");
             return DbHelperSQL.Query(strSql.ToString());
         }
         public DataSet GetListBloodExpt(string strWhere)
@@ -639,6 +640,7 @@ namespace RMYY_CallCenter_Api.Dal
             {
                 strSql.Append(" where 1=1" + strWhere);
             }
+            strSql.Append($" ORDER BY F_Id desc");
             return DbHelperSQL.Query(strSql.ToString());
         }
 
@@ -653,6 +655,7 @@ namespace RMYY_CallCenter_Api.Dal
             {
                 strSql.Append(" where 1=1" + strWhere);
             }
+            strSql.Append($" ORDER BY F_Id desc");
             return DbHelperSQL.Query(strSql.ToString());
         }
         public DataSet GetListOrtherExpt(string strWhere)
@@ -666,6 +669,7 @@ namespace RMYY_CallCenter_Api.Dal
             {
                 strSql.Append(" where 1=1" + strWhere);
             }
+            strSql.Append($" ORDER BY F_Id desc");
             return DbHelperSQL.Query(strSql.ToString());
         }
 

RMYY_CallCenter_Api/Controllers/IndexController.cs

@@ -57,7 +57,14 @@ namespace RMYY_CallCenter_Api.Controllers
             List<Model.T_Sys_Menu> newmodelList = moduleInfoList.Where(p => p.F_ParentId == 0).OrderBy(p => p.F_Sort).ToList();
             foreach (var item in newmodelList)
             {
-                item.children = TreeRecursion(moduleInfoList, item.F_MenuId.ToString());
+                if (item.F_Type == 2)
+                {
+                    item.button = TreeRecursion(moduleInfoList, item.F_MenuId.ToString());
+                }
+                else if (item.F_Type == 1)
+                {
+                    item.children = TreeRecursion(moduleInfoList, item.F_MenuId.ToString());
+                }
             }
             //moduleInfoList.Sort((x, y) => x.F_Sort ?? 0 - y.F_Sort ?? 0);
             return Success("获取符合权限的菜单", newmodelList);

RMYY_CallCenter_Api/Controllers/System/MenuController.cs

@@ -58,7 +58,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
                     "F_MenuId",
                     "*",
                     sql,
-                    "ORDER BY F_MenuId desc",
+                    "ORDER BY F_Sort asc",
                     pagesize,
                     pageindex,
                     true,
@@ -113,9 +113,13 @@ namespace RMYY_CallCenter_Api.Controllers.System
                     treeModel.IconCls = entity.F_Icon;
                     treeModel.text = entity.F_MenuName;
                     treeModel.parentid = entity.F_ParentId.ToString();
-                    if (entity.F_Type == 2 || entity.F_Type == 1)
+                    if (entity.F_Type == 1)
                     {
-                      treeModel.children = TreeRecursion(data, entity.F_MenuId.ToString());
+                        treeModel.children = TreeRecursion(data, entity.F_MenuId.ToString());
+                    }
+                    else if (entity.F_Type == 2)
+                    {
+                        treeModel.children = TreeRecursion(data, entity.F_MenuId.ToString());
                     }
                     newList.Add(treeModel);
                 }
@@ -158,7 +162,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
         /// <param name="sort"></param>
         /// <returns></returns>
         [HttpPost]
-        public ActionResult Insert(int pid, string code, string name, int sort, int type, string url, string function,string icon,string remark,int menutype, int state = 1)
+        public ActionResult Insert(int pid, string code, string name, int sort, int type, string url, string function,string icon,string remark,int menutype=0, int state = 1)
         {
             if (menuBLL.Exists(code))
             {
@@ -202,12 +206,12 @@ namespace RMYY_CallCenter_Api.Controllers.System
         /// <param name="sort"></param>
         /// <returns></returns>
         [HttpPost]
-        public ActionResult Update(int id, int pid, string code, string name, int sort, int type, string url, string function, string icon,string remark, int menutype, int state=1)
+        public ActionResult Update(int id, int pid, string code, string name, int sort, int type, string url, string function, string icon,string remark, int menutype=0, int state=1)
         {
             Model.T_Sys_Menu dModel = menuBLL.GetModel(id);
             if (dModel != null)
             {
-                var list = menuBLL.GetModelList(" F_MenuCode='" + code + "' and F_MenuId!='" + id + "' ");
+                var list = menuBLL.GetModelList(" F_MenuCode='" + code + "' and F_MenuId!='" + id + "' and F_Type!=3");
                 if (list.Count > 0)
                 {
                     return Error("已经存在此编码");

RMYY_CallCenter_Api/Controllers/System/RoleController.cs

@@ -196,7 +196,8 @@ namespace RMYY_CallCenter_Api.Controllers.System
         /// <returns></returns>
         public ActionResult GetRoleFunction(int roleid=0)
         {
-            var moduleFList = new Bll.T_Sys_Menu().GetModelList(" F_State=1 and (F_Type=1 or F_Type=2) ");
+            //var moduleFList = new Bll.T_Sys_Menu().GetModelList(" F_State=1 and (F_Type=1 or F_Type=2) ");
+            var moduleFList = new Bll.T_Sys_Menu().GetModelList(" F_State=1 ");
             var list=new DataTable();
             if (roleid > 0)
             {

RMYY_CallCenter_Api/Controllers/WorkOrder/T_Dis_WorkOrderController.cs

@@ -87,14 +87,12 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                         sql += $" and F_Id in (0)";
                     }
                 }
-                if (isdc > 0)
-                {
-                    if (GetListExpt(sql, type))
-                        return Success("导出成功！");
-                    else return Error("导出失败！");
-                }
-                else
-                {
+                //if (isdc > 0)
+                //{
+                //    if (GetListExpt(sql, type))
+                //        return Success("导出成功！");
+                //    else return Error("导出失败！");
+                //}
                     #endregion
                     int recordCount = 0;
                     if (!string.IsNullOrEmpty(sql))
@@ -153,7 +151,6 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                         total = recordCount
                     };
                     return Content(obj.ToJson());
-                }
             }
            return Error("无操作权限！");
         }
@@ -237,7 +234,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                     name= "其他配送";
                     break;
                 case (int)EnumWorkOrder.UrgDis:
-                    name= "急标本配送";
+                    name= "急查标本配送";
                     break;
                 case (int)EnumWorkOrder.BloodDis:
                     name= "血液制品配送";
@@ -314,21 +311,82 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
         /// <param name="starttime"></param>
         /// <param name="endtime"></param>
         /// <returns></returns>
-        public bool GetListExpt(string sql,int  type)
+        public ActionResult GetListExpt(string keyword, int type = 0, string starttime = "", string endtime = "", int pageindex = 1, int pagesize = 10, int isdc = 0)
         {
-                #region 查询条件
-                if (type != (int)EnumWorkOrder.OrtherDis && type != (int)EnumWorkOrder.UrgDis && type != (int)EnumWorkOrder.RedDis && type != (int)EnumWorkOrder.BloodDis)
-                    return false;            
-                DataTable data = new DataTable();             
-                #endregion
+            string sql = $" and F_IsDel=0 and F_Type=" + type;
+            #region 查询条件
+            if (type != (int)EnumWorkOrder.OrtherDis && type != (int)EnumWorkOrder.UrgDis && type != (int)EnumWorkOrder.RedDis && type != (int)EnumWorkOrder.BloodDis)
+                return Error("工单类型错误！");
+            if (starttime.Trim() != "" && starttime != "undefined")
+                sql += $"and datediff(day,F_CreateTime,'" + starttime + "')<=0";
+            if (endtime.Trim() != "" && endtime != "undefined")
+                sql += $"and datediff(day,F_CreateTime,'" + endtime + "')>=0";
+            if (!string.IsNullOrEmpty(keyword))
+            {
+                sql += $"and (F_WorkOrderCode like '%" + keyword.Trim() + "%' or F_ProposerCode like '%" + keyword.Trim() + "%' or F_ProposerPhon like '%" + keyword.Trim() + "%')";
+            }
+            DataTable data = new DataTable();
+            #endregion
 
-                NPOIHelper nopi = new NPOIHelper();
-                data = GetData(type,sql);
+            NPOIHelper nopi = new NPOIHelper();
+            data = GetData(type, sql);
+            if (isdc > 0)
+            {
                 if (nopi.ExportToExcel(GetExportTitle(type), data, col(type)) == "")
                 {
-                    return true;
+                    return Success("导出成功！");
+                }
+                else return Error("导出失败！");
+            }
+            else
+            {
+                int recordCount = 0;
+                if (!string.IsNullOrEmpty(sql))
+                {
+                    data = Bll.PagerBll.GetListPager
+                        (
+                        "T_Dis_WorkOrder aa",
+                        "F_Id",
+                        "*",
+                        sql,
+                        "ORDER BY F_Id desc",
+                        pagesize,
+                        pageindex,
+                        true,
+                        out recordCount
+                        );
                 }
-                else return false;
+                var modellist = orderbll.DataTableToList(data);
+                if (modellist.Count > 0)
+                {
+                    //if (wokerlist.Count > 0 || User.F_UserCode== "ZYY")
+                    //{
+                    foreach (var item in modellist)
+                    {
+                        item.F_Wostate = EnumHelper.GetDescription((EnumDisWorkOrderState)item.F_State);
+
+                        item.F_SitMan = item.F_ControlManName + '(' + item.F_ControlManCode + ')';                     
+                        if (type == (int)EnumWorkOrder.RedDis)
+                        {
+
+                          item.RedPic = GetRedPics(item.F_ItemMessages);
+
+                        }
+                        item.rolecode = User.F_RoleCode;
+                        item.F_TypeName = GetTypeName(type);
+                        //var buttons = ButtonGroup.GetButtons(item.F_State, User.F_RoleCode, item.F_Type);
+
+                    }
+                }
+                var obj = new
+                {
+                    state = "success",
+                    message = "成功",
+                    rows = modellist,
+                    total = recordCount
+                };
+                return Content(obj.ToJson());
+            }
         }
 
 
@@ -365,7 +423,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             };
             string[] cel3 =
             {
-                "工单编号","工单类型","工单内容","调度员","上报渠道","上报部门","上报人","地点","时间","处理部门","转运人","备注"
+                "工单编号","类型","内容","调度人","上报渠道","上报部门","上报人","地点","时间","处理部门","处理人","备注"
             };
             string[] cel4 =
             {