From 3b9bf8c309d77d9817e973aa036e045695c78d70 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 26 七月 2021 16:17:45 +0800
Subject: [PATCH] 今日开发 加班申请· 统计报表：没有任何工作的人，不显示。显示人员的 部门 职位 姓名 工作时间 在计算考勤的时候只有有加班申请的加班才算加班
---
zhengcaioa/DTO/ProjectDTO.cs | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/DTO/ProjectDTO.cs b/zhengcaioa/DTO/ProjectDTO.cs
index ca5a709..e0262f0 100644
--- a/zhengcaioa/DTO/ProjectDTO.cs
+++ b/zhengcaioa/DTO/ProjectDTO.cs
@@ -19,6 +19,10 @@
public string Drhx { get; set; }
public string Drcunzai { get; set; }
public string DrhxPrice { get; set; }
+ public decimal? DrhxDefen { get; set; }
+ public string DrhxDefenName { get; set; }
+ public decimal? DshxDefen { get; set; }
+ public string DshxDefenName { get; set; }
public string Dshx { get; set; }
public string Dscunzai { get; set; }
public string DshxPrice { get; set; }
@@ -47,16 +51,20 @@
public string[] ZhongbiaoId { get; set; }
public string[] Names { get; set; }
public string[] Price { get; set; }
-
+ public decimal?[] Defen { get; set; }
+
public string NamesZhongbiao { get; set; }
public string Fblx { get; set; }
public string Fbyy { get; set; }
public string Caigourenname { get; set; }
+
+ public string Caigourennamecunzai { get; set; }
public string Caigourenaddress { get; set; }
public string Caigourencontact { get; set; }
public string Dailiname { get; set; }
+ public string Dailinamecunzai { get; set; }
public string Dailiaddress { get; set; }
public string Dailicontact { get; set; }
@@ -64,9 +72,12 @@
public List<Projectyouxiao> Projectyouxiaos { get; set; }
- public List<Projectzhongbiao> Projectzhongbiaos { get; set; }
+ public List<ProjectzhongbiaoDTO> Projectzhongbiaos { get; set; }
public string[] ZhuanjiaList { get; set; }
+
+ public decimal? Fencha { get; set; }
+ public int? Shuliang { get; set; }
}
public class ProjectDTOSearch : SearchEntity
@@ -101,5 +112,17 @@
public string ShiFouyReasonname { get; set; }
+ public string Fencha { get; set; }
+
+ public string Caigourenname { get; set; }
+
+ public string Dailiname { get; set; }
+
+ public string Shuliang { get; set; }
+
+ public string Fenchadayu { get; set; }
+
+ public string Baojiachaxiaoyu { get; set; }
+
}
}
--
Gitblit v1.9.1