From 11e11a51839529b17f70927524e086e90adf692d Mon Sep 17 00:00:00 2001 From: LR-20210131IOQH\Administrator <jackcold@163.com> Date: 星期二, 10 八月 2021 15:31:19 +0800 Subject: [PATCH] 工资核对修改 --- zhengcaioa/Model/zhengcaioaContext.cs | 395 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 366 insertions(+), 29 deletions(-) diff --git a/zhengcaioa/Model/zhengcaioaContext.cs b/zhengcaioa/Model/zhengcaioaContext.cs index eef7cde..e283224 100644 --- a/zhengcaioa/Model/zhengcaioaContext.cs +++ b/zhengcaioa/Model/zhengcaioaContext.cs @@ -16,6 +16,15 @@ : base(options) { } + + public virtual DbSet<SimBind> SimBind { get; set; } + public virtual DbSet<SimBindView> SimBindView { get; set; } + public virtual DbSet<SimCost> SimCost { get; set; } + public virtual DbSet<SimCostView> SimCostView { get; set; } + public virtual DbSet<HrSalaryAppeal> HrSalaryAppeal { get; set; } + public virtual DbSet<SimCostYearView> SimCostYearView { get; set; } + + public virtual DbSet<AdmAskLeave> AdmAskLeaves { get; set; } public virtual DbSet<AdmAskLeaveOff> AdmAskLeaveOffs { get; set; } public virtual DbSet<AdmAttendance> AdmAttendances { get; set; } @@ -50,7 +59,10 @@ public virtual DbSet<GroupTopic> GroupTopics { get; set; } public virtual DbSet<GroupTuiguang> GroupTuiguangs { get; set; } public virtual DbSet<HrDept> HrDepts { get; set; } + public virtual DbSet<HrJibengongzi> HrJibengongzis { get; set; } + public virtual DbSet<HrJixiaoticheng> HrJixiaotichengs { get; set; } public virtual DbSet<HrPosition> HrPositions { get; set; } + public virtual DbSet<HrSalary> HrSalaries { get; set; } public virtual DbSet<IntentionCustomer> IntentionCustomers { get; set; } public virtual DbSet<IntentionOrder> IntentionOrders { get; set; } public virtual DbSet<IntentionVisit> IntentionVisits { get; set; } @@ -239,7 +251,7 @@ entity.Property(e => e.Id).HasMaxLength(50); entity.Property(e => e.Chidao) - .HasColumnType("decimal(18, 2)") + .HasColumnType("decimal(18, 4)") .HasColumnName("chidao"); entity.Property(e => e.Creater) @@ -260,11 +272,11 @@ .HasDefaultValueSql("('D')"); entity.Property(e => e.Jiaban) - .HasColumnType("decimal(18, 2)") + .HasColumnType("decimal(18, 4)") .HasColumnName("jiaban"); entity.Property(e => e.Kuanggong) - .HasColumnType("decimal(18, 2)") + .HasColumnType("decimal(18, 4)") .HasColumnName("kuanggong"); entity.Property(e => e.Modifier) @@ -281,11 +293,11 @@ entity.Property(e => e.Month).HasColumnName("month"); entity.Property(e => e.Offdays) - .HasColumnType("decimal(18, 2)") + .HasColumnType("decimal(18, 4)") .HasColumnName("offdays"); entity.Property(e => e.Qingjia) - .HasColumnType("decimal(18, 2)") + .HasColumnType("decimal(18, 4)") .HasColumnName("qingjia"); entity.Property(e => e.RecStatus) @@ -295,7 +307,7 @@ .HasDefaultValueSql("('A')"); entity.Property(e => e.Shijichuqin) - .HasColumnType("decimal(18, 2)") + .HasColumnType("decimal(18, 4)") .HasColumnName("shijichuqin"); entity.Property(e => e.Userid) @@ -303,17 +315,17 @@ .HasMaxLength(50); entity.Property(e => e.Xiaojia) - .HasColumnType("decimal(18, 2)") + .HasColumnType("decimal(18, 4)") .HasColumnName("xiaojia"); entity.Property(e => e.Year).HasColumnName("year"); entity.Property(e => e.Yingchuqin) - .HasColumnType("decimal(18, 2)") + .HasColumnType("decimal(18, 4)") .HasColumnName("yingchuqin"); entity.Property(e => e.Zaotui) - .HasColumnType("decimal(18, 2)") + .HasColumnType("decimal(18, 4)") .HasColumnName("zaotui"); }); @@ -343,6 +355,14 @@ .HasColumnName("createtime") .HasDefaultValueSql("(getdate())"); + entity.Property(e => e.Iswork) + .HasMaxLength(1) + .HasColumnName("iswork"); + + entity.Property(e => e.Kuanggongtianshu) + .HasColumnType("decimal(18, 4)") + .HasColumnName("kuanggongtianshu"); + entity.Property(e => e.Modifier) .IsRequired() .HasMaxLength(50) @@ -363,7 +383,7 @@ entity.Property(e => e.OvertimeOut).HasColumnType("datetime"); entity.Property(e => e.Qingjia) - .HasColumnType("decimal(18, 2)") + .HasColumnType("decimal(18, 4)") .HasColumnName("qingjia"); entity.Property(e => e.RecStatus) @@ -376,9 +396,25 @@ .HasColumnType("datetime") .HasDefaultValueSql("(getdate())"); + entity.Property(e => e.Shangwuchidaofenzhong) + .HasColumnType("decimal(18, 4)") + .HasColumnName("shangwuchidaofenzhong"); + + entity.Property(e => e.Shangwuzaotuifenzhong) + .HasColumnType("decimal(18, 4)") + .HasColumnName("shangwuzaotuifenzhong"); + entity.Property(e => e.Xiaojia) - .HasColumnType("decimal(18, 2)") + .HasColumnType("decimal(18, 4)") .HasColumnName("xiaojia"); + + entity.Property(e => e.Xiawuchidaofenzhong) + .HasColumnType("decimal(18, 4)") + .HasColumnName("xiawuchidaofenzhong"); + + entity.Property(e => e.Xiawuzaotuifenzhong) + .HasColumnType("decimal(18, 4)") + .HasColumnName("xiawuzaotuifenzhong"); }); modelBuilder.Entity<AdmAttendanceRule>(entity => @@ -2468,6 +2504,140 @@ .HasColumnName("superior_top"); }); + modelBuilder.Entity<HrJibengongzi>(entity => + { + entity.ToTable("hr_jibengongzi"); + + entity.Property(e => e.Id).HasMaxLength(50); + + entity.Property(e => e.Baomifei) + .HasColumnType("money") + .HasColumnName("baomifei"); + + entity.Property(e => e.Creater) + .IsRequired() + .HasMaxLength(50) + .HasColumnName("creater") + .HasDefaultValueSql("('1')"); + + entity.Property(e => e.Createtime) + .HasColumnType("datetime") + .HasColumnName("createtime") + .HasDefaultValueSql("(getdate())"); + + entity.Property(e => e.Dianhuabutie) + .HasMaxLength(50) + .HasColumnName("dianhuabutie"); + + entity.Property(e => e.Effecttime) + .HasColumnType("datetime") + .HasColumnName("effecttime"); + + entity.Property(e => e.Jiaotongbutie) + .HasColumnType("money") + .HasColumnName("jiaotongbutie"); + + entity.Property(e => e.Jibengongzi) + .HasColumnType("money") + .HasColumnName("jibengongzi"); + + entity.Property(e => e.Modifier) + .IsRequired() + .HasMaxLength(50) + .HasColumnName("modifier") + .HasDefaultValueSql("('1')"); + + entity.Property(e => e.Modifytime) + .HasColumnType("datetime") + .HasColumnName("modifytime") + .HasDefaultValueSql("(getdate())"); + + entity.Property(e => e.PostId) + .HasMaxLength(50) + .HasColumnName("post_id"); + + entity.Property(e => e.Quanqingjiang) + .HasColumnType("money") + .HasColumnName("quanqingjiang"); + + entity.Property(e => e.RecStatus) + .IsRequired() + .HasMaxLength(1) + .HasColumnName("rec_status") + .HasDefaultValueSql("('A')"); + + entity.Property(e => e.Shebaodanwei) + .HasColumnType("money") + .HasColumnName("shebaodanwei"); + + entity.Property(e => e.Shebaogeren) + .HasColumnType("money") + .HasColumnName("shebaogeren"); + }); + + modelBuilder.Entity<HrJixiaoticheng>(entity => + { + entity.ToTable("hr_jixiaoticheng"); + + entity.Property(e => e.Id).HasMaxLength(50); + + entity.Property(e => e.Creater) + .IsRequired() + .HasMaxLength(50) + .HasColumnName("creater") + .HasDefaultValueSql("('1')"); + + entity.Property(e => e.Createtime) + .HasColumnType("datetime") + .HasColumnName("createtime") + .HasDefaultValueSql("(getdate())"); + + entity.Property(e => e.Effecttime) + .HasColumnType("datetime") + .HasColumnName("effecttime"); + + entity.Property(e => e.Modifier) + .IsRequired() + .HasMaxLength(50) + .HasColumnName("modifier") + .HasDefaultValueSql("('1')"); + + entity.Property(e => e.Modifytime) + .HasColumnType("datetime") + .HasColumnName("modifytime") + .HasDefaultValueSql("(getdate())"); + + entity.Property(e => e.PiecerateId) + .HasMaxLength(50) + .HasColumnName("piecerate_id"); + + entity.Property(e => e.PostId) + .HasMaxLength(50) + .HasColumnName("post_id"); + + entity.Property(e => e.RecStatus) + .IsRequired() + .HasMaxLength(1) + .HasColumnName("rec_status") + .HasDefaultValueSql("('A')"); + + entity.Property(e => e.Renwu) + .HasColumnType("money") + .HasColumnName("renwu"); + + entity.Property(e => e.Renwustandard) + .HasMaxLength(50) + .HasColumnName("renwustandard"); + + entity.Property(e => e.Ticheng) + .HasColumnType("money") + .HasColumnName("ticheng"); + + entity.Property(e => e.Tichengstandard) + .HasMaxLength(50) + .HasColumnName("tichengstandard"); + }); + modelBuilder.Entity<HrPosition>(entity => { entity.ToTable("hr_position"); @@ -2511,6 +2681,139 @@ .HasMaxLength(1) .HasColumnName("rec_status") .HasDefaultValueSql("('A')"); + }); + + modelBuilder.Entity<HrSalary>(entity => + { + entity.ToTable("hr_salary"); + + entity.Property(e => e.Id).HasMaxLength(50); + + entity.Property(e => e.Baomifei) + .HasColumnType("decimal(18, 4)") + .HasColumnName("baomifei"); + + entity.Property(e => e.Bufagongzi) + .HasColumnType("decimal(18, 4)") + .HasColumnName("bufagongzi"); + + entity.Property(e => e.Creater) + .IsRequired() + .HasMaxLength(50) + .HasColumnName("creater") + .HasDefaultValueSql("('1')"); + + entity.Property(e => e.Createtime) + .HasColumnType("datetime") + .HasColumnName("createtime") + .HasDefaultValueSql("(getdate())"); + + entity.Property(e => e.Daozhanggongzi) + .HasColumnType("decimal(18, 4)") + .HasColumnName("daozhanggongzi"); + + entity.Property(e => e.Dianhuabutie) + .HasColumnType("decimal(18, 4)") + .HasColumnName("dianhuabutie"); + + entity.Property(e => e.Dianhuafei) + .HasColumnType("decimal(18, 4)") + .HasColumnName("dianhuafei"); + + entity.Property(e => e.Fakuan) + .HasColumnType("decimal(18, 4)") + .HasColumnName("fakuan"); + + entity.Property(e => e.Geshui) + .HasColumnType("decimal(18, 4)") + .HasColumnName("geshui"); + + entity.Property(e => e.Gongzuobutie) + .HasColumnType("decimal(18, 4)") + .HasColumnName("gongzuobutie"); + + entity.Property(e => e.Islock) + .IsRequired() + .HasMaxLength(1) + .HasColumnName("islock") + .HasDefaultValueSql("('D')"); + + entity.Property(e => e.Jiabangongzi) + .HasColumnType("decimal(18, 4)") + .HasColumnName("jiabangongzi"); + + entity.Property(e => e.Jiangjin) + .HasColumnType("decimal(18, 4)") + .HasColumnName("jiangjin"); + + entity.Property(e => e.Jiaotngbutie) + .HasColumnType("decimal(18, 4)") + .HasColumnName("jiaotngbutie"); + + entity.Property(e => e.Jibengongzi) + .HasColumnType("decimal(18, 4)") + .HasColumnName("jibengongzi"); + + entity.Property(e => e.Jiucuo) + .HasColumnType("decimal(18, 4)") + .HasColumnName("jiucuo"); + + entity.Property(e => e.Jixiaoticheng) + .HasColumnType("decimal(18, 4)") + .HasColumnName("jixiaoticheng"); + + entity.Property(e => e.Modifier) + .IsRequired() + .HasMaxLength(50) + .HasColumnName("modifier") + .HasDefaultValueSql("('1')"); + + entity.Property(e => e.Modifytime) + .HasColumnType("datetime") + .HasColumnName("modifytime") + .HasDefaultValueSql("(getdate())"); + + entity.Property(e => e.Month).HasColumnName("month"); + + entity.Property(e => e.Peichang) + .HasColumnType("decimal(18, 4)") + .HasColumnName("peichang"); + + entity.Property(e => e.Quanqinjiang) + .HasColumnType("decimal(18, 4)") + .HasColumnName("quanqinjiang"); + + entity.Property(e => e.Queqin) + .HasColumnType("decimal(18, 4)") + .HasColumnName("queqin"); + + entity.Property(e => e.RecStatus) + .IsRequired() + .HasMaxLength(1) + .HasColumnName("rec_status") + .HasDefaultValueSql("('A')"); + + entity.Property(e => e.Shebao) + .HasColumnType("decimal(18, 4)") + .HasColumnName("shebao"); + + entity.Property(e => e.Shebaokou) + .HasColumnType("decimal(18, 4)") + .HasColumnName("shebaokou"); + + entity.Property(e => e.Userid) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Year).HasColumnName("year"); + + entity.Property(e => e.Yufagongzi) + .HasColumnType("decimal(18, 4)") + .HasColumnName("yufagongzi"); + + entity.Property(e => e.Yufagongziheji) + .HasColumnType("decimal(18, 4)") + .HasColumnName("yufagongziheji"); }); modelBuilder.Entity<IntentionCustomer>(entity => @@ -3206,11 +3509,23 @@ entity.Property(e => e.Id).HasMaxLength(50); + entity.Property(e => e.advancewages) + .HasColumnType("decimal(10, 2)") + .HasColumnName("advancewages"); + entity.Property(e => e.BasicPrice) .HasMaxLength(500) .HasColumnName("basic_price") .HasDefaultValueSql("('')") .HasComment("钖祫寰呴亣"); + + entity.Property(e => e.baomisalary) + .HasColumnType("decimal(10, 2)") + .HasColumnName("baomisalary"); + + entity.Property(e => e.Beizhu) + .HasMaxLength(500) + .HasColumnName("beizhu"); entity.Property(e => e.Birthday) .HasColumnType("datetime") @@ -3244,6 +3559,10 @@ .HasMaxLength(50) .HasColumnName("email"); + entity.Property(e => e.geshuiqizheng) + .HasColumnType("decimal(10, 2)") + .HasColumnName("geshuiqizheng"); + entity.Property(e => e.HjAddress) .HasMaxLength(500) .HasColumnName("hj_address") @@ -3274,6 +3593,10 @@ .HasDefaultValueSql("(getdate())") .HasComment("鍚敤鏃堕棿"); + entity.Property(e => e.IpMac) + .HasMaxLength(30) + .HasColumnName("ipmac"); + entity.Property(e => e.IsGmsb) .HasMaxLength(1) .HasColumnName("is_gmsb") @@ -3288,29 +3611,23 @@ .HasDefaultValueSql("('')") .HasComment("宸茬璁㈠悎鍚�"); + entity.Property(e => e.Istravelsubsidy) + .HasMaxLength(1) + .HasColumnName("is_travelsubsidy"); + + entity.Property(e => e.Iswdenter) + .HasMaxLength(1) + .HasColumnName("is_wdenter"); + + entity.Property(e => e.Isxmenter) + .HasMaxLength(1) + .HasColumnName("is_xmenter"); + entity.Property(e => e.IsYwjl) .HasMaxLength(1) .HasColumnName("is_ywjl") .HasDefaultValueSql("('')") .HasComment("鏄笟鍔$粡鐞�"); - - entity.Property(e => e.Isxmenter) - .HasMaxLength(1) - .HasColumnName("is_xmenter") - .HasDefaultValueSql("('')") - .HasComment("鏄」鐩綍鍏�"); - - entity.Property(e => e.Iswdenter) - .HasMaxLength(1) - .HasColumnName("is_wdenter") - .HasDefaultValueSql("('')") - .HasComment("鏄棶绛斿綍鍏�"); - - entity.Property(e => e.Istravelsubsidy) - .HasMaxLength(1) - .HasColumnName("is_travelsubsidy") - .HasDefaultValueSql("('')") - .HasComment("鏈変氦閫氳ˉ璐�"); entity.Property(e => e.Jg) .HasMaxLength(500) @@ -3318,9 +3635,17 @@ .HasDefaultValueSql("('')") .HasComment("绫嶈疮"); + entity.Property(e => e.jibensalary) + .HasColumnType("decimal(10, 2)") + .HasColumnName("jibensalary"); + entity.Property(e => e.Jinji).HasMaxLength(50); entity.Property(e => e.JinjiPhone).HasMaxLength(50); + + entity.Property(e => e.jintiesalary) + .HasColumnType("decimal(10, 2)") + .HasColumnName("jintiesalary"); entity.Property(e => e.JzAddress) .HasMaxLength(500) @@ -3335,6 +3660,10 @@ .HasColumnName("length_price") .HasDefaultValueSql("('')") .HasComment("宸ラ緞宸ヨ祫锛屽叆鑱屾弧涓�骞寸殑涓嬩竴涓湀鍙韩鍙�"); + + entity.Property(e => e.miniyearsalary) + .HasColumnType("decimal(10, 2)") + .HasColumnName("miniyearsalary"); entity.Property(e => e.Modifier) .IsRequired() @@ -3397,6 +3726,10 @@ entity.Property(e => e.School).HasMaxLength(50); + entity.Property(e => e.senioritywages) + .HasColumnType("decimal(10, 2)") + .HasColumnName("senioritywages"); + entity.Property(e => e.Sex) .HasMaxLength(1) .HasColumnName("sex") @@ -3440,6 +3773,10 @@ .HasMaxLength(2) .HasColumnName("user_type"); + entity.Property(e => e.Usernumber) + .HasMaxLength(30) + .HasColumnName("usernumber"); + entity.Property(e => e.Weixin).HasMaxLength(50); entity.Property(e => e.Zhengzhi).HasMaxLength(50); -- Gitblit v1.9.1