From 760eede869d8bc0b1b5a4ff38b2d3d94f5e2cb86 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 04 八月 2021 14:29:15 +0800
Subject: [PATCH] 今日开发          专家派工-没有审批的专家不能派工   意向客户访问新增，短信发送不要红星   合作客户  在客户资料列表增加快捷访问链接                        工作报表  修改排版                        问题维护    试用法条  改为1000字， 问题查询打开直接默认未审核，不要停两秒再刷新   项目新增 增加字段：采购预算 万元   工作考评  考聘不称职当天无工资

---
 zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
index 48124d5..5247888 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
@@ -3505,18 +3505,20 @@
                     tongjibaobiaobaobiaoDTO.UserName = "";
                     if (deptDTO != null)
                     {
-                        tongjibaobiaobaobiaoDTO.UserName += "閮ㄩ棬锛�" + deptDTO.DeptName + "  ";
+                        tongjibaobiaobaobiaoDTO.UserName += "閮ㄩ棬锛�" + deptDTO.DeptName + "&nbsp&nbsp&nbsp&nbsp";
                     }
-                    tongjibaobiaobaobiaoDTO.UserName = "濮撳悕锛�" + userDTO.UserName + "  ";
+                    tongjibaobiaobaobiaoDTO.UserName += "濮撳悕锛�" + userDTO.UserName + "&nbsp&nbsp&nbsp&nbsp";
+
+                    tongjibaobiaobaobiaoDTO.UserDaka = ""; 
                     if (hrPositionDTO != null)
                     {
-                        tongjibaobiaobaobiaoDTO.UserName += "鑱屽姟锛�" + hrPositionDTO.PostName + "  ";
+                        tongjibaobiaobaobiaoDTO.UserDaka += "鑱屽姟锛�" + hrPositionDTO.PostName + "&nbsp&nbsp&nbsp&nbsp";
                     }
                     if (admSignInDTO != null)
                     {
-                        tongjibaobiaobaobiaoDTO.UserName += "鎵撳崱鏃堕棿锛氫笂鍗� " + (admSignInDTO.MorningIn.HasValue? admSignInDTO.MorningIn.Value.ToString("HH:mm:ss"):"") + "-" + (admSignInDTO.MorningOut.HasValue ? admSignInDTO.MorningOut.Value.ToString("HH:mm:ss") : "")
-                            + "涓嬪崍 " + (admSignInDTO.AfternoonIn.HasValue ? admSignInDTO.AfternoonIn.Value.ToString("HH:mm:ss") : "") + "-" + (admSignInDTO.AfternoonOut.HasValue ? admSignInDTO.AfternoonOut.Value.ToString("HH:mm:ss") : "")
-                              + "鍔犵彮 " + (admSignInDTO.OvertimeIn.HasValue ? admSignInDTO.OvertimeIn.Value.ToString("HH:mm:ss") : "") + "-" + (admSignInDTO.OvertimeOut.HasValue ? admSignInDTO.OvertimeOut.Value.ToString("HH:mm:ss") : "");
+                        tongjibaobiaobaobiaoDTO.UserDaka += "    鎵撳崱鏃堕棿锛氫笂鍗� " + (admSignInDTO.MorningIn.HasValue? admSignInDTO.MorningIn.Value.ToString("HH:mm:ss"):"") + "-" + (admSignInDTO.MorningOut.HasValue ? admSignInDTO.MorningOut.Value.ToString("HH:mm:ss") : "")
+                            + "&nbsp&nbsp&nbsp&nbsp涓嬪崍 " + (admSignInDTO.AfternoonIn.HasValue ? admSignInDTO.AfternoonIn.Value.ToString("HH:mm:ss") : "") + "-" + (admSignInDTO.AfternoonOut.HasValue ? admSignInDTO.AfternoonOut.Value.ToString("HH:mm:ss") : "")
+                              + (admSignInDTO.OvertimeIn.HasValue ? "    鍔犵彮 " + admSignInDTO.OvertimeIn.Value.ToString("HH:mm:ss") + "-" : "") + (admSignInDTO.OvertimeOut.HasValue ? admSignInDTO.OvertimeOut.Value.ToString("HH:mm:ss") : "");
                     }
 
                     tongjibaobiaobaobiaoDTOs.Add(tongjibaobiaobaobiaoDTO);

--
Gitblit v1.9.1