From 2369258bc0b452cf3cab2dd5e8e2d9fde112b8d0 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 26 七月 2021 16:17:25 +0800
Subject: [PATCH] 今日开发 加班申请· 统计报表：没有任何工作的人，不显示。显示人员的 部门 职位 姓名 工作时间 在计算考勤的时候只有有加班申请的加班才算加班
---
zhengcaioa/zhengcaioa/Views/TongjiBaoBiao/Index.cshtml | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Views/TongjiBaoBiao/Index.cshtml b/zhengcaioa/zhengcaioa/Views/TongjiBaoBiao/Index.cshtml
index d498739..a035ede 100644
--- a/zhengcaioa/zhengcaioa/Views/TongjiBaoBiao/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/TongjiBaoBiao/Index.cshtml
@@ -270,11 +270,11 @@
<tr>
<td>@(i+1)</td>
<td>@tuiguangDTOs[i].gongzuo</td>
- <td>@(tuiguangDTOs[i].benyueshuliang=="0"?"":tuiguangDTOs[i].benyueshuliang)</td>
- <td>@(tuiguangDTOs[i].benyueqingkuang=="0"?"":tuiguangDTOs[i].benyueqingkuang)</td>
- <td>@(tuiguangDTOs[i].benrishuliang=="0"?"":tuiguangDTOs[i].benrishuliang)</td>
- <td>@(tuiguangDTOs[i].benriqingkuang=="0"?"":tuiguangDTOs[i].benriqingkuang)</td>
- <td>@(tuiguangDTOs[i].dangrijixiao=="0"?"":tuiguangDTOs[i].dangrijixiao)</td>
+ <td>@(tuiguangDTOs[i].benyueshuliang == null || tuiguangDTOs[i].benyueshuliang=="0"?"":tuiguangDTOs[i].benyueshuliang)</td>
+ <td>@(tuiguangDTOs[i].benyueqingkuang == null || tuiguangDTOs[i].benyueqingkuang=="0"?"":tuiguangDTOs[i].benyueqingkuang)</td>
+ <td>@(tuiguangDTOs[i].benrishuliang == null || tuiguangDTOs[i].benrishuliang=="0"?"":tuiguangDTOs[i].benrishuliang)</td>
+ <td>@(tuiguangDTOs[i].benriqingkuang == null || tuiguangDTOs[i].benriqingkuang=="0"?"":tuiguangDTOs[i].benriqingkuang)</td>
+ <td>@(tuiguangDTOs[i].dangrijixiao == null || tuiguangDTOs[i].dangrijixiao=="0"?"":tuiguangDTOs[i].dangrijixiao)</td>
</tr>
}
}
@@ -333,11 +333,11 @@
<tr>
<td>@(i+1)</td>
<td>@baifangkehuDTOs[i].gongzuo</td>
- <td>@(baifangkehuDTOs[i].benyueshuliang=="0"?"": baifangkehuDTOs[i].benyueshuliang)</td>
- <td>@(baifangkehuDTOs[i].benyueqingkuang=="0"?"": baifangkehuDTOs[i].benyueqingkuang)</td>
- <td>@(baifangkehuDTOs[i].benrishuliang=="0"?"": baifangkehuDTOs[i].benrishuliang)</td>
- <td>@(baifangkehuDTOs[i].benriqingkuang=="0"?"": baifangkehuDTOs[i].benriqingkuang)</td>
- <td>@(baifangkehuDTOs[i].dangrijixiao=="0"?"": baifangkehuDTOs[i].dangrijixiao)</td>
+ <td>@(baifangkehuDTOs[i].benyueshuliang == null || baifangkehuDTOs[i].benyueshuliang=="0"?"": baifangkehuDTOs[i].benyueshuliang)</td>
+ <td>@(baifangkehuDTOs[i].benyueqingkuang == null || baifangkehuDTOs[i].benyueqingkuang=="0"?"": baifangkehuDTOs[i].benyueqingkuang)</td>
+ <td>@(baifangkehuDTOs[i].benrishuliang == null || baifangkehuDTOs[i].benrishuliang=="0"?"": baifangkehuDTOs[i].benrishuliang)</td>
+ <td>@(baifangkehuDTOs[i].benriqingkuang == null || baifangkehuDTOs[i].benriqingkuang=="0"?"": baifangkehuDTOs[i].benriqingkuang)</td>
+ <td>@(baifangkehuDTOs[i].dangrijixiao == null || baifangkehuDTOs[i].dangrijixiao=="0"?"": baifangkehuDTOs[i].dangrijixiao)</td>
</tr>
}
}
@@ -398,10 +398,10 @@
<td>@(i+1)</td>
<td>@dingdanDTOs[i].dingdanbianhao</td>
<td>@dingdanDTOs[i].dingdanmingcheng</td>
- <td>@(dingdanDTOs[i].danjia == "0"?"": dingdanDTOs[i].danjia)</td>
- <td>@(dingdanDTOs[i].shuliang == "0"?"": dingdanDTOs[i].shuliang)</td>
- <td>@(dingdanDTOs[i].jine == "0"?"": dingdanDTOs[i].jine)</td>
- <td>@(dingdanDTOs[i].benyueleijijine == "0"?"": dingdanDTOs[i].benyueleijijine)</td>
+ <td>@(dingdanDTOs[i].danjia == null || dingdanDTOs[i].danjia == "0"?"": dingdanDTOs[i].danjia)</td>
+ <td>@(dingdanDTOs[i].shuliang == null || dingdanDTOs[i].shuliang == "0"?"": dingdanDTOs[i].shuliang)</td>
+ <td>@(dingdanDTOs[i].jine == null || dingdanDTOs[i].jine == "0"?"": dingdanDTOs[i].jine)</td>
+ <td>@(dingdanDTOs[i].benyueleijijine == null || dingdanDTOs[i].benyueleijijine == "0"?"": dingdanDTOs[i].benyueleijijine)</td>
</tr>
}
}
@@ -454,9 +454,9 @@
<tr>
<td>@(i+1)</td>
<td>@ziliaoweihuDTOs[i].gongzuo</td>
- <td>@(ziliaoweihuDTOs[i].benyueshuliang=="0"?"": ziliaoweihuDTOs[i].benyueshuliang)</td>
- <td>@(ziliaoweihuDTOs[i].benrishuliang=="0"?"": ziliaoweihuDTOs[i].benrishuliang)</td>
- <td>@(ziliaoweihuDTOs[i].dangrijixiao=="0"?"": ziliaoweihuDTOs[i].dangrijixiao)</td>
+ <td>@(ziliaoweihuDTOs[i].benyueshuliang == null || ziliaoweihuDTOs[i].benyueshuliang=="0"?"": ziliaoweihuDTOs[i].benyueshuliang)</td>
+ <td>@(ziliaoweihuDTOs[i].benrishuliang == null || ziliaoweihuDTOs[i].benrishuliang=="0"?"": ziliaoweihuDTOs[i].benrishuliang)</td>
+ <td>@(ziliaoweihuDTOs[i].dangrijixiao == null || ziliaoweihuDTOs[i].dangrijixiao=="0"?"": ziliaoweihuDTOs[i].dangrijixiao)</td>
</tr>
}
}
@@ -512,9 +512,9 @@
<tr>
<td>@(i+1)</td>
<td>@xiangmushishiDTOs[i].gongzuo</td>
- <td>@(xiangmushishiDTOs[i].benyueshuliang=="0"?"": xiangmushishiDTOs[i].benyueshuliang)</td>
- <td>@(xiangmushishiDTOs[i].benrishuliang=="0"?"": xiangmushishiDTOs[i].benrishuliang)</td>
- <td>@(xiangmushishiDTOs[i].dangrijixiao=="0"?"": xiangmushishiDTOs[i].dangrijixiao)</td>
+ <td>@(xiangmushishiDTOs[i].benyueshuliang == null || xiangmushishiDTOs[i].benyueshuliang=="0"?"": xiangmushishiDTOs[i].benyueshuliang)</td>
+ <td>@(xiangmushishiDTOs[i].benrishuliang == null || xiangmushishiDTOs[i].benrishuliang=="0"?"": xiangmushishiDTOs[i].benrishuliang)</td>
+ <td>@(xiangmushishiDTOs[i].dangrijixiao == null || xiangmushishiDTOs[i].dangrijixiao=="0"?"": xiangmushishiDTOs[i].dangrijixiao)</td>
</tr>
}
}
--
Gitblit v1.9.1