From 884e6a825427ef6511e7b7396635fe39c53f4fb4 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 15 六月 2021 09:57:00 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/Model/zhengcaioaContext.cs | 323 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 258 insertions(+), 65 deletions(-)
diff --git a/zhengcaioa/Model/zhengcaioaContext.cs b/zhengcaioa/Model/zhengcaioaContext.cs
index 90ed301..eef7cde 100644
--- a/zhengcaioa/Model/zhengcaioaContext.cs
+++ b/zhengcaioa/Model/zhengcaioaContext.cs
@@ -18,6 +18,8 @@
}
public virtual DbSet<AdmAskLeave> AdmAskLeaves { get; set; }
public virtual DbSet<AdmAskLeaveOff> AdmAskLeaveOffs { get; set; }
+ public virtual DbSet<AdmAttendance> AdmAttendances { get; set; }
+ public virtual DbSet<AdmAttendanceDtl> AdmAttendanceDtls { get; set; }
public virtual DbSet<AdmAttendanceRule> AdmAttendanceRules { get; set; }
public virtual DbSet<AdmAttendanceRulesDtl> AdmAttendanceRulesDtls { get; set; }
public virtual DbSet<AdmBreakPrecedent> AdmBreakPrecedents { get; set; }
@@ -108,79 +110,26 @@
.HasColumnName("creater")
.HasDefaultValueSql("('1')");
+ entity.Property(e => e.CreaterName)
+ .HasMaxLength(50)
+ .HasColumnName("createrName");
+
entity.Property(e => e.Createtime)
.HasColumnType("datetime")
.HasColumnName("createtime")
.HasDefaultValueSql("(getdate())");
+
+ entity.Property(e => e.EndPoint).HasMaxLength(50);
entity.Property(e => e.EndTime)
.HasColumnType("datetime")
- .HasDefaultValueSql("(getdate())")
- .HasComment("缁撴潫鏃堕棿");
-
- entity.Property(e => e.LaveDay).HasComment("璇峰亣澶�");
-
- entity.Property(e => e.LavehHour).HasComment("璇峰亣鏃�");
-
- entity.Property(e => e.Lavetype)
- .IsRequired()
- .HasMaxLength(50)
- .HasComment("璇峰亣绫诲瀷");
-
- 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.RecStatus)
- .IsRequired()
- .HasMaxLength(1)
- .HasColumnName("rec_status")
- .HasDefaultValueSql("('A')");
+ entity.Property(e => e.LaveDay).HasDefaultValueSql("((0))");
- entity.Property(e => e.Remark)
- .HasMaxLength(500)
- .HasComment("澶囨敞");
-
- entity.Property(e => e.SigninId).HasMaxLength(50);
-
- entity.Property(e => e.StratTime)
- .HasColumnType("datetime")
- .HasDefaultValueSql("(getdate())")
- .HasComment("寮�濮嬫椂闂�");
- });
-
- modelBuilder.Entity<AdmAskLeaveOff>(entity =>
- {
- entity.ToTable("ADM_AskLeaveOff");
-
- 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.EndTime).HasColumnType("datetime");
+ entity.Property(e => e.LavehHour).HasDefaultValueSql("((0))");
entity.Property(e => e.Lavetype).HasMaxLength(50);
-
- entity.Property(e => e.MedicalRecord)
- .HasMaxLength(200)
- .HasColumnName("MedicalRecord ")
- .HasComment("鐥呬緥");
entity.Property(e => e.Modifier)
.IsRequired()
@@ -201,11 +150,235 @@
entity.Property(e => e.Remark).HasMaxLength(500);
- entity.Property(e => e.SigninId)
+ entity.Property(e => e.ShenpiStatus)
+ .HasMaxLength(1)
+ .HasColumnName("shenpi_status");
+
+ entity.Property(e => e.SigninId).HasMaxLength(50);
+
+ entity.Property(e => e.StratPoint).HasMaxLength(50);
+
+ entity.Property(e => e.StratTime)
+ .HasColumnType("datetime")
+ .HasDefaultValueSql("(getdate())");
+
+ entity.Property(e => e.Tittle)
+ .HasMaxLength(100)
+ .HasColumnName("tittle");
+ });
+
+ modelBuilder.Entity<AdmAskLeaveOff>(entity =>
+ {
+ entity.ToTable("ADM_AskLeaveOff");
+
+ entity.Property(e => e.Id).HasMaxLength(50);
+
+ entity.Property(e => e.Creater)
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnName("creater")
+ .HasDefaultValueSql("('1')");
+
+ entity.Property(e => e.CreaterName)
+ .HasMaxLength(50)
+ .HasColumnName("createrName");
+
+ entity.Property(e => e.Createtime)
+ .HasColumnType("datetime")
+ .HasColumnName("createtime")
+ .HasDefaultValueSql("(getdate())");
+
+ entity.Property(e => e.EndPoint).HasMaxLength(50);
+
+ entity.Property(e => e.EndTime).HasColumnType("datetime");
+
+ entity.Property(e => e.Lavetype).HasMaxLength(50);
+
+ entity.Property(e => e.MedicalRecord)
+ .HasMaxLength(200)
+ .HasColumnName("MedicalRecord ");
+
+ 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.RecStatus)
+ .IsRequired()
+ .HasMaxLength(1)
+ .HasColumnName("rec_status")
+ .HasDefaultValueSql("('A')");
+
+ entity.Property(e => e.Remark).HasMaxLength(500);
+
+ entity.Property(e => e.ShenpiStatus)
+ .HasMaxLength(1)
+ .HasColumnName("shenpi_status");
+
+ entity.Property(e => e.SigninId).HasMaxLength(50);
+
+ entity.Property(e => e.StratPoint).HasMaxLength(50);
+
+ entity.Property(e => e.StratTime).HasColumnType("datetime");
+
+ entity.Property(e => e.Tittle)
+ .HasMaxLength(100)
+ .HasColumnName("tittle");
+ });
+
+ modelBuilder.Entity<AdmAttendance>(entity =>
+ {
+ entity.ToTable("ADM_Attendance");
+
+ entity.Property(e => e.Id).HasMaxLength(50);
+
+ entity.Property(e => e.Chidao)
+ .HasColumnType("decimal(18, 2)")
+ .HasColumnName("chidao");
+
+ 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.Islock)
+ .IsRequired()
+ .HasMaxLength(1)
+ .HasColumnName("islock")
+ .HasDefaultValueSql("('D')");
+
+ entity.Property(e => e.Jiaban)
+ .HasColumnType("decimal(18, 2)")
+ .HasColumnName("jiaban");
+
+ entity.Property(e => e.Kuanggong)
+ .HasColumnType("decimal(18, 2)")
+ .HasColumnName("kuanggong");
+
+ 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.Offdays)
+ .HasColumnType("decimal(18, 2)")
+ .HasColumnName("offdays");
+
+ entity.Property(e => e.Qingjia)
+ .HasColumnType("decimal(18, 2)")
+ .HasColumnName("qingjia");
+
+ entity.Property(e => e.RecStatus)
+ .IsRequired()
+ .HasMaxLength(1)
+ .HasColumnName("rec_status")
+ .HasDefaultValueSql("('A')");
+
+ entity.Property(e => e.Shijichuqin)
+ .HasColumnType("decimal(18, 2)")
+ .HasColumnName("shijichuqin");
+
+ entity.Property(e => e.Userid)
.IsRequired()
.HasMaxLength(50);
- entity.Property(e => e.StratTime).HasColumnType("datetime");
+ entity.Property(e => e.Xiaojia)
+ .HasColumnType("decimal(18, 2)")
+ .HasColumnName("xiaojia");
+
+ entity.Property(e => e.Year).HasColumnName("year");
+
+ entity.Property(e => e.Yingchuqin)
+ .HasColumnType("decimal(18, 2)")
+ .HasColumnName("yingchuqin");
+
+ entity.Property(e => e.Zaotui)
+ .HasColumnType("decimal(18, 2)")
+ .HasColumnName("zaotui");
+ });
+
+ modelBuilder.Entity<AdmAttendanceDtl>(entity =>
+ {
+ entity.ToTable("ADM_Attendance_dtl");
+
+ entity.Property(e => e.Id).HasMaxLength(50);
+
+ entity.Property(e => e.AfternoonIn).HasColumnType("datetime");
+
+ entity.Property(e => e.AfternoonOut).HasColumnType("datetime");
+
+ entity.Property(e => e.AttendanceId)
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnName("attendance_id");
+
+ 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.Modifier)
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnName("modifier")
+ .HasDefaultValueSql("('1')");
+
+ entity.Property(e => e.Modifytime)
+ .HasColumnType("datetime")
+ .HasColumnName("modifytime")
+ .HasDefaultValueSql("(getdate())");
+
+ entity.Property(e => e.MorningIn).HasColumnType("datetime");
+
+ entity.Property(e => e.MorningOut).HasColumnType("datetime");
+
+ entity.Property(e => e.OvertimeIn).HasColumnType("datetime");
+
+ entity.Property(e => e.OvertimeOut).HasColumnType("datetime");
+
+ entity.Property(e => e.Qingjia)
+ .HasColumnType("decimal(18, 2)")
+ .HasColumnName("qingjia");
+
+ entity.Property(e => e.RecStatus)
+ .IsRequired()
+ .HasMaxLength(1)
+ .HasColumnName("rec_status")
+ .HasDefaultValueSql("('A')");
+
+ entity.Property(e => e.SgninDate)
+ .HasColumnType("datetime")
+ .HasDefaultValueSql("(getdate())");
+
+ entity.Property(e => e.Xiaojia)
+ .HasColumnType("decimal(18, 2)")
+ .HasColumnName("xiaojia");
});
modelBuilder.Entity<AdmAttendanceRule>(entity =>
@@ -385,11 +558,11 @@
.HasDefaultValueSql("('A')");
entity.Property(e => e.ValueEnd)
- .HasMaxLength(50)
+ .HasColumnType("datetime")
.HasColumnName("value_end");
entity.Property(e => e.ValueStart)
- .HasMaxLength(50)
+ .HasColumnType("datetime")
.HasColumnName("value_start");
});
@@ -1598,6 +1771,8 @@
entity.Property(e => e.Id).HasMaxLength(50);
entity.Property(e => e.AccountId).HasMaxLength(50);
+
+ entity.Property(e => e.AccountMoney).HasColumnType("money");
entity.Property(e => e.Creater)
.IsRequired()
@@ -3119,6 +3294,24 @@
.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)
.HasColumnName("jg")
--
Gitblit v1.9.1