modi1

PMS.NetCore/PMS.NetCore.BusinessCore/BaseCore/settletypeManager.cs

@@ -2,9 +2,13 @@
 using SqlSugar;
 using System;
 using System.Collections.Generic;
+
+/// <summary>
+/// 结算方式
+/// </summary>
 public class settletypeManager : DbContext<settletype>
 {
- 
+
     //当前类已经继承了 DbContext增、删、查、改的方法
 
     //这里面写的代码不会给覆盖,如果要重新生成请删除 settletypeManager.cs
@@ -16,12 +20,12 @@ public class settletypeManager : DbContext<settletype>
     /// </summary>
     public void Study()
     {
-	     
-	   /*********查询*********/
+
+       /*********查询*********/
 
         var data1 = settletypeDb.GetById(1);//根据ID查询
         var data2 = settletypeDb.GetList();//查询所有
-        var data3 = settletypeDb.GetList(it => 1 == 1);  //根据条件查询  
+        var data3 = settletypeDb.GetList(it => 1 == 1);  //根据条件查询
         //var data4 = settletypeDb.GetSingle(it => 1 == 1);//根据条件查询一条,如果超过一条会报错
 
         var p = new PageModel() { PageIndex = 1, PageSize = 2 };// 分页查询
@@ -30,7 +34,7 @@ public class settletypeManager : DbContext<settletype>
 
         var data6 = settletypeDb.GetPageList(it => 1 == 1, p, it => SqlFunc.GetRandom(), OrderByType.Asc);// 分页查询加排序
         Console.Write(p.PageCount);//返回总数
-     
+
         List<IConditionalModel> conModels = new List<IConditionalModel>(); //组装条件查询作为条件实现 分页查询加排序
         conModels.Add(new ConditionalModel() { FieldName = typeof(settletype).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal, FieldValue = "1" });//id=1
         var data7 = settletypeDb.GetPageList(conModels, p, it => SqlFunc.GetRandom(), OrderByType.Asc);
@@ -61,8 +65,8 @@ public class settletypeManager : DbContext<settletype>
 
 
 
-		/*********更新*********/
-	    var updateData = new settletype() {  };//测试参数
+        /*********更新*********/
+        var updateData = new settletype() {  };//测试参数
         var updateArray = new settletype[] { updateData };//测试参数
         settletypeDb.Update(updateData);//根据实体更新
         settletypeDb.UpdateRange(updateArray);//批量更新
@@ -71,16 +75,16 @@ public class settletypeManager : DbContext<settletype>
 
 
 
-		/*********删除*********/
-	    var deldata = new settletype() {  };//测试参数
+        /*********删除*********/
+        var deldata = new settletype() {  };//测试参数
         settletypeDb.Delete(deldata);//根据实体删除
         settletypeDb.DeleteById(1);//根据主键删除
         settletypeDb.DeleteById(new int[] { 1,2});//根据主键数组删除
         settletypeDb.Delete(it=>1==2);//根据条件删除
         settletypeDb.AsDeleteable().Where(it=>1==2).ExecuteCommand();//转成Deleteable实现复杂的操作
-    } 
+    }
     #endregion
 
- 
- 
-}
+
+
+}

PMS.NetCore/PMS.NetCore.BusinessCore/BaseCore/usersManager.cs

@@ -2,85 +2,102 @@
 using SqlSugar;
 using System;
 using System.Collections.Generic;
+using Utils;
 public class usersManager : DbContext<users>
 {
- 
+
     //当前类已经继承了 DbContext增、删、查、改的方法
 
     //这里面写的代码不会给覆盖,如果要重新生成请删除 usersManager.cs
-
-
-    #region 教学方法
     /// <summary>
-    /// 如果DbContext中的增删查改方法满足不了你，你可以看下具体用法
+    /// 根据条件查询用户信息列表
     /// </summary>
-    public void Study()
+    /// <param name="DeptCode">部门代码</param>
+    /// <param name="staffcode">用户唯一标识码</param>
+    /// <param name="username">用户名</param>
+    /// <param name="station">岗位代码</param>
+    /// <param name="issystem">是否系统管理员</param>
+    /// <param name="islock">用户是否锁定</param>
+    /// <returns></returns>
+    public List<dynamic> GetUsersList(string DeptCode, string staffcode, string username, string station, string issystem, string islock)
     {
-	     
-	   /*********查询*********/
-
-        var data1 = usersDb.GetById(1);//根据ID查询
-        var data2 = usersDb.GetList();//查询所有
-        var data3 = usersDb.GetList(it => 1 == 1);  //根据条件查询  
-        //var data4 = usersDb.GetSingle(it => 1 == 1);//根据条件查询一条,如果超过一条会报错
-
-        var p = new PageModel() { PageIndex = 1, PageSize = 2 };// 分页查询
-        var data5 = usersDb.GetPageList(it => 1 == 1, p);
-        Console.Write(p.PageCount);//返回总数
-
-        var data6 = usersDb.GetPageList(it => 1 == 1, p, it => SqlFunc.GetRandom(), OrderByType.Asc);// 分页查询加排序
-        Console.Write(p.PageCount);//返回总数
-     
-        List<IConditionalModel> conModels = new List<IConditionalModel>(); //组装条件查询作为条件实现 分页查询加排序
-        conModels.Add(new ConditionalModel() { FieldName = typeof(users).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal, FieldValue = "1" });//id=1
-        var data7 = usersDb.GetPageList(conModels, p, it => SqlFunc.GetRandom(), OrderByType.Asc);
-
-        usersDb.AsQueryable().Where(x => 1 == 1).ToList();//支持了转换成queryable,我们可以用queryable实现复杂功能
-
-        //我要用事务
-        var result = Db.Ado.UseTran(() =>
-         {
-            //写事务代码
-        });
-        if (result.IsSuccess)
+        String sqlCon = "";
+        if (!String.IsNullOrEmpty(DeptCode))
         {
-            //事务成功
+            sqlCon += " AND (a.DeptCode='" + DeptCode + "')  ";
         }
 
-        //多表查询地址 http://www.codeisbug.com/Doc/8/1124
+        if (!String.IsNullOrEmpty(username))
+        {
 
+            sqlCon += " AND a.UserName LIKE '" + username + "%' ";
+        }
+        if (!String.IsNullOrEmpty(station))
+        {
 
+            sqlCon += " AND a.StationCode LIKE '" + station + "%' ";
+        }
 
-        /*********插入*********/
-        var insertData = new users() { };//测试参数
-        var insertArray = new users[] { insertData };
-        usersDb.Insert(insertData);//插入
-        usersDb.InsertRange(insertArray);//批量插入
-        var id = usersDb.InsertReturnIdentity(insertData);//插入返回自增列
-        usersDb.AsInsertable(insertData).ExecuteCommand();//我们可以转成 Insertable实现复杂插入
+        if (!String.IsNullOrEmpty(islock))
+        {
 
+            sqlCon += " AND a.islock='" + islock + "' ";
+        }
+        var sql = " SELECT  a.status,a.SysID, a.StaffCode, a.UserID, a.UserName, a.DeptCode,a.OrgCode, a.StationCode, a.Mobile, a.Tel, a.Fax, a.Education, a.PolityStatus," +
+            " a.IDCard, a.Homeplace, a.Nation, a.Email, a.SEX, a.Birthday, a.Addr, a.IsSystem, a.BeginDate, a.EndDate, a.IsLock, a.LastUpDate," +
+            " b.DeptName,case IsSystem when 1 then '是' else '否'end AS System, case IsLock when 1 then '停用' else '启用'end AS Lock,c.NationName," +
+            " d.EduName,e.StatusName,f.ItemName ,a.creline " +
+            " FROM Users a  " +
+            " INNER JOIN Depts b on a.DeptCode=b.DeptCode " +
+            " LEFT  JOIN NationInfo c on a.Nation=c.NationCode " +
+            " LEFT  JOIN EducationInfo d on a.Education=d.EduCode " +
+            " LEFT  JOIN PolityStatusInfo e on a.PolityStatus=e.StatusCode " +
+            " LEFT  JOIN ItemDictionary f on a.StationCode=f.ItemID " +
+        "  WHERE 1=1 "+sqlCon;
+        if (issystem != "1")
+        {
+            sql = " SELECT  a.status,a.SysID, a.StaffCode, a.UserID, a.UserName, a.DeptCode,a.OrgCode, a.StationCode, a.Mobile, a.Tel, a.Fax, a.Education, a.PolityStatus," +
+            " a.IDCard, a.Homeplace, a.Nation, a.Email, a.SEX, a.Birthday, a.Addr, a.IsSystem, a.BeginDate, a.EndDate, a.IsLock, a.LastUpDate," +
+            " b.DeptName,case IsSystem when 1 then '是' else '否'end AS System, case IsLock when 1 then '停用' else '启用'end AS Lock,c.NationName," +
+            " d.EduName,e.StatusName,f.ItemName ,a.creline " +
+            " FROM Users a  " +
+            " INNER JOIN Depts b on a.DeptCode=b.DeptCode " +
+            " INNER JOIN usersindepts b1  on b1.deptcode=b.deptcode " +
+            " LEFT  JOIN NationInfo c on a.Nation=c.NationCode " +
+            " LEFT  JOIN EducationInfo d on a.Education=d.EduCode " +
+            " LEFT  JOIN PolityStatusInfo e on a.PolityStatus=e.StatusCode " +
+            " LEFT  JOIN ItemDictionary f on a.StationCode=f.ItemID " +
+            "  WHERE 1=1 and b1.staffcode='" + staffcode + "' " + sqlCon;
 
+        }
+        var list = Db.Ado.SqlQuery<dynamic>(sql);
+        return list;
+    }
 
-		/*********更新*********/
-	    var updateData = new users() {  };//测试参数
-        var updateArray = new users[] { updateData };//测试参数
-        usersDb.Update(updateData);//根据实体更新
-        usersDb.UpdateRange(updateArray);//批量更新
-        //usersDb.Update(it => new users() { Name = "a", CreateTime = DateTime.Now }, it => it.id==1);// 只更新Name列和CreateTime列，其它列不更新，条件id=1
-        usersDb.AsUpdateable(updateData).ExecuteCommand();
+    /// <summary>
+    /// 获取员工工号最大值
+    /// </summary>
+    /// <returns></returns>
+    public string GetMaxStaffCode()
+    {
+        var sql = $"SELECT Max( isnull(staffcode,1001)) as staffcode FROM Users";
+        var staffcode = Db.Ado.GetString(sql);
+        return staffcode.IsNullOrEmpty() ? "1001" : staffcode;
+    }
 
+    /// <summary>
+    /// 设置员工状态
+    /// </summary>
+    /// <param name="staffcode">工号</param>
+    /// <param name="status">状态：在岗，待岗，休班</param>
+    /// <returns></returns>
+    public int SetStaffStatus(string staffcode, string status)
+    {
+        var sql = $"update users set status='{status}' where staffcode='{staffcode}'";
+        var rows = Db.Ado.ExecuteCommand(sql);
+        return rows;
+    }
 
 
-		/*********删除*********/
-	    var deldata = new users() {  };//测试参数
-        usersDb.Delete(deldata);//根据实体删除
-        usersDb.DeleteById(1);//根据主键删除
-        usersDb.DeleteById(new int[] { 1,2});//根据主键数组删除
-        usersDb.Delete(it=>1==2);//根据条件删除
-        usersDb.AsDeleteable().Where(it=>1==2).ExecuteCommand();//转成Deleteable实现复杂的操作
-    } 
-    #endregion
 
- 
- 
-}
+}

PMS.NetCore/PMS.NetCore/Controllers/BaseController.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.IO;
+using Microsoft.AspNetCore.Http;
 
 namespace PMS.NetCore.Controllers
 {
@@ -22,5 +23,46 @@ namespace PMS.NetCore.Controllers
             Configuration = builder.Build();
             logger = NLog.LogManager.GetCurrentClassLogger();
         }
+        /// <summary>
+        /// 设置本地cookie
+        /// </summary>
+        /// <param name="key">键</param>
+        /// <param name="value">值</param>
+        /// <param name="minutes">过期时长，单位：分钟</param>
+        protected void SetCookies(string key, string value, int minutes = 600)
+        {
+            HttpContext.Response.Cookies.Append(key, value, new CookieOptions
+            {
+                Expires = DateTime.Now.AddMinutes(minutes)
+            });
+        }
+        protected void SetCookies(string key, string value)
+        {
+            HttpContext.Response.Cookies.Append(key,value, new CookieOptions
+            {
+                Expires = DateTime.Now.AddMinutes(600)
+            });
+        }
+        /// <summary>
+        /// 删除指定的cookie
+        /// </summary>
+        /// <param name="key">键</param>
+        protected void DeleteCookies(string key)
+        {
+            HttpContext.Response.Cookies.Delete(key);
+        }
+
+        /// <summary>
+        /// 获取cookies
+        /// </summary>
+        /// <param name="key">键</param>
+        /// <returns>返回对应的值</returns>
+        protected string GetCookies(string key)
+        {
+            HttpContext.Request.Cookies.TryGetValue(key, out string value);
+            if (string.IsNullOrEmpty(value))
+                value = string.Empty;
+            return value;
+        }
     }
 }

PMS.NetCore/PMS.NetCore/Controllers/OrganizationController.cs

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Sugar.Enties;
 using Utils;
+using Microsoft.Extensions.Caching.Memory;
 
 namespace PMS.NetCore.Controllers
 {
@@ -14,10 +15,15 @@ namespace PMS.NetCore.Controllers
     /// 机构人员
     /// </summary>
     [Produces("application/json;charset=UTF-8")]
-    [Route("api/User")]
+    [Route("api/Organization")]
     [ServiceFilter(typeof(Filter.TokenAuthorize))]
     public class OrganizationController :  BaseController
     {
+        private IMemoryCache _memoryCache;
+        public OrganizationController(IMemoryCache memoryCache)
+        {
+            _memoryCache = memoryCache;
+        }
         #region 组织机构
         /// <summary>
         /// 获取组织机构列表
@@ -30,6 +36,7 @@ namespace PMS.NetCore.Controllers
             var manger = new corpsManager();
             var list = manger.GetList();
             logger.Info($"【GetCorpsList】接口输出：{JsonConvert.SerializeObject(list)}");
+
             return Json(list);
         }
         /// <summary>
@@ -358,7 +365,206 @@ namespace PMS.NetCore.Controllers
         #endregion
 
         #region 人员档案
+        /// <summary>
+        /// 用户信息查询
+        /// </summary>
+        /// <param name="DeptCode">部门代码</param>
+        /// <param name="staffcode">用户唯一标识码</param>
+        /// <param name="username">用户名</param>
+        /// <param name="station">岗位代码</param>
+        /// <param name="issystem">是否系统管理员</param>
+        /// <param name="islock">用户是否锁定</param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("GetUsersList")]
+        public JsonResult GetUsersList(string DeptCode, string staffcode, string username, string station, string issystem, string islock)
+        {
+            logger.Info($"【GetUsersList】DeptCode:{DeptCode},staffcode:{staffcode},username:{username},station:{station},issystem:{issystem},islock:{islock}");
+            //logger.Info($"cookie:{GetCookies("userid")}");
+            var user = JsonConvert.DeserializeObject<users>(GetCookies("userid"));
+            var manager = new usersManager();
+            issystem = user.IsSystem?.ToString();
+            logger.Info($"issystem:{issystem}");
+            var list = manager.GetUsersList(DeptCode, staffcode, username, station, issystem, islock);
+            return Json(list);
+        }
+
+        /// <summary>
+        /// 获取工号最大值
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("GetMaxStaffCode")]
+        public JsonResult GetMaxStaffCode()
+        {
+            logger.Info($"【GetMaxStaffCode】获取工号最大值");
+            var manager = new usersManager();
+            var code = manager.GetMaxStaffCode();
+            logger.Info($"【GetMaxStaffCode】MaxStaffCode:{code}");
+            return Json(code);
+        }
+
+        /// <summary>
+        /// 员工添加
+        /// </summary>
+        /// <param name="users"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("UsersAdd")]
+        public JsonResult UsersAdd([FromBody] users users)
+        {
+            logger.Info($"【UsersAdd】users:{JsonConvert.SerializeObject(users)}");
+            if (users.StaffCode.IsNullOrEmpty())
+            {
+                return Json("工号不能为空");
+            }
+            if (users.UserName.IsNullOrEmpty())
+            {
+                return Json("姓名不能为空");
+            }
+            if (users.Mobile.IsNullOrEmpty())
+            {
+                return Json("手机号不能为空");
+            }
+            if(!users.Mobile.IsCellPhone())
+            {
+                return Json("手机号格式不正确");
+            }
+            var success = new usersManager().Insert(users);
+            logger.Info($"【UsersAdd】success:{success}");
+            if (success)
+            {
+                return Json("插入成功");
+            }
+            else
+            {
+                return Json("插入失败");
+            }
+        }
+
+        /// <summary>
+        /// 根据工号获取单个员工信息
+        /// </summary>
+        /// <param name="staffcode">工号</param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("GetUsers")]
+        public JsonResult GetUsers(string staffcode)
+        {
+            logger.Info($"【GetUsers】staffcode:{staffcode}");
+            if(staffcode.IsNullOrEmpty())
+            {
+                return Json("工号不能为空");
+            }
+            var users = new usersManager().GetById(staffcode);
+            if(users==null)
+            {
+                return Json("不存在的员工");
+            }
+            logger.Info($"【GetUsers】users:{JsonConvert.SerializeObject(users)}");
+            return Json(users);
+        }
+
+        /// <summary>
+        /// 员工修改
+        /// </summary>
+        /// <param name="users"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("UsersUpdate")]
+        public JsonResult UsersUpdate([FromBody] users users)
+        {
+            logger.Info($"【UsersUpdate】users:{JsonConvert.SerializeObject(users)}");
+            if (users.StaffCode.IsNullOrEmpty())
+            {
+                return Json("工号不能为空");
+            }
+            if (users.UserName.IsNullOrEmpty())
+            {
+                return Json("姓名不能为空");
+            }
+            if (users.Mobile.IsNullOrEmpty())
+            {
+                return Json("手机号不能为空");
+            }
+            if (!users.Mobile.IsCellPhone())
+            {
+                return Json("手机号格式不正确");
+            }
+            var manager = new usersManager();
+            var users1 = manager.GetById(users.StaffCode);
+            if(users1==null)
+            {
+                return Json("员工信息不存在，不能修改");
+            }
+            users1 = users;
+            var success = manager.Update(users1);
+            logger.Info($"【UsersUpdate】success:{success}");
+            if (success)
+            {
+                return Json("修改成功");
+            }
+            else
+            {
+                return Json("修改失败");
+            }
+        }
+
+        /// <summary>
+        /// 删除员工
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("UsersDelete")]
+        public JsonResult UsersDelete([FromBody] SingleParamDTO dto)
+        {
+            var manger = new usersManager();
+            var model = manger.GetById( dto.value);
+            if (model == null)
+            {
+                return Json("该员工不存在，不能删除");
+            }
+            var success = manger.Delete(model);
+            if (success)
+            {
+                return Json("删除成功");
+            }
+            else
+            {
+                return Json("删除失败");
+            }
+        }
 
+        /// <summary>
+        /// 设置员工状态
+        /// </summary>
+        /// <param name="staffcode">工号</param>
+        /// <param name="status">状态：在岗，待岗，休班</param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("SetStaffStatus")]
+        public JsonResult SetStaffStatus(string staffcode,string status)
+        {
+            if(staffcode.IsNullOrEmpty())
+            {
+                return Json("工号不能为空");
+            }
+            string[] array = { "在岗", "待岗", "休班" };
+            if (!array.Contains(status))
+            {
+                return Json("员工状态设置不正确");
+            }
+            var rows = new usersManager().SetStaffStatus(staffcode, status);
+            if(rows>0)
+            {
+                return Json("状态设置成功");
+            }
+            else
+            {
+                return Json("状态设置失败");
+            }
+        }
         #endregion
     }
 }

PMS.NetCore/PMS.NetCore/Controllers/SystemConfigurationController.cs

@@ -0,0 +1,188 @@
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Sugar.Enties;
+using Utils;
+
+namespace PMS.NetCore.Controllers
+{
+    /// <summary>
+    /// 系统配置
+    /// </summary>
+    [Produces("application/json;charset=UTF-8")]
+    [Route("api/SystemConfiguration")]
+    [ServiceFilter(typeof(Filter.TokenAuthorize))]
+    public class SystemConfigurationController : BaseController
+    {
+        #region 结算方式
+        /// <summary>
+        /// 获取结算方式列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("GetSettleTypeList")]
+        public JsonResult GetSettleTypeList()
+        {
+            var manager = new settletypeManager();
+            var list = manager.GetList();
+            logger.Info($"【GetSettleTypeList】list:{JsonConvert.SerializeObject(list)}");
+            return Json(list);
+        }
+
+        /// <summary>
+        /// 根据结算方式编码获取结算方式实例
+        /// </summary>
+        /// <param name="dto">结算方式编码</param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("GetSettleType")]
+        public JsonResult GetSettleType([FromBody] SingleParamDTO dto)
+        {
+            logger.Info($"【GetSettleType】dto:{dto.value}");
+            if (dto.value.IsNullOrEmpty())
+            {
+                return Json("结算方式编码不能为空");
+
+            }
+            var model = new settletypeManager().GetById(dto.value);
+            logger.Info($"【GetSettleType】model:{JsonConvert.SerializeObject(model)}");
+            return Json(model);
+
+        }
+
+        /// <summary>
+        /// 结算方式添加
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("SettleTypeAdd")]
+        public JsonResult SettleTypeAdd([FromBody] settletype dto)
+        {
+            logger.Info($"【SettleTypeAdd】dto:{JsonConvert.SerializeObject(dto)}");
+            if(dto.csscode.IsNullOrEmpty())
+            {
+                return Json("结算方式编码不能为空");
+            }
+            var manager = new settletypeManager();
+            var model = manager.GetById(dto.csscode);
+            if(model!=null)
+            {
+                return Json("结算方式编码必须唯一");
+            }
+            var success = manager.Insert(dto);
+            if(success)
+            {
+                return Json("插入成功");
+            }
+            else
+            {
+                return Json("插入失败");
+            }
+        }
+
+        /// <summary>
+        /// 结算方式修改
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("SettleTypeUpdate")]
+        public JsonResult SettleTypeUpdate([FromBody] settletype dto)
+        {
+            logger.Info($"【SettleTypeUpdate】dto:{JsonConvert.SerializeObject(dto)}");
+            if (dto.csscode.IsNullOrEmpty())
+            {
+                return Json("结算方式编码不能为空");
+            }
+            var manager = new settletypeManager();
+            var model = manager.GetById(dto.csscode);
+            if (model == null)
+            {
+                return Json("要修改的结算方式不存在");
+            }
+            var success = manager.Update(dto);
+            if (success)
+            {
+                return Json("修改成功");
+            }
+            else
+            {
+                return Json("修改失败");
+            }
+        }
+
+        /// <summary>
+        /// 结算方式删除
+        /// </summary>
+        /// <param name="dto">结算方式主键值</param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("SettleTypeDelete")]
+        public JsonResult SettleTypeDelete([FromBody] SingleParamDTO dto)
+        {
+            logger.Info($"【SettleTypeDelete】dto:{JsonConvert.SerializeObject(dto)}");
+
+            var manager = new settletypeManager();
+            var model = manager.GetById(dto.value);
+            if (model == null)
+            {
+                return Json("要删除的结算方式不存在");
+            }
+            var success = manager.Delete(m => m.csscode == dto.value);
+            if (success)
+            {
+                return Json("删除成功");
+            }
+            else
+            {
+                return Json("删除失败");
+            }
+        }
+        #endregion
+
+        #region 会计科目
+       /// <summary>
+       /// 分页获取会计科目
+       /// </summary>
+       /// <param name="pageIndex">页码</param>
+       /// <param name="pageSize">页面条数</param>
+       /// <returns></returns>
+        [HttpGet]
+        [Route("GetCodeList")]
+        public JsonResult GetCodeList(int pageIndex,int pageSize)
+        {
+            logger.Info($"【GetCodeList】pageIndex:{pageSize},pageSize:{pageSize}");
+            if(pageSize<=0||pageIndex<=0)
+            {
+                return Json("页码或页面条数不能小于等于0");
+            }
+            var manager = new codeManager();
+            var list = manager.Db.Queryable<code>().ToPageList(pageIndex,pageSize);
+            logger.Info($"【GetCodeList】list:{JsonConvert.SerializeObject(list)}");
+            return Json(list);
+        }
+        #endregion
+
+        #region 业态档案
+       /// <summary>
+       /// 获取业态档案列表
+       /// </summary>
+       /// <returns></returns>
+        [HttpPost]
+        [Route("GetFdc_pm_operstateList")]
+        public JsonResult GetFdc_pm_operstateList()
+        {
+
+            var manager = new fdc_pm_operstateManager();
+            var list = manager.GetList();
+            logger.Info($"【GetFdc_pm_operstateList】list:{JsonConvert.SerializeObject(list)}");
+            return Json(list);
+        }
+        #endregion
+    }
+}

PMS.NetCore/PMS.NetCore/Controllers/UserController.cs

@@ -150,8 +150,8 @@ namespace PMS.NetCore.Controllers
                     };
             var tnToken = tokenHelper.CreateToken(keyValuePairs);
 
-            new Utils.CacheHelper(_memoryCache).SetCache(loginUser.User.UserID, loginUser.User);
-
+            //new Utils.CacheHelper(_memoryCache).SetCache(loginUser.User.UserID, loginUser.User);
+            SetCookies("UserID", JsonConvert.SerializeObject(loginUser.User));
             var res = new ApiResponse
             {
                 Code = 200,

PMS.NetCore/PMS.NetCore/Filter/TokenAuthorize.cs

@@ -77,6 +77,8 @@ namespace PMS.NetCore.Filter
             {
                 //给控制器传递参数(需要什么参数其实可以做成可以配置的，在过滤器里边加字段即可)
                 //context.ActionArguments.Add("userId", Convert.ToInt32(userId));
+
+
             }
         }
 

PMS.NetCore/PMS.NetCore/PMS.NetCore.xml

@@ -4,6 +4,27 @@
         <name>PMS.NetCore</name>
     </assembly>
     <members>
+        <member name="M:PMS.NetCore.Controllers.BaseController.SetCookies(System.String,System.String,System.Int32)">
+            <summary>
+            设置本地cookie
+            </summary>
+            <param name="key">键</param>
+            <param name="value">值</param>
+            <param name="minutes">过期时长，单位：分钟</param>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.BaseController.DeleteCookies(System.String)">
+            <summary>
+            删除指定的cookie
+            </summary>
+            <param name="key">键</param>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.BaseController.GetCookies(System.String)">
+            <summary>
+            获取cookies
+            </summary>
+            <param name="key">键</param>
+            <returns>返回对应的值</returns>
+        </member>
         <member name="T:PMS.NetCore.Controllers.OrganizationController">
             <summary>
             机构人员
@@ -75,6 +96,113 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="M:PMS.NetCore.Controllers.OrganizationController.GetUsersList(System.String,System.String,System.String,System.String,System.String,System.String)">
+            <summary>
+            用户信息查询
+            </summary>
+            <param name="DeptCode">部门代码</param>
+            <param name="staffcode">用户唯一标识码</param>
+            <param name="username">用户名</param>
+            <param name="station">岗位代码</param>
+            <param name="issystem">是否系统管理员</param>
+            <param name="islock">用户是否锁定</param>
+            <returns></returns>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.OrganizationController.GetMaxStaffCode">
+            <summary>
+            获取工号最大值
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.OrganizationController.UsersAdd(Sugar.Enties.users)">
+            <summary>
+            员工添加
+            </summary>
+            <param name="users"></param>
+            <returns></returns>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.OrganizationController.GetUsers(System.String)">
+            <summary>
+            根据工号获取单个员工信息
+            </summary>
+            <param name="staffcode">工号</param>
+            <returns></returns>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.OrganizationController.UsersUpdate(Sugar.Enties.users)">
+            <summary>
+            员工修改
+            </summary>
+            <param name="users"></param>
+            <returns></returns>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.OrganizationController.UsersDelete(Sugar.Enties.SingleParamDTO)">
+            <summary>
+            删除员工
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.OrganizationController.SetStaffStatus(System.String,System.String)">
+            <summary>
+            设置员工状态
+            </summary>
+            <param name="staffcode">工号</param>
+            <param name="status">状态：在岗，待岗，休班</param>
+            <returns></returns>
+        </member>
+        <member name="T:PMS.NetCore.Controllers.SystemConfigurationController">
+            <summary>
+            系统配置
+            </summary>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.SystemConfigurationController.GetSettleTypeList">
+            <summary>
+            获取结算方式列表
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.SystemConfigurationController.GetSettleType(Sugar.Enties.SingleParamDTO)">
+            <summary>
+            根据结算方式编码获取结算方式实例
+            </summary>
+            <param name="dto">结算方式编码</param>
+            <returns></returns>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.SystemConfigurationController.SettleTypeAdd(Sugar.Enties.settletype)">
+            <summary>
+            结算方式添加
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.SystemConfigurationController.SettleTypeUpdate(Sugar.Enties.settletype)">
+            <summary>
+            结算方式修改
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.SystemConfigurationController.SettleTypeDelete(Sugar.Enties.SingleParamDTO)">
+            <summary>
+            结算方式删除
+            </summary>
+            <param name="dto">结算方式主键值</param>
+            <returns></returns>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.SystemConfigurationController.GetCodeList(System.Int32,System.Int32)">
+            <summary>
+            分页获取会计科目
+            </summary>
+            <param name="pageIndex">页码</param>
+            <param name="pageSize">页面条数</param>
+            <returns></returns>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.SystemConfigurationController.GetFdc_pm_operstateList">
+            <summary>
+            获取业态档案列表
+            </summary>
+            <returns></returns>
+        </member>
         <member name="T:PMS.NetCore.Controllers.UserController">
             <summary>
             用户信息

PMS.NetCore/PMS.NetCore/Properties/launchSettings.json

@@ -3,8 +3,8 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:51214/",
-      "sslPort": 44383
+      "applicationUrl": "http://localhost:58391/",
+      "sslPort": 44340
     }
   },
   "$schema": "http://json.schemastore.org/launchsettings.json",

PMS.NetCore/Utils/CacheHelper.cs

@@ -10,7 +10,7 @@ using Microsoft.Extensions.Caching.Memory;
 namespace Utils
 {
     /// <summary>
-    /// 缓存操作,默认缓存1分钟
+    /// 缓存操作,默认缓存10小时
     /// </summary>
     public class CacheHelper
     {
@@ -36,7 +36,7 @@ namespace Utils
         /// </summary>
         public void SetCache(string cacheKey, object cacheValue)
         {
-            _cache.Set(cacheKey, cacheValue, new MemoryCacheEntryOptions().SetSlidingExpiration(TimeSpan.FromHours(2)));
+            _cache.Set(cacheKey, cacheValue, new MemoryCacheEntryOptions().SetSlidingExpiration(TimeSpan.FromHours(10)));
         }
 
         /// <summary>.