请购单+审核 + 资产采购 + 资产采购入库

Property.Common/Config.cs

@@ -291,5 +291,16 @@ namespace REBORN.Common
                 return new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("ExpendBranchId").Value;
             }
         }
+
+        /// <summary>
+        /// 请购单经办人
+        /// </summary>
+        public static string ManagersId
+        {
+            get
+            {
+                return new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("ManagersId").Value;
+            }
+        }
     }
 }
\ No newline at end of file

Property.Common/Enum/Edu/FinanceConfigTypeEnum.cs

+using REBORN.Common.Plugin;
+
+namespace REBORN.Common.Enum
+{
+    /// <summary>
+    /// 财务流程费用配置枚举
+    /// </summary>
+    public enum FinanceConfigTypeEnum
+    {
+        /// <summary>
+        /// 教师课时费
+        /// </summary>
+        [EnumField("教师课时费")]
+        ClassFees = 1,
+
+        /// <summary>
+        /// 教师绩效
+        /// </summary>
+        [EnumField("教师绩效")]
+        Perf = 2,
+
+        /// <summary>
+        /// 学生退课
+        /// </summary>
+        [EnumField("学生退课")]
+        DropCourse = 3,
+
+        /// <summary>
+        /// 资产采购
+        /// </summary>
+        [EnumField("资产采购")]
+        AssetPurchase = 4,
+        /// <summary>
+        /// 耗材采购
+        /// </summary>
+        [EnumField("耗材采购")]
+        SuppliesPurchase = 5,
+        /// <summary>
+        /// 耗材成本
+        /// </summary>
+        [EnumField("耗材成本")]
+        SuppliesCost = 6,
+        /// <summary>
+        /// 耗材出库
+        /// </summary>
+        [EnumField("耗材出库")]
+        SuppliesStockOut = 7
+    }
+}

Property.Common/Enum/Property/BuyingRequisitionStatusEnum.cs

@@ -8,24 +8,24 @@ namespace REBORN.Common.Enum
     public enum BuyingRequisitionStatusEnum
     {
         /// <summary>
-        /// 已购买
+        /// 通过
         /// </summary>
-        [EnumField("已购买")]
+        [EnumField("通过")]
         Purchased = 1,
         /// <summary>
-        /// 购买中
+        /// 通过
         /// </summary>
-        [EnumField("购买中")]
-        DuringPurchase = 2,
+        //[EnumField("通过")]
+        //DuringPurchase = 2,
         /// <summary>
         /// 驳回
         /// </summary>
         [EnumField("驳回")]
         Reject = 3,
         /// <summary>
-        /// 待处理
+        /// 审核中
         /// </summary>
-        [EnumField("待处理")]
+        [EnumField("审核中")]
         Pending = 4,
         /// <summary>
         /// 撤回

Property.Common/Enum/Property/PropertyFlowEnum.cs

@@ -62,5 +62,10 @@ namespace REBORN.Common.Enum
         /// </summary>
         //[EnumField("耗材入库")]
         //StockIn = 11
+        /// <summary>
+        /// 请购审核
+        /// </summary>
+        [EnumField("请购审核")]
+        PurchaseRequest = 12
     }
 }

Property.Common/Enum/SystemPushLogTypeEnum.cs

@@ -81,5 +81,10 @@ namespace REBORN.Common.Enum
         /// </summary>
         [EnumField("耗材审批")]
         SuppliesAudit = 8,
+        /// <summary>
+        /// 请购审批
+        /// </summary>
+        [EnumField("请购审批")]
+        RequisitionAudit = 9,
     }
 }
\ No newline at end of file

Property.Model/Entity/Finance/RB_ClientBankAccount.cs

+using REBORN.Common.AOP;
+using REBORN.Common.Enum;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Property.Model.Entity
+{
+    /// <summary>
+    /// 客户账户表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "FinanceConnection")]
+    public class RB_ClientBankAccount
+    {
+        /// <summary>
+        /// ID
+        /// </summary>        
+        public int ID
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 资产使用 Type =10
+        /// </summary>        
+        public int Type
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 账户类型对应的对象编号
+        /// </summary>        
+        public int? ObjID
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 所属银行
+        /// </summary>        
+        public int? BankId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 开户支行
+        /// </summary>        
+        public string OpenBankName
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 开户人
+        /// </summary>        
+        public string AccountHolder
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 卡号
+        /// </summary>        
+        public string CardNum
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 账户别名
+        /// </summary>        
+        public string AccountAlias
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 状态
+        /// </summary>        
+        public DateStateEnum Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 创建人
+        /// </summary>        
+        public int? CreateBy
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 创建时间
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 集团
+        /// </summary>        
+        public int? RB_Group_Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 公司
+        /// </summary>        
+        public int? RB_Branch_Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 公私账户类型  1公  2私
+        /// </summary>
+        public int? AccountType {
+            get;set;
+        }
+        /// <summary>
+        /// 账户分类  1平台  2银行  3虚拟账户  4微信支付宝
+        /// </summary>
+        public int? AccountClassify {
+            get;set;
+        }
+        /// <summary>
+        /// 创建人名称
+        /// </summary>
+        public string RB_CreateByName { get; set; }
+        /// <summary>
+        /// 公司名称
+        /// </summary>
+        public string RB_BranchName { get; set; }
+    }
+}

Property.Model/Entity/Property/RB_Property_BuyingRequisition.cs

@@ -131,5 +131,35 @@ namespace Property.Model.Entity
             get;
             set;
         }
+
+        /// <summary>
+        /// 图片列表
+        /// </summary>
+        public string Images { get; set; }
+
+        /// <summary>
+        /// 流程模板id
+        /// </summary>
+        public int TempleteId { get; set; }
+
+        /// <summary>
+        /// 校区id
+        /// </summary>
+        public int SchoolId { get; set; }
+
+        /// <summary>
+        /// 经办人id
+        /// </summary>
+        public int ManagersId { get; set; }
+
+        /// <summary>
+        /// 采购单id  （资产/耗材两种）
+        /// </summary>
+        public int ProcurementId { get; set; }
+
+        /// <summary>
+        /// 财务单据id
+        /// </summary>
+        public int FinanceId { get; set; }
     }
 }
\ No newline at end of file

Property.Model/Entity/Property/RB_Property_Info.cs

@@ -237,5 +237,10 @@ namespace Property.Model.Entity
         /// 资产二维码
         /// </summary>
         public string QRCode { get; set; }
+
+        /// <summary>
+        /// 资产采购单id
+        /// </summary>
+        public int ProcurementId { get; set; }
     }
 }
\ No newline at end of file

Property.Model/Entity/Property/RB_Property_Procurement.cs

+using System;
+using REBORN.Common.AOP;
+using REBORN.Common.Plugin;
+
+namespace Property.Model.Entity
+{
+
+    /// <summary>
+    /// 资产采购实体
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "PropertyConnection")]
+    public class RB_Property_Procurement
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 总成本
+        /// </summary>
+        public decimal TotalCostMoney { get; set; }
+
+        /// <summary>
+        /// 总数量
+        /// </summary>
+        public int TotalNumber { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 状态 0 正常 1删除
+        /// </summary>
+        public int Status { get; set; }
+
+        /// <summary>
+        /// 公司
+        /// </summary>
+        public int RB_Branch_Id { get; set; }
+
+        /// <summary>
+        /// 集团
+        /// </summary>
+        public int RB_Group_Id { get; set; }
+
+        /// <summary>
+        /// CreateBy
+        /// </summary>
+        public int CreateBy { get; set; }
+
+        /// <summary>
+        /// CreateDate
+        /// </summary>
+        public DateTime CreateDate { get; set; }
+
+        /// <summary>
+        /// UpdateBy
+        /// </summary>
+        public int UpdateBy { get; set; }
+
+        /// <summary>
+        /// UpdateDate
+        /// </summary>
+        public DateTime UpdateDate { get; set; }
+
+        /// <summary>
+        /// 财务单据id
+        /// </summary>
+        public int FinanceId { get; set; }
+
+        /// <summary>
+        /// 供应商id
+        /// </summary>
+        public int SupplierId { get; set; }
+
+        /// <summary>
+        /// 供应商名称
+        /// </summary>
+        public string SupplierName { get; set; }
+
+        /// <summary>
+        /// 入库状态   1未入库  2部分入库  3已入库
+        /// </summary>
+        public int StockInStatus { get; set; }
+
+        /// <summary>
+        /// 校区id
+        /// </summary>
+        public int SchoolId { get; set; }
+
+        /// <summary>
+        /// 请购单id
+        /// </summary>
+        public int BuyingRequisitionId { get; set; }
+
+    }
+}
\ No newline at end of file

Property.Model/Entity/Property/RB_Property_ProcurementDetail.cs

+using System;
+using REBORN.Common.AOP;
+using REBORN.Common.Plugin;
+
+namespace Property.Model.Entity
+{
+
+    /// <summary>
+    /// 资产采购明细实体
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "PropertyConnection")]
+    public class RB_Property_ProcurementDetail
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 采购单id
+        /// </summary>
+        public int ProcurementId { get; set; }
+
+        /// <summary>
+        /// 资产名称
+        /// </summary>
+        public string PropertyName { get; set; }
+
+        /// <summary>
+        /// 品牌名称
+        /// </summary>
+        public string BrandName { get; set; }
+
+        /// <summary>
+        /// 分类id
+        /// </summary>
+        public int CategoryId { get; set; }
+
+        /// <summary>
+        /// 采购数量
+        /// </summary>
+        public int Number { get; set; }
+
+        /// <summary>
+        /// 成本价格
+        /// </summary>
+        public decimal CostMoney { get; set; }
+
+        /// <summary>
+        /// 状态 0 正常 1删除
+        /// </summary>
+        public int Status { get; set; }
+
+        /// <summary>
+        /// 公司
+        /// </summary>
+        public int RB_Branch_Id { get; set; }
+
+        /// <summary>
+        /// 集团
+        /// </summary>
+        public int RB_Group_Id { get; set; }
+
+        /// <summary>
+        /// CreateBy
+        /// </summary>
+        public int CreateBy { get; set; }
+
+        /// <summary>
+        /// CreateDate
+        /// </summary>
+        public DateTime CreateDate { get; set; }
+
+        /// <summary>
+        /// 已入库的数量
+        /// </summary>
+        public int StockInNum { get; set; }
+
+        /// <summary>
+        /// 关联资产id (入库时  直接根据该资产信息生成)
+        /// </summary>
+        public int PropertyId { get; set; }
+
+    }
+}
\ No newline at end of file

Property.Model/Entity/Property/RB_Property_Supplier.cs

@@ -101,5 +101,10 @@ namespace Property.Model.Entity
             get;
             set;
         }
+
+        /// <summary>
+        /// 付款对象id （用于自动生成财务单据时）
+        /// </summary>
+        public int ClientID { get; set; }
     }
 }
\ No newline at end of file

Property.Model/Entity/PropertyFlow/RB_Workfolw_Change_Log.cs

@@ -21,7 +21,7 @@ namespace Property.Model.Entity
             set;
         }
         /// <summary>
-        /// 1、资产流程   2、耗材流程
+        /// 1、资产流程   2、耗材流程   3请购流程
         /// </summary>        
         public int? Type
         {

Property.Model/Entity/PropertyFlow/Rb_Workflow_AuditRelevance.cs

@@ -86,7 +86,7 @@ namespace Property.Model.Entity
             set;
         }
         /// <summary>
-        /// 0资产流程   1耗材流程
+        /// 0资产流程   1耗材流程   2请购单流程
         /// </summary>        
         public int? TemplateType
         {

Property.Model/Entity/PropertyFlow/Rb_Workflow_Auditrecord.cs

@@ -54,7 +54,7 @@ namespace Property.Model.Entity
             set;
         }
         /// <summary>
-        /// 0资产   1耗材
+        /// 0资产   1耗材   2请购
         /// </summary>        
         public int? TemplateType
         {

Property.Model/Entity/PropertyFlow/Rb_Workflow_CopyToPeople.cs

@@ -37,7 +37,7 @@ namespace Property.Model.Entity
             set;
         }
         /// <summary>
-        /// 0资产    1耗材
+        /// 0资产    1耗材   2请购
         /// </summary>        
         public int? TemplateType
         {

Property.Model/Entity/User/RB_Finance_Config.cs

+using System;
+using REBORN.Common.AOP;
+using REBORN.Common.Enum;
+
+namespace Property.Model.Entity
+{
+    /// <summary>
+    /// 财务流程费用配置实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "EduConnection")]
+    public class RB_Finance_Config
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 类型   1教师课时费   2教师绩效   3学生退课   枚举
+        /// </summary>
+        public FinanceConfigTypeEnum Type { get; set; }
+
+        /// <summary>
+        /// 费用id
+        /// </summary>
+        public int CostTypeId { get; set; }
+
+        /// <summary>
+        /// 流程Id
+        /// </summary>
+        public int TempleteId { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public int Status { get; set; }
+
+        /// <summary>
+		/// 集团编号
+		/// </summary>
+		public int Group_Id { get; set; }
+
+        /// <summary>
+        /// 校区id
+        /// </summary>
+        public int School_Id { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int CreateBy { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public int UpdateBy { get; set; }
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime UpdateTime { get; set; }
+
+        /// <summary>
+        /// 币种id
+        /// </summary>
+        public int CurrencyId { get; set; }
+    }
+}

Property.Model/Extend/Finance/RB_ClientBankAccount_Extend.cs

+using REBORN.Common.AOP;
+using Property.Model.Entity;
+using System;
+
+namespace Property.Model.Extend
+{
+    /// <summary>
+    /// 客户账户表扩展
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "FinanceConnection")]
+    public class RB_ClientBankAccount_Extend : RB_ClientBankAccount
+    {
+        /// <summary>
+        /// 客户账户id
+        /// </summary>
+        public string ClientIdStr { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string ObjIdStr { get; set; }
+        /// <summary>
+        /// 客户名称
+        /// </summary>
+        public string ClientName { get; set; }
+        /// <summary>
+        /// 所属银行
+        /// </summary>
+        public string BankName { get; set; }
+
+        /// <summary>
+        /// 交易金额
+        /// </summary>
+        public decimal? PayMoney { get; set; }
+    }
+}

Property.Model/Extend/Property/RB_Property_BuyingRequisition_Extend.cs

 using System;
+using System.Collections.Generic;
 using Property.Model.Entity;
 using REBORN.Common.AOP;
 
@@ -11,6 +12,10 @@ namespace Property.Model.Extend
     [DB(ConnectionName = "PropertyConnection")]
     public class RB_Property_BuyingRequisition_Extend : RB_Property_BuyingRequisition
     {
+        /// <summary>
+        /// 是否带我处理
+        /// </summary>
+        public int IsWaitDeal { get; set; }
         /// <summary>
         /// 开始时间
         /// </summary>
@@ -23,6 +28,50 @@ namespace Property.Model.Extend
         /// 分类名称
         /// </summary>
         public string CategoryName { get; set; }
+        /// <summary>
+        /// 图片列表
+        /// </summary>
+        public List<string> ImageList { get; set; }
+        /// <summary>
+        /// 学校名称
+        /// </summary>
+        public string SchoolName { get; set; }
+
+        /// <summary>
+        /// 模板流程名称
+        /// </summary>
+        public string TemplateName { get; set; }
+
+        /// <summary>
+        /// 申请人
+        /// </summary>
+        public string EmName { get; set; }
+
+        /// <summary>
+        /// 审批人
+        /// </summary>
+        public int? AuditEmId { get; set; }
+        /// <summary>
+        /// 已审批人
+        /// </summary>
+        public int? AuditedEmId { get; set; }
 
+        /// <summary>
+        /// 下一步审批描述
+        /// </summary>
+        public string AuditDescription { get; set; }
+        /// <summary>
+        /// 审批人是否是自己
+        /// </summary>
+        public int? Is_AuditSelf { get; set; }
+        /// <summary>
+        /// 是否可以审批  1是 0否
+        /// </summary>
+        public int? Is_CanAudit { get; set; }
+
+        /// <summary>
+        /// 审批步骤
+        /// </summary>
+        public List<Rb_Workflow_AuditRelevance_Extend> AuditSteps { get; set; }
     }
 }
\ No newline at end of file

Property.Model/Extend/Property/RB_Property_ProcurementDetail_Extend.cs

+using System;
+using System.Collections.Generic;
+using Property.Model.Entity;
+using REBORN.Common.AOP;
+
+namespace Property.Model.Extend
+{
+    /// <summary>
+    /// 资产采购明细扩展实体
+    /// </summary>    
+    [Serializable]
+    [DB(ConnectionName = "PropertyConnection")]
+    public class RB_Property_ProcurementDetail_Extend : RB_Property_ProcurementDetail
+    {
+        /// <summary>
+        /// 采购ids
+        /// </summary>
+        public string ProcurementIds { get; set; }
+
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        public string CategoryName { get; set; }
+
+        /// <summary>
+        /// 待入库数量
+        /// </summary>
+        public int WaitStockInNum { get; set; }
+    }
+}
\ No newline at end of file

Property.Model/Extend/Property/RB_Property_Procurement_Extend.cs

+using System;
+using System.Collections.Generic;
+using Property.Model.Entity;
+using REBORN.Common.AOP;
+
+namespace Property.Model.Extend
+{
+    /// <summary>
+    /// 资产采购扩展实体
+    /// </summary>    
+    [Serializable]
+    [DB(ConnectionName = "PropertyConnection")]
+    public class RB_Property_Procurement_Extend : RB_Property_Procurement
+    {
+        /// <summary>
+        /// 采购单Id
+        /// </summary>
+        public int ProcurementId { get; set; }
+
+        /// <summary>
+        /// 账户类型
+        /// </summary>
+        public int IsPublic { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public string StartTime { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public string EndTime { get; set; }
+
+        /// <summary>
+        /// 资产名称
+        /// </summary>
+        public string PropertyName { get; set; }
+
+        /// <summary>
+        /// 发起人
+        /// </summary>
+        public string CreateByName { get; set; }
+
+        /// <summary>
+        /// 学校名称
+        /// </summary>
+        public string SchoolName { get; set; }
+
+        /// <summary>
+        /// 购置日期
+        /// </summary>
+        public string BuyDate { get; set; }
+
+        /// <summary>
+        /// 明细列表
+        /// </summary>
+        public List<RB_Property_ProcurementDetail_Extend> DetailList { get; set; }
+    }
+}
\ No newline at end of file

Property.Model/Extend/Property/RB_Property_Supplier_Extend.cs

@@ -11,6 +11,37 @@ namespace Property.Model.Extend
     [DB(ConnectionName = "PropertyConnection")]
     public class RB_Property_Supplier_Extend : RB_Property_Supplier
     {
-        
+        /// <summary>
+        /// 开户支行
+        /// </summary>        
+        public string OpenBankName
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 开户人
+        /// </summary>        
+        public string AccountHolder
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 卡号
+        /// </summary>        
+        public string CardNum
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 账户别名
+        /// </summary>        
+        public string AccountAlias
+        {
+            get;
+            set;
+        }
     }
 }
\ No newline at end of file

Property.Model/Extend/User/RB_Finance_Config_ViewModel.cs

+using Property.Model.Entity;
+using System;
+
+namespace Property.Model.Extend
+{
+    /// <summary>
+    /// 财务流程费用配置扩展类
+    /// </summary>
+    [Serializable]
+    public class RB_Finance_Config_ViewModel : RB_Finance_Config
+    {
+        
+    }
+}
\ No newline at end of file

Property.Repository/Property/RB_Property_ProcurementDetailRepository.cs

+using Property.Model.Entity;
+using Property.Model.Extend;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Dapper;
+
+namespace Property.Repository
+{
+    /// <summary>
+    /// 资产采购明细仓储类
+    /// </summary>
+    public partial class RB_Property_ProcurementDetailRepository : RepositoryBase<RB_Property_ProcurementDetail>
+    {
+        /// <summary>
+        /// 获取岗位分页数据
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="dmodel"></param>
+        /// <param name="count"></param>
+        /// <returns></returns>
+        public List<RB_Property_ProcurementDetail_Extend> GetPageList(int pageIndex, int pageSize, RB_Property_ProcurementDetail_Extend dmodel, out long count)
+        {
+            DynamicParameters parms = new DynamicParameters();
+            string where = " where 1=1 ";
+            where += string.Format(" AND pc.{0}={1}", nameof(RB_Property_ProcurementDetail_Extend.Status), 0);
+            where += $@" and pc.RB_Group_Id={dmodel.RB_Group_Id}";
+            if (dmodel.ProcurementId > 0)
+            {
+                where += " and pc." + nameof(RB_Property_ProcurementDetail_Extend.ProcurementId) + "=" + dmodel.ProcurementId;
+            }
+            if (!string.IsNullOrEmpty(dmodel.ProcurementIds))
+            {
+                where += " and pc." + nameof(RB_Property_ProcurementDetail_Extend.ProcurementId) + " in(" + dmodel.ProcurementIds + ")";
+            }
+            if (!string.IsNullOrEmpty(dmodel.PropertyName))
+            {
+                where += " and pc.PropertyName like @PropertyName";
+                parms.Add("PropertyName", "%" + dmodel.PropertyName + "%");
+            }
+
+            string sql = $@" select pc.* from RB_Property_ProcurementDetail pc
+{where} order by pc.Id desc";
+            return GetPage<RB_Property_ProcurementDetail_Extend>(pageIndex, pageSize, out count, sql).ToList();
+        }
+
+        /// <summary>
+        /// 根据条件获取岗位列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Property_ProcurementDetail_Extend> GetList(RB_Property_ProcurementDetail_Extend dmodel)
+        {
+            DynamicParameters parms = new DynamicParameters();
+            string where = " where 1=1 ";
+            where += string.Format(" AND pc.{0}={1}", nameof(RB_Property_ProcurementDetail_Extend.Status), 0);
+            where += $@" and pc.RB_Group_Id={dmodel.RB_Group_Id}";
+            if (dmodel.ProcurementId > 0)
+            {
+                where += " and pc." + nameof(RB_Property_ProcurementDetail_Extend.ProcurementId) + "=" + dmodel.ProcurementId;
+            }
+            if (!string.IsNullOrEmpty(dmodel.ProcurementIds))
+            {
+                where += " and pc." + nameof(RB_Property_ProcurementDetail_Extend.ProcurementId) + " in(" + dmodel.ProcurementIds + ")";
+            }
+            if (!string.IsNullOrEmpty(dmodel.PropertyName))
+            {
+                where += " and pc.PropertyName like @PropertyName";
+                parms.Add("PropertyName", "%" + dmodel.PropertyName + "%");
+            }
+
+            string sql = $@" select pc.* from RB_Property_ProcurementDetail pc
+{where} order by pc.Id desc";
+            return Get<RB_Property_ProcurementDetail_Extend>(sql).ToList();
+        }
+    }
+}

Property.Repository/Property/RB_Property_ProcurementRepository.cs

+using Property.Model.Entity;
+using Property.Model.Extend;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Dapper;
+
+namespace Property.Repository
+{
+    /// <summary>
+    /// 资产采购仓储类
+    /// </summary>
+    public partial class RB_Property_ProcurementRepository : RepositoryBase<RB_Property_Procurement>
+    {
+        /// <summary>
+        /// 获取岗位分页数据
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="dmodel"></param>
+        /// <param name="count"></param>
+        /// <returns></returns>
+        public List<RB_Property_Procurement_Extend> GetPageList(int pageIndex, int pageSize, RB_Property_Procurement_Extend dmodel, out long count)
+        {
+            DynamicParameters parms = new DynamicParameters();
+            string where = " where 1=1 ";
+            where += string.Format(" AND pc.{0}={1}", nameof(RB_Property_Procurement_Extend.Status), 0);
+            where += $@" and pc.RB_Group_Id={dmodel.RB_Group_Id}";
+            if (dmodel.SchoolId > 0)
+            {
+                where += " and pc." + nameof(RB_Property_Procurement_Extend.SchoolId) + "=" + dmodel.SchoolId;
+            }
+            if (dmodel.StockInStatus > 0)
+            {
+                where += " and pc." + nameof(RB_Property_Procurement_Extend.StockInStatus) + "=" + dmodel.StockInStatus;
+            }
+            if (!string.IsNullOrEmpty(dmodel.StartTime))
+            {
+                where += " and pc." + nameof(RB_Property_Procurement_Extend.CreateDate) + " >='" + dmodel.StartTime + "'";
+            }
+            if (!string.IsNullOrEmpty(dmodel.EndTime))
+            {
+                where += " and pc." + nameof(RB_Property_Procurement_Extend.CreateDate) + " <='" + dmodel.EndTime + " 23:59:59'";
+            }
+            if (!string.IsNullOrEmpty(dmodel.PropertyName))
+            {
+                where += " and pc2.PropertyName like @PropertyName";
+                parms.Add("PropertyName", "%" + dmodel.PropertyName + "%");
+            }
+
+            string sql = $@" select pc.* from RB_Property_Procurement pc
+left join rb_property_procurementdetail pc2 on pc.Id=pc2.ProcurementId
+{where} order by pc.Id desc";
+            return GetPage<RB_Property_Procurement_Extend>(pageIndex, pageSize, out count, sql).ToList();
+        }
+
+        /// <summary>
+        /// 根据条件获取岗位列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Property_Procurement_Extend> GetList(RB_Property_Procurement_Extend dmodel)
+        {
+            DynamicParameters parms = new DynamicParameters();
+            string where = " where 1=1 ";
+            where += string.Format(" AND pc.{0}={1}", nameof(RB_Property_Procurement_Extend.Status), 0);
+            where += $@" and pc.RB_Group_Id={dmodel.RB_Group_Id}";
+            if (dmodel.SchoolId > 0)
+            {
+                where += " and pc." + nameof(RB_Property_Procurement_Extend.SchoolId) + "=" + dmodel.SchoolId;
+            }
+            if (dmodel.StockInStatus > 0)
+            {
+                where += " and pc." + nameof(RB_Property_Procurement_Extend.StockInStatus) + "=" + dmodel.StockInStatus;
+            }
+            if (!string.IsNullOrEmpty(dmodel.StartTime))
+            {
+                where += " and pc." + nameof(RB_Property_Procurement_Extend.CreateDate) + " >='" + dmodel.StartTime + "'";
+            }
+            if (!string.IsNullOrEmpty(dmodel.EndTime))
+            {
+                where += " and pc." + nameof(RB_Property_Procurement_Extend.CreateDate) + " <='" + dmodel.EndTime + " 23:59:59'";
+            }
+            if (!string.IsNullOrEmpty(dmodel.PropertyName))
+            {
+                where += " and pc2.PropertyName like @PropertyName";
+                parms.Add("PropertyName", "%" + dmodel.PropertyName + "%");
+            }
+
+            string sql = $@" select pc.* from RB_Property_Procurement pc
+left join rb_property_procurementdetail pc2 on pc.Id=pc2.ProcurementId
+{where} order by pc.Id desc";
+            return Get<RB_Property_Procurement_Extend>(sql).ToList();
+        }
+    }
+}

Property.Repository/PropertyFlow/RB_ClientBankAccountRepository.cs

+using Property.Model.Entity;
+using Property.Model.Extend;
+using REBORN.Common.Enum;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Property.Repository
+{
+    /// <summary>
+    /// 客户账户仓储
+    /// </summary>
+    public partial class RB_ClientBankAccountRepository : RepositoryBase<RB_ClientBankAccount>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_ClientBankAccount); } }
+
+        /// <summary>
+        /// 获取客户账户分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="model"></param>
+        /// <param name="count"></param>
+        /// <returns></returns>
+        public List<RB_ClientBankAccount_Extend> GetPageList(int pageIndex, int pageSize, RB_ClientBankAccount_Extend model, out long count)
+        {
+            string where = " WHERE 1=1 ";
+            where += string.Format(" AND " + nameof(RB_ClientBankAccount_Extend.Status) + "={0}", (int)DateStateEnum.Normal);
+            if (model.RB_Group_Id > 0)
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount_Extend.RB_Group_Id) + "={0}", model.RB_Group_Id);
+            }
+            if (model.RB_Branch_Id >= 0)
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount_Extend.RB_Branch_Id) + "={0}", model.RB_Branch_Id);
+            }
+            if (model.Type > 0)
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount_Extend.Type) + "={0}", (int)model.Type);
+            }
+            if (!string.IsNullOrEmpty(model.AccountAlias))
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount_Extend.AccountAlias) + " like '%{0}%' ", model.AccountAlias);
+            }
+            if (!string.IsNullOrEmpty(model.OpenBankName))
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount_Extend.OpenBankName) + " like '%{0}%' ", model.OpenBankName);
+            }
+            if (!string.IsNullOrEmpty(model.CardNum))
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount_Extend.CardNum) + " like '%{0}%' ", model.CardNum);
+            }
+            if (!string.IsNullOrEmpty(model.AccountHolder))
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount_Extend.AccountHolder) + " like '%{0}%' ", model.AccountHolder);
+            }
+            return GetPage<RB_ClientBankAccount_Extend>(pageIndex, pageSize, out count, " select * from  " + TableName + "" + where).ToList();
+        }
+
+        /// <summary>
+        /// 根据查询条件获取客户账户列表
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public List<RB_ClientBankAccount_Extend> GetList(RB_ClientBankAccount_Extend model)
+        {
+            string where = " WHERE 1=1 ";
+            where += string.Format(" AND " + nameof(RB_ClientBankAccount.Status) + "={0} ", (int)DateStateEnum.Normal);
+            if (model.RB_Group_Id > 0)
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.RB_Group_Id) + "={0} ", model.RB_Group_Id);
+            }
+            if (model.RB_Branch_Id >= 0)
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.RB_Branch_Id) + "={0} ", model.RB_Branch_Id);
+            }
+            if (model.ID > 0)
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.ID) + "={0} ", model.ID);
+            }
+            if (!string.IsNullOrWhiteSpace(model.ClientIdStr))
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.ID) + " in({0}) ", model.ClientIdStr);
+            }
+            if (model.Type > 0)
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.Type) + "={0}", (int)model.Type);
+            }
+            if (model.ObjID > 0)
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.ObjID) + "={0}", model.ObjID);
+            }
+            if (!string.IsNullOrWhiteSpace(model.ObjIdStr)) {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.ObjID) + " in({0})", model.ObjIdStr);
+            }
+            if (!string.IsNullOrEmpty(model.AccountAlias))
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.AccountAlias) + " like '%{0}%'", model.AccountAlias);
+            }
+            if (!string.IsNullOrEmpty(model.CardNum))
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.CardNum) + " like '%{0}%' ", model.CardNum);
+            }
+
+            return Get<RB_ClientBankAccount_Extend>("select * from " + TableName + " " + where).ToList();
+        }
+    }
+}

Property.Repository/User/RB_Finance_ConfigRepository.cs

+using Dapper;
+using Property.Model.Entity;
+using Property.Model.Extend;
+using REBORN.Common.Enum;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Property.Repository
+{
+    /// <summary>
+    /// 财务流程费用配置仓储层
+    /// </summary>
+    public class RB_Finance_ConfigRepository : RepositoryBase<RB_Finance_Config>
+    {
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Finance_Config_ViewModel> GetList(RB_Finance_Config_ViewModel demodel)
+        {
+            string where = $@" 1=1 and Status =0";
+
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and {nameof(RB_Finance_Config_ViewModel.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (demodel.Type > 0)
+            {
+                where += $@" and {nameof(RB_Finance_Config_ViewModel.Type)} ={(int)demodel.Type}";
+            }
+
+            string sql = $@" select * from RB_Finance_Config where {where} order by Id desc";
+            return Get<RB_Finance_Config_ViewModel>(sql).ToList();
+        }
+    }
+}

Property.WebApi/Program.cs

@@ -20,15 +20,7 @@ namespace Property.WebApi
             Host.CreateDefaultBuilder(args)
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
-                    webBuilder.ConfigureKestrel((context, options) =>
-                    {
-                        options.AllowSynchronousIO = true;
-                        //设置应用服务器Kestrel请求体最大为50MB
-                        options.Limits.MaxRequestBodySize = 52428800;
-                        //解决并发异常
-                        options.Limits.MinRequestBodyDataRate = null;
-                    });
-                    webBuilder.UseStartup<Startup>().UseIIS();
+                    webBuilder.UseStartup<Startup>();
                 });
     }
 }

Property.WebApi/Startup.cs

@@ -56,7 +56,9 @@ namespace Property.WebApi
                 "http://localhost:8080",
                 "http://localhost:8081",
                 "http://localhost:8082",
+                "http://localhost:8181",
                 "http://zcedu.oytour.com",
+                "http://edu.oytour.com"
             };
             if (!string.IsNullOrEmpty(accessSiteStr))
             {

Property.WebApi/appsettings.json

 {
   "ConnectionStrings": {
-    "DefaultConnection": "server=192.168.1.214;port=3306;user id=reborn;password=Reborn@2018;database=reborn_user;CharSet=utf8; Convert Zero Datetime=true; ",
+    "DefaultConnection": "server=192.168.20.214;port=3306;user id=reborn;password=Reborn@2018;database=reborn_user;CharSet=utf8; Convert Zero Datetime=true; ",
     "DefaultConnectionPName": "MySql.Data.MySqlClient",
-    "PropertyConnection": "server=192.168.1.214;port=3306;user id=reborn;password=Reborn@2018;database=test_property;CharSet=utf8; Convert Zero Datetime=true; ",
+    "PropertyConnection": "server=192.168.20.214;port=3306;user id=reborn;password=Reborn@2018;database=test_property;CharSet=utf8; Convert Zero Datetime=true; ",
     "PropertyConnectionPName": "MySql.Data.MySqlClient",
-    "FinanceConnection": "server=192.168.1.214;port=3306;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8; Convert Zero Datetime=true; ",
+    "FinanceConnection": "server=192.168.20.214;port=3306;user id=reborn;password=Reborn@2018;database=test_reborn_finance;CharSet=utf8; Convert Zero Datetime=true; ",
     "FinanceConnectionPName": "MySql.Data.MySqlClient",
-    "LogConnection": "server=192.168.1.214;port=3306;user id=reborn;password=Reborn@2018;database=reborn_log;CharSet=utf8; Convert Zero Datetime=true; ",
+    "LogConnection": "server=192.168.2.214;port=3306;user id=reborn;password=Reborn@2018;database=reborn_log;CharSet=utf8; Convert Zero Datetime=true; ",
     "LogConnectionPName": "MySql.Data.MySqlClient",
-    "MallConnection": "server=192.168.1.214;user id=reborn;password=Reborn@2018;database=reborn_mall;CharSet=utf8; Convert Zero Datetime=true; ",
+    "MallConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_mall;CharSet=utf8; Convert Zero Datetime=true; ",
     "MallConnectionPName": "MySql.Data.MySqlClient",
-    "EduConnection": "server=192.168.1.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+    "EduConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
     "EduConnectionPName": "MySql.Data.MySqlClient"
   },
   "Logging": {
@@ -20,26 +20,27 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
-  "JwtSecretKey": "@VIITTOREBORN*2018123",
+  "JwtSecretKey": "@VIITTOREBORN*2018",
   "JwtExpirTime": 2592000,
   "ApiExpirTime": 2592000,
   "AdminId": 0,
   "AllowedHosts": "*",
   "OpenValidation": "False",
-  "UploadSiteUrl": "http://192.168.1.214:8120",
-  "ViewFileSiteUrl": "http://192.168.1.214:8130",
+  "UploadSiteUrl": "http://192.168.20.214:8120",
+  "ViewFileSiteUrl": "http://192.168.20.214:8130",
   "ImKey": "b612b31e837c79c68f141aeb719d2b20",
   "ImSecret": "66000451fb72",
   "FinanceKey": "FinanceMallInsertToERPViitto2020",
   "OutCurrencyId": 1,
-  "PaymentFinanceApi": "http://192.168.1.13:8083/api/Mall/InsertFinanceBatchForMallOut",
+  "PaymentFinanceApi": "http://192.168.20.9:8083/api/Mall/InsertFinanceBatchForMallOut",
   "ExpendDirector": 1756, //财务支出创建人
   "ExpendBranchId": 49, //财务支出创建人公司
   "ExpendDepartment": 331,
+  "ManagersId": 2611,
   "RedisSetting": {
-    "RedisServer": "192.168.1.214",
+    "RedisServer": "47.96.23.199",
     "RedisPort": "6379",
-    "RedisPwd": "123456"
+    "RedisPwd": "Viitto2018"
   },
   "accessSiteStr": "http://testzcys.oytour.com,http://testzc2erp.oytour.com,http://testzc3erp.oytour.com"
 }