shengxuefei 4 rokov pred
rodič
commit
8f8039f1d7

BIN
PMS.NetCore/.vs/PMS.NetCore/DesignTimeBuild/.dtbcache.v2


+ 16 - 13
PMS.NetCore/PMS.NetCore.BusinessCore/BaseCore/corpsManager.cs

@@ -2,9 +2,12 @@
 using SqlSugar;
 using System;
 using System.Collections.Generic;
+/// <summary>
+/// 公司管理业务逻辑类
+/// </summary>
 public class corpsManager : DbContext<corps>
 {
- 
+
     //当前类已经继承了 DbContext增、删、查、改的方法
 
     //这里面写的代码不会给覆盖,如果要重新生成请删除 corpsManager.cs
@@ -16,12 +19,12 @@ public class corpsManager : DbContext<corps>
     /// </summary>
     public void Study()
     {
-	     
-	   /*********查询*********/
+
+       /*********查询*********/
 
         var data1 = corpsDb.GetById(1);//根据ID查询
         var data2 = corpsDb.GetList();//查询所有
-        var data3 = corpsDb.GetList(it => 1 == 1);  //根据条件查询  
+        var data3 = corpsDb.GetList(it => 1 == 1);  //根据条件查询
         //var data4 = corpsDb.GetSingle(it => 1 == 1);//根据条件查询一条,如果超过一条会报错
 
         var p = new PageModel() { PageIndex = 1, PageSize = 2 };// 分页查询
@@ -30,7 +33,7 @@ public class corpsManager : DbContext<corps>
 
         var data6 = corpsDb.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(corps).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal, FieldValue = "1" });//id=1
         var data7 = corpsDb.GetPageList(conModels, p, it => SqlFunc.GetRandom(), OrderByType.Asc);
@@ -61,8 +64,8 @@ public class corpsManager : DbContext<corps>
 
 
 
-		/*********更新*********/
-	    var updateData = new corps() {  };//测试参数
+        /*********更新*********/
+        var updateData = new corps() {  };//测试参数
         var updateArray = new corps[] { updateData };//测试参数
         corpsDb.Update(updateData);//根据实体更新
         corpsDb.UpdateRange(updateArray);//批量更新
@@ -71,16 +74,16 @@ public class corpsManager : DbContext<corps>
 
 
 
-		/*********删除*********/
-	    var deldata = new corps() {  };//测试参数
+        /*********删除*********/
+        var deldata = new corps() {  };//测试参数
         corpsDb.Delete(deldata);//根据实体删除
         corpsDb.DeleteById(1);//根据主键删除
         corpsDb.DeleteById(new int[] { 1,2});//根据主键数组删除
         corpsDb.Delete(it=>1==2);//根据条件删除
         corpsDb.AsDeleteable().Where(it=>1==2).ExecuteCommand();//转成Deleteable实现复杂的操作
-    } 
+    }
     #endregion
 
- 
- 
-}
+
+
+}

+ 197 - 0
PMS.NetCore/PMS.NetCore/Controllers/OrganizationController.cs

@@ -0,0 +1,197 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+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/User")]
+    [ServiceFilter(typeof(Filter.TokenAuthorize))]
+    public class OrganizationController :  BaseController
+    {
+        /// <summary>
+        /// 获取组织机构列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("GetCorpsList")]
+        public JsonResult GetCorpsList()
+        {
+            var manger = new corpsManager();
+            var list = manger.GetList();
+            logger.Info($"【GetCorpsList】接口输出:{JsonConvert.SerializeObject(list)}");
+            return Json(list);
+        }
+        /// <summary>
+        /// 根据单位编号获取组织机构实例
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("GetCorps")]
+        public JsonResult GetCorps([FromBody] SingleParamDTO dto)
+        {
+            logger.Info($"【GetCorps】接口输入:{JsonConvert.SerializeObject(dto)}");
+            var manger = new corpsManager();
+            var model = manger.GetList(m=>m.pk_corp==dto.value).FirstOrDefault();
+            logger.Info($"【GetCorps】接口输出:{JsonConvert.SerializeObject(model)}");
+            return Json(model);
+        }
+        /// <summary>
+        /// 添加组织机构
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("CorpsAdd")]
+        public JsonResult CorpsAdd([FromBody] corps model )
+        {
+            var manger = new corpsManager();
+            if(!model.pk_corp.IsInteger())
+            {
+                return Json("单位编码必须是整数形式");
+            }
+            var mod = manger.GetById(model.pk_corp).FirstOrDefault();
+            if (mod != null)
+            {
+                return Json("该组织机构单位编码已经存在");
+            }
+            if(model.fathercode!="0")
+            {
+                var father = manger.GetById(model.fathercode).FirstOrDefault();
+                if(father==null)
+                {
+                    return Json("上级公司不存在,请重新选择");
+                }
+            }
+            if(model.corpname.IsNullOrEmpty())
+            {
+                return Json("单位名称不能为空");
+            }
+            var model1 = manger.GetList(m => m.corpname == model.corpname).FirstOrDefault();
+            if(model1!=null)
+            {
+                return Json("单位名称必须唯一");
+            }
+            if(model.sgn.IsNotNullAndEmpty())
+            {
+                var model2 = manger.GetList(m => m.sgn == model.sgn).FirstOrDefault();
+                if (model2 != null)
+                {
+                    return Json("收据标识必须唯一");
+                }
+            }
+            var success = manger.Insert(model);
+            if(success)
+            {
+                return Json("添加成功");
+            }
+            else
+            {
+                return Json("添加失败");
+            }
+        }
+        /// <summary>
+        /// 修改组织机构
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("CorpsUpdate")]
+        public JsonResult CorpsUpdate([FromBody] corps model)
+        {
+            var manger = new corpsManager();
+            if (!model.pk_corp.IsInteger())
+            {
+                return Json("单位编码必须是整数形式");
+            }
+            var mod = manger.GetById(model.pk_corp).FirstOrDefault();
+            if (mod == null)
+            {
+                return Json("不存在的组织机构");
+            }
+            if (model.fathercode != "0")
+            {
+                var father = manger.GetById(model.fathercode).FirstOrDefault();
+                if (father == null)
+                {
+                    return Json("上级公司不存在,请重新选择");
+                }
+            }
+            if (model.corpname.IsNullOrEmpty())
+            {
+                return Json("单位名称不能为空");
+            }
+            var model1 = manger.GetList(m => m.corpname == model.corpname&&m.pk_corp!=model.pk_corp).FirstOrDefault();
+            if (model1 != null)
+            {
+                return Json("单位名称必须唯一");
+            }
+            if (model.sgn.IsNotNullAndEmpty())
+            {
+                var model2 = manger.GetList(m => m.sgn == model.sgn && m.pk_corp != model.pk_corp).FirstOrDefault();
+                if (model2 != null)
+                {
+                    return Json("收据标识必须唯一");
+                }
+            }
+            mod.corpname = model.corpname;
+            mod.fathercode = model.fathercode;
+            mod.unitshortname = model.unitshortname;
+            mod.industry = model.industry;
+            mod.legalbodycode = model.legalbodycode;
+            mod.taxcode = model.taxcode;
+            mod.saleaddr = model.saleaddr;
+            mod.postaddr = model.postaddr;
+            mod.phone1 = model.phone1;
+            mod.createdate = model.createdate;
+            mod.regcapital = model.regcapital;
+            mod.idnumber = model.idnumber;
+            mod.email1 = model.email1;
+            mod.memo = model.memo;
+            mod.sgn = model.sgn;
+            var success = manger.Update(mod);
+            if (success)
+            {
+                return Json("修改成功");
+            }
+            else
+            {
+                return Json("修改失败");
+            }
+        }
+        /// <summary>
+        /// 删除组织机构
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("CorpsDelete")]
+        public JsonResult CorpsDelete([FromBody] SingleParamDTO dto)
+        {
+            var manger = new corpsManager();
+            var model = manger.GetById(dto.value).FirstOrDefault();
+            if(model==null)
+            {
+                return Json("该组织机构不存在,不能删除");
+            }
+            var success = manger.Delete(dto.value);
+            if (success)
+            {
+                return Json("删除成功");
+            }
+            else
+            {
+                return Json("删除失败");
+            }
+        }
+    }
+}

+ 0 - 1
PMS.NetCore/PMS.NetCore/Controllers/UserController.cs

@@ -33,7 +33,6 @@ namespace PMS.NetCore.Controllers
         /// 加密关键字
         /// </summary>
         private const string EncryptKeyStr = "EcodeIAP"; //加密关键字
-        private static Logger Logger = NLog.LogManager.GetCurrentClassLogger();
         private readonly IHttpClientFactory _httpclientfactory;
         private IMemoryCache _memoryCache;
         private readonly SignInManager<AppUser> _signInManager;

+ 38 - 0
PMS.NetCore/PMS.NetCore/PMS.NetCore.xml

@@ -4,6 +4,44 @@
         <name>PMS.NetCore</name>
     </assembly>
     <members>
+        <member name="T:PMS.NetCore.Controllers.OrganizationController">
+            <summary>
+            机构人员
+            </summary>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.OrganizationController.GetCorpsList">
+            <summary>
+            获取组织机构列表
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.OrganizationController.GetCorps(Sugar.Enties.SingleParamDTO)">
+            <summary>
+            根据单位编号获取组织机构实例
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.OrganizationController.CorpsAdd(Sugar.Enties.corps)">
+            <summary>
+            添加组织机构
+            </summary>
+            <param name="model"></param>
+            <returns></returns>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.OrganizationController.CorpsUpdate(Sugar.Enties.corps)">
+            <summary>
+            修改组织机构
+            </summary>
+            <param name="model"></param>
+            <returns></returns>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.OrganizationController.CorpsDelete(Sugar.Enties.SingleParamDTO)">
+            <summary>
+            删除组织机构
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="T:PMS.NetCore.Controllers.UserController">
             <summary>
             用户信息