管理处增删改查5接口的编写

PMS.NetCore/PMS.NetCore.BusinessCore/BaseCore/fdc_pm_billsitemManager.cs

@@ -2,6 +2,10 @@
 using SqlSugar;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+/// <summary>
+/// 收费项目
+/// </summary>
 public class fdc_pm_billsitemManager : DbContext<fdc_pm_billsitem>
 {
  
@@ -9,78 +13,18 @@ public class fdc_pm_billsitemManager : DbContext<fdc_pm_billsitem>
 
     //这里面写的代码不会给覆盖,如果要重新生成请删除 fdc_pm_billsitemManager.cs
 
-
-    #region 教学方法
     /// <summary>
-    /// 如果DbContext中的增删查改方法满足不了你，你可以看下具体用法
+    /// 获取所有费用项目
     /// </summary>
-    public void Study()
+    /// <returns></returns>
+    public List<dynamic> Getfdc_pm_billsitemList()
     {
-	     
-	   /*********查询*********/
-
-        var data1 = fdc_pm_billsitemDb.GetById(1);//根据ID查询
-        var data2 = fdc_pm_billsitemDb.GetList();//查询所有
-        var data3 = fdc_pm_billsitemDb.GetList(it => 1 == 1);  //根据条件查询  
-        //var data4 = fdc_pm_billsitemDb.GetSingle(it => 1 == 1);//根据条件查询一条,如果超过一条会报错
-
-        var p = new PageModel() { PageIndex = 1, PageSize = 2 };// 分页查询
-        var data5 = fdc_pm_billsitemDb.GetPageList(it => 1 == 1, p);
-        Console.Write(p.PageCount);//返回总数
-
-        var data6 = fdc_pm_billsitemDb.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(fdc_pm_billsitem).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal, FieldValue = "1" });//id=1
-        var data7 = fdc_pm_billsitemDb.GetPageList(conModels, p, it => SqlFunc.GetRandom(), OrderByType.Asc);
-
-        fdc_pm_billsitemDb.AsQueryable().Where(x => 1 == 1).ToList();//支持了转换成queryable,我们可以用queryable实现复杂功能
-
-        //我要用事务
-        var result = Db.Ado.UseTran(() =>
-         {
-            //写事务代码
-        });
-        if (result.IsSuccess)
-        {
-            //事务成功
-        }
-
-        //多表查询地址 http://www.codeisbug.com/Doc/8/1124
-
+        var sql = $"select billitemcode, billitemname from fdc_pm_billsitem  where billitemname!='费用项目'";
+        var list = Db.Ado.SqlQuery<dynamic>(sql);
+        return list;
+    }
 
 
-        /*********插入*********/
-        var insertData = new fdc_pm_billsitem() { };//测试参数
-        var insertArray = new fdc_pm_billsitem[] { insertData };
-        fdc_pm_billsitemDb.Insert(insertData);//插入
-        fdc_pm_billsitemDb.InsertRange(insertArray);//批量插入
-        var id = fdc_pm_billsitemDb.InsertReturnIdentity(insertData);//插入返回自增列
-        fdc_pm_billsitemDb.AsInsertable(insertData).ExecuteCommand();//我们可以转成 Insertable实现复杂插入
 
 
-
-		/*********更新*********/
-	    var updateData = new fdc_pm_billsitem() {  };//测试参数
-        var updateArray = new fdc_pm_billsitem[] { updateData };//测试参数
-        fdc_pm_billsitemDb.Update(updateData);//根据实体更新
-        fdc_pm_billsitemDb.UpdateRange(updateArray);//批量更新
-        //fdc_pm_billsitemDb.Update(it => new fdc_pm_billsitem() { Name = "a", CreateTime = DateTime.Now }, it => it.id==1);// 只更新Name列和CreateTime列，其它列不更新，条件id=1
-        fdc_pm_billsitemDb.AsUpdateable(updateData).ExecuteCommand();
-
-
-
-		/*********删除*********/
-	    var deldata = new fdc_pm_billsitem() {  };//测试参数
-        fdc_pm_billsitemDb.Delete(deldata);//根据实体删除
-        fdc_pm_billsitemDb.DeleteById(1);//根据主键删除
-        fdc_pm_billsitemDb.DeleteById(new int[] { 1,2});//根据主键数组删除
-        fdc_pm_billsitemDb.Delete(it=>1==2);//根据条件删除
-        fdc_pm_billsitemDb.AsDeleteable().Where(it=>1==2).ExecuteCommand();//转成Deleteable实现复杂的操作
-    } 
-    #endregion
-
- 
- 
 }

PMS.NetCore/PMS.NetCore.Enties/DbModels/fdc_pm_managementsec.cs

@@ -6,7 +6,7 @@ using SqlSugar;
 namespace Sugar.Enties
 {
     ///<summary>
-    ///
+    ///管理处
     ///</summary>
     [SugarTable("fdc_pm_managementsec")]
     public partial class fdc_pm_managementsec
@@ -15,20 +15,20 @@ namespace Sugar.Enties
 
 
            }
-           /// <summary>
-           /// Desc:
-           /// Default:
-           /// Nullable:False
-           /// </summary>           
-           [SugarColumn(IsPrimaryKey=true)]
+        /// <summary>
+        /// 管理处编号
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        [SugarColumn(IsPrimaryKey=true)]
            public string pk_managementsecid {get;set;}
 
-           /// <summary>
-           /// Desc:
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public string managementsecname {get;set;}
+        /// <summary>
+        /// 管理处名称
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string managementsecname {get;set;}
 
            /// <summary>
            /// Desc:地址

PMS.NetCore/PMS.NetCore.Enties/Sugar.Enties.csproj

@@ -5,8 +5,10 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.3" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.3" />
+    <PackageReference Include="NLog" Version="4.7.5" />
     <PackageReference Include="SqlSugarCore" Version="5.0.2.8" />
   </ItemGroup>
 </Project>

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

@@ -18,6 +18,13 @@ namespace PMS.NetCore.Controllers
     [ServiceFilter(typeof(Filter.TokenAuthorize))]
     public class SystemConfigurationController : BaseController
     {
+        /// <summary>
+        /// 系统配置
+        /// </summary>
+        public SystemConfigurationController()
+        {
+            logger = NLog.LogManager.GetCurrentClassLogger();
+        }
         #region 结算方式
         /// <summary>
         /// 获取结算方式列表
@@ -552,7 +559,7 @@ namespace PMS.NetCore.Controllers
         /// <summary>
         /// 获取项目档案实例
         /// </summary>
-        /// <param name="dto">项目档案主键值</param>
+        /// <param name="dto">项目档案编码</param>
         /// <returns></returns>
         [HttpPost]
         [Route("GetFdc_pm_project")]
@@ -586,13 +593,18 @@ namespace PMS.NetCore.Controllers
             {
                 return Json("编码不能为空");
             }
+            var entity = manager.GetById(dto.pcode);
+            if(entity!=null)
+            {
+                return Json("编码必须唯一");
+            }
             if (dto.pname.IsNullOrEmpty())
             {
                 return Json("项目名称不能为空");
             }
-            if (dto.fathercode.IsNullOrEmpty())    //父级项目为空
+            if (dto.fathercode.IsNullOrEmpty()|| dto.fathercode == "o")    //父级项目为空
             {
-                dto.fathercode = "0";      //赋默认值
+                dto.fathercode = "o";      //赋默认值
 
             }
             else
@@ -603,6 +615,7 @@ namespace PMS.NetCore.Controllers
                     return Json("父级项目不存在");
                 }
             }
+            
             var success = manager.Insert(dto);
             logger.Info($"【Fdc_pm_projectAdd】success:{success}");
             if (success)
@@ -641,9 +654,9 @@ namespace PMS.NetCore.Controllers
             {
                 return Json("项目名称不能为空");
             }
-            if (dto.fathercode.IsNullOrEmpty())    //父级项目为空
+            if (dto.fathercode.IsNullOrEmpty()||dto.fathercode == "o")    //父级项目为空
             {
-                dto.fathercode = "0";      //赋默认值
+                dto.fathercode = "o";      //赋默认值
 
             }
             else
@@ -654,15 +667,28 @@ namespace PMS.NetCore.Controllers
                     return Json("父级项目不存在");
                 }
             }
-            var success = manager.Insert(dto);
+            entity.pname = dto.pname;
+            entity.fathercode = dto.fathercode;
+            entity.psgn = dto.psgn;
+            entity.flag = dto.flag;
+            entity.paddress = dto.paddress;
+            entity.pclass = dto.pclass;
+            entity.pdevcom = dto.pdevcom;
+            entity.ptype = dto.ptype;
+            entity.memo = dto.memo;
+            entity.url = dto.url;
+            entity.cltemccode = dto.cltemccode;
+
+
+            var success = manager.Update(entity);
             logger.Info($"【Fdc_pm_projectUpdate】success:{success}");
             if (success)
             {
-                return Json("添加成功");
+                return Json("修改成功");
             }
             else
             {
-                return Json("添加失败");
+                return Json("修改失败");
             }
         }
 
@@ -697,5 +723,235 @@ namespace PMS.NetCore.Controllers
 
         }
         #endregion
+
+        #region 管理处
+        /// <summary>
+        /// 管理处列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Getfdc_pm_managementsecList")]
+        public JsonResult Getfdc_pm_managementsecList()
+        {
+            var manager = new fdc_pm_managementsecManager();
+            var list = manager.GetList();
+            logger.Info($"【Getfdc_pm_managementsecList】list:{JsonConvert.SerializeObject(list)}");
+            return Json(list);
+        }
+
+        /// <summary>
+        /// 获取管理处实例
+        /// </summary>
+        /// <param name="dto">管理处编码</param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Getfdc_pm_managementsec")]
+        public JsonResult Getfdc_pm_managementsec([FromBody] SingleParamDTO dto)
+        {
+            logger.Info($"【Getfdc_pm_managementsec】dto:{JsonConvert.SerializeObject(dto)}");
+            if (dto == null || dto.value.IsNullOrEmpty())
+            {
+                return Json("参数错误");
+            }
+            var manager = new fdc_pm_managementsecManager();
+            var model = manager.GetById(dto.value);
+            logger.Info($"【Getfdc_pm_managementsec】model:{JsonConvert.SerializeObject(model)}");
+            return Json(model);
+        }
+
+        /// <summary>
+        /// 管理处添加
+        /// </summary>
+        /// <param name="dto">管理处实例</param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("fdc_pm_managementsecAdd")]
+        public JsonResult fdc_pm_managementsecAdd([FromBody] fdc_pm_managementsec dto)
+        {
+            logger.Info($"【fdc_pm_managementsecAdd】dto:{JsonConvert.SerializeObject(dto)}");
+
+            var manager = new fdc_pm_managementsecManager();
+            var number = manager.Db.Ado.GetInt("SELECT MAX(CAST(pk_managementsecid AS int)) FROM fdc_pm_managementsec");
+            dto.pk_managementsecid = (number + 1).ToString();
+            
+            var entity = manager.GetById(dto.pk_managementsecid);
+            if (entity != null)
+            {
+                return Json("管理处编号必须唯一");
+            }
+            if (dto.managementsecname.IsNullOrEmpty())
+            {
+                return Json("管理处名称不能为空");
+            }
+
+            if (dto.ibuildcount.IsNullOrEmpty())
+            {
+                return Json("楼栋数不能为空");
+            }
+            if (dto.nmanagementarea.IsNullOrEmpty())
+            {
+                return Json("管理面积不能为空");
+            }
+            var success = manager.Insert(dto);
+            logger.Info($"【fdc_pm_managementsecAdd】success:{success}");
+            if (success)
+            {
+                return Json("添加成功");
+            }
+            else
+            {
+                return Json("添加失败");
+            }
+        }
+
+        /// <summary>
+        /// 项目档案修改
+        /// </summary>
+        /// <param name="dto">项目档案实例</param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("fdc_pm_managementsecUpdate")]
+        public JsonResult fdc_pm_managementsecUpdate([FromBody] fdc_pm_managementsec dto)
+        {
+            logger.Info($"【fdc_pm_managementsecUpdate】dto:{JsonConvert.SerializeObject(dto)}");
+            if (dto.pk_managementsecid.IsNullOrEmpty())
+            {
+                return Json("管理处编号不能为空");
+            }
+            var manager = new fdc_pm_managementsecManager();
+            var entity = manager.GetById(dto.pk_managementsecid);
+            if (entity == null)
+            {
+                return Json("记录不存在");
+            }
+            if (dto.managementsecname.IsNullOrEmpty())
+            {
+                return Json("管理处名称不能为空");
+            }
+
+            if (dto.ibuildcount.IsNullOrEmpty())
+            {
+                return Json("楼栋数不能为空");
+            }
+            if (dto.nmanagementarea.IsNullOrEmpty())
+            {
+                return Json("管理面积不能为空");
+            }
+
+            entity.managementsecname = dto.managementsecname;
+            entity.ibuildcount = dto.ibuildcount;
+            entity.nmanagementarea = dto.nmanagementarea;
+            entity.iemployercount = dto.iemployercount;
+            entity.imanagecount = dto.imanagecount;
+            entity.itechcount = dto.itechcount;
+            entity.isecuritycount = dto.isecuritycount;
+            entity.idustcount = dto.idustcount;
+            entity.ncontractarea = dto.ncontractarea;
+            entity.dcontractdate = dto.dcontractdate;
+            entity.iroomcount = dto.iroomcount;
+            entity.iparkspacecount = dto.iparkspacecount;
+            entity.ngreenarea = dto.ngreenarea;
+            entity.vywhtel = dto.vywhtel;
+            entity.dywhsetupdate = dto.dywhsetupdate;
+            entity.vmanager = dto.vmanager;
+            entity.vmanagetel = dto.vmanagetel;
+
+
+            var success = manager.Update(entity);
+            logger.Info($"【fdc_pm_managementsecUpdate】success:{success}");
+            if (success)
+            {
+                return Json("修改成功");
+            }
+            else
+            {
+                return Json("修改失败");
+            }
+        }
+
+        /// <summary>
+        /// 项目档案删除
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("fdc_pm_managementsecDelete")]
+        public JsonResult fdc_pm_managementsecDelete([FromBody] SingleParamDTO dto)
+        {
+            if (dto.value.IsNullOrEmpty())
+            {
+                return Json("要删除的项目档案编号不能为空");
+            }
+            var manager = new fdc_pm_managementsecManager();
+            var model = manager.GetById(dto.value);
+            if (model == null)
+            {
+                return Json("要删除的记录不存在");
+            }
+            var success = manager.CurrentDb.DeleteById(dto.value);
+            if (success)
+            {
+                return Json("删除成功");
+            }
+            else
+            {
+                return Json("删除失败");
+            }
+
+        }
+        /// <summary>
+        /// 给管理处分配费用项目权限
+        /// </summary>
+        /// <param name="managementId">管理处编号</param>
+        /// <param name="billsitemIds">费用项编号串，由逗号分割</param>
+        /// <returns></returns>
+        public JsonResult DistributionManagementBillsItem(string managementId,string billsitemIds)
+        {
+            logger.Info($"【DistributionManagementBillsItem】managementId:{managementId},billsitemIds:{billsitemIds}");
+            if (managementId.IsNullOrEmpty())
+            {
+                return Json("请选择管理处");
+            }
+            var arr = billsitemIds.Split(',');
+            if(arr.Length<=0)
+            {
+                return Json("请选择费用项目");
+            }
+            var manager = new MangmengBillsitemManager();
+            try
+            {
+                return Json("");
+            }
+            catch(Exception ex)
+            {
+                return Json("");
+            }
+            
+        }
+        #endregion
+
+        #region 收费项目
+        /// <summary>
+        /// 获取所有收费项
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Getfdc_pm_billsitemList")]
+        public JsonResult Getfdc_pm_billsitemList()
+        {
+            var manager = new fdc_pm_billsitemManager();
+            var list = manager.Getfdc_pm_billsitemList();
+            logger.Info($"【fdc_pm_managementsecUpdate】list:{JsonConvert.SerializeObject(list)}");
+            return Json(list);
+        }
+        #endregion
+
+        #region 管理处人员引用
+
+        #endregion
+
+        #region 楼栋档案
+
+        #endregion
     }
 }

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

@@ -62,6 +62,7 @@ namespace PMS.NetCore.Controllers
             _signInManager = signInManager;
             _configuration = configuration;
             tokenHelper = _tokenHelper;
+            logger = NLog.LogManager.GetCurrentClassLogger();
         }
         /// <summary>
         /// 测试方法

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

@@ -155,6 +155,11 @@
             系统配置
             </summary>
         </member>
+        <member name="M:PMS.NetCore.Controllers.SystemConfigurationController.#ctor">
+            <summary>
+            系统配置
+            </summary>
+        </member>
         <member name="M:PMS.NetCore.Controllers.SystemConfigurationController.GetSettleTypeList">
             <summary>
             获取结算方式列表
@@ -295,7 +300,7 @@
             <summary>
             获取项目档案实例
             </summary>
-            <param name="dto">项目档案主键值</param>
+            <param name="dto">项目档案编码</param>
             <returns></returns>
         </member>
         <member name="M:PMS.NetCore.Controllers.SystemConfigurationController.Fdc_pm_projectAdd(Sugar.Enties.fdc_pm_project)">
@@ -319,6 +324,54 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="M:PMS.NetCore.Controllers.SystemConfigurationController.Getfdc_pm_managementsecList">
+            <summary>
+            管理处列表
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.SystemConfigurationController.Getfdc_pm_managementsec(Sugar.Enties.SingleParamDTO)">
+            <summary>
+            获取管理处实例
+            </summary>
+            <param name="dto">管理处编码</param>
+            <returns></returns>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.SystemConfigurationController.fdc_pm_managementsecAdd(Sugar.Enties.fdc_pm_managementsec)">
+            <summary>
+            管理处添加
+            </summary>
+            <param name="dto">管理处实例</param>
+            <returns></returns>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.SystemConfigurationController.fdc_pm_managementsecUpdate(Sugar.Enties.fdc_pm_managementsec)">
+            <summary>
+            项目档案修改
+            </summary>
+            <param name="dto">项目档案实例</param>
+            <returns></returns>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.SystemConfigurationController.fdc_pm_managementsecDelete(Sugar.Enties.SingleParamDTO)">
+            <summary>
+            项目档案删除
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.SystemConfigurationController.DistributionManagementBillsItem(System.String,System.String)">
+            <summary>
+            给管理处分配费用项目权限
+            </summary>
+            <param name="managementId">管理处编号</param>
+            <param name="billsitemIds">费用项编号串，由逗号分割</param>
+            <returns></returns>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.SystemConfigurationController.Getfdc_pm_billsitemList">
+            <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:58391/",
-      "sslPort": 44340
+      "applicationUrl": "http://localhost:58332/",
+      "sslPort": 44399
     }
   },
   "$schema": "http://json.schemastore.org/launchsettings.json",

PMS.NetCore/Utils/ExtensionMethod.cs

@@ -93,6 +93,16 @@ namespace Utils
         {
             return StringHelper.IsIDCard(str);
         }
+
+        /// <summary>
+        /// 是否是日期判断
+        /// </summary>
+        /// <param name="str"></param>
+        /// <returns></returns>
+        public static bool IsDate(this string str)
+        {
+            return StringHelper.IsDate(str);
+        }
         #endregion
 
 
@@ -126,6 +136,16 @@ namespace Utils
             return obj == null ? false : StringHelper.IsNumber(obj.ToString());
         }
 
+        /// <summary>
+        /// 是否是日期判断
+        /// </summary>
+        /// <param name="str"></param>
+        /// <returns></returns>
+        public static bool IsDate(this object obj)
+        {
+            return obj == null ? false : StringHelper.IsDate(obj.ToString());
+        }
+
         /// <summary>
         /// 对象转换为字符串，如果对象为null，则为空
         /// </summary>

PMS.NetCore/Utils/StringHelper.cs

@@ -100,6 +100,17 @@ namespace Utils
             return double.TryParse(str, out dbl);
         }
 
+        /// <summary>
+        /// 是否是日期判断
+        /// </summary>
+        /// <param name="str"></param>
+        /// <returns></returns>
+        public static bool IsDate(string str)
+        {
+            DateTime dtime;
+            return DateTime.TryParse(str, out dtime);
+        }
+
         /// <summary>
         /// 判断字符串是否是正整数，可以是几十上百位的字符数
         /// </summary>