From bf14008acffe7a9a7ac6e2eeb38ce3552b71b33a Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 14 三月 2023 13:43:30 +0800
Subject: [PATCH] 提交
---
zhengcaioa/Services/ProjectService.cs | 10 +++++
zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs | 19 ++++++---
zhengcaioa/zhengcaioa/Views/Project/ADDZhengfuProject.cshtml | 22 +++++-----
zhengcaioa/IServices/IProjectService.cs | 2 +
zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs | 2
zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs | 12 +++--
6 files changed, 43 insertions(+), 24 deletions(-)
diff --git a/zhengcaioa/IServices/IProjectService.cs b/zhengcaioa/IServices/IProjectService.cs
index cf26498..5ee4f55 100644
--- a/zhengcaioa/IServices/IProjectService.cs
+++ b/zhengcaioa/IServices/IProjectService.cs
@@ -40,6 +40,8 @@
List<ProjectDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax);
+ List<ZhengfuProjectDTO> GetListsalaryzhengfu(string userid, DateTime datemin, DateTime datemax);
+
List<ZhengfuProjectDTO> GetcaigougonggaoListsalary(string userid, DateTime datemin, DateTime datemax);
ResultEntity saveZxdsfxl(ZxdsfxlDTO zxdsfxl);
diff --git a/zhengcaioa/Services/ProjectService.cs b/zhengcaioa/Services/ProjectService.cs
index 089febc..89a6f22 100644
--- a/zhengcaioa/Services/ProjectService.cs
+++ b/zhengcaioa/Services/ProjectService.cs
@@ -884,6 +884,16 @@
return list;
}
+ public List<ZhengfuProjectDTO> GetListsalaryzhengfu(string userid, DateTime datemin, DateTime datemax)
+ {
+
+
+ var listPosition = _webcontext.ZhengfuProjects.Where(r => r.RecStatus == "A" && r.Creater == userid && r.Createtime >= datemin && r.Createtime < datemax).ToList();
+
+ var list = _mapper.Map<List<ZhengfuProjectDTO>>(listPosition);
+ return list;
+ }
+
public List<ZhengfuProjectDTO> GetcaigougonggaoListsalary(string userid, DateTime datemin, DateTime datemax)
{
diff --git a/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs b/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
index 75dc652..fb87020 100644
--- a/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
@@ -1021,7 +1021,7 @@
}
//閿�鍋囧繀椤讳笁澶╀互鍐�
- if (leaveOff.StratTime.Value.Date < DateTime.Now.Date.AddDays(-3))
+ if (leaveOff.StratTime.Value.Date < DateTime.Now.Date.AddDays(-4))
{
resultEntity.Result = false;
resultEntity.Message = "璇峰湪72灏忔椂鍐呰繘琛岄攢鍋囧鐞嗭紝瓒呰繃72灏忔椂鏃犳硶鎻愪氦";
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
index 1881378..f83cc95 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
@@ -201,10 +201,13 @@
xiangmuDTO.gongzuo = "閲囪喘椤圭洰褰曞叆";
//鏈湀鏁伴噺
var projectDTOsyue = _projectService.GetListsalary(curentuser.Id, dateminkaoqin, datemaxkaoqin);
- xiangmuDTO.benyueshuliang = projectDTOsyue.Count.ToString();
+ var zhengfuprojectDTOsyue = _projectService.GetListsalaryzhengfu(curentuser.Id, dateminkaoqin, datemaxkaoqin);
+
+ xiangmuDTO.benyueshuliang = (projectDTOsyue.Count+ zhengfuprojectDTOsyue .Count).ToString();
//鏈棩鏁伴噺
var projectDTOsri = projectDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
- xiangmuDTO.benrishuliang = projectDTOsri.Count.ToString();
+ var zhengfuprojectDTOsri = zhengfuprojectDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
+ xiangmuDTO.benrishuliang = (projectDTOsri.Count+ zhengfuprojectDTOsri.Count).ToString();
var jijianixiangmu = fiPiecerateDTOs.Where(x => x.Project == "閲囪喘椤圭洰褰曞叆").FirstOrDefault();
@@ -221,7 +224,7 @@
xiangmuDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
if (jixiaotichengfangan.Tichengstandard == "01")
{
- decimal youxiaojijian = projectDTOsri.Count - jixiaotichengfangan.Renwu.Value;
+ decimal youxiaojijian = projectDTOsri.Count+ zhengfuprojectDTOsri.Count - jixiaotichengfangan.Renwu.Value;
if (youxiaojijian > 0)
{
xiangmuDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
@@ -244,7 +247,7 @@
}
}
}
- if(projectDTOsyue.Count > 0 || projectDTOsri.Count > 0 )
+ if(projectDTOsyue.Count > 0 || projectDTOsri.Count > 0 || zhengfuprojectDTOsri.Count > 0)
tuiguangDTOs.Add(xiangmuDTO);
#endregion
@@ -2027,10 +2030,12 @@
xiangmuDTO.gongzuo = "閲囪喘椤圭洰褰曞叆";
//鏈湀鏁伴噺
var projectDTOsyue = _projectService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin);
- xiangmuDTO.benyueshuliang = projectDTOsyue.Count.ToString();
+ var zhengfuprojectDTOsyue = _projectService.GetListsalaryzhengfu(Userid, dateminkaoqin, datemaxkaoqin);
+ xiangmuDTO.benyueshuliang = (projectDTOsyue.Count + zhengfuprojectDTOsyue.Count).ToString();
//鏈棩鏁伴噺
var projectDTOsri = projectDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
- xiangmuDTO.benrishuliang = projectDTOsri.Count.ToString();
+ var zhengfuprojectDTOsri = zhengfuprojectDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
+ xiangmuDTO.benrishuliang = (projectDTOsri.Count+ zhengfuprojectDTOsri.Count).ToString();
var jijianixiangmu = fiPiecerateDTOs.Where(x => x.Project == "閲囪喘椤圭洰褰曞叆").FirstOrDefault();
@@ -2047,7 +2052,7 @@
xiangmuDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
if (jixiaotichengfangan.Tichengstandard == "01")
{
- decimal youxiaojijian = projectDTOsri.Count - jixiaotichengfangan.Renwu.Value;
+ decimal youxiaojijian = projectDTOsri.Count + zhengfuprojectDTOsri.Count - jixiaotichengfangan.Renwu.Value;
if (youxiaojijian > 0)
{
xiangmuDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
diff --git a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
index 3b3f70b..5a71989 100644
--- a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
+++ b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
@@ -1776,7 +1776,7 @@
- hrSalaryDTO.Gongzuobutie += Math.Round( (ShiyongPrice - hrSalaryDTO.Baomifei.Value- hrSalaryDTO.Jibengongzi.Value ) * shiyongqichuqinlv, 2);
+ hrSalaryDTO.Gongzuobutie += Math.Round( (ShiyongPrice * shiyongqichuqinlv - hrSalaryDTO.Baomifei.Value- hrSalaryDTO.Jibengongzi.Value ) , 2);
@@ -1854,7 +1854,7 @@
- hrSalaryDTO.Gongzuobutie += Math.Round((BasicPrice - hrSalaryDTO.Baomifei.Value - hrSalaryDTO.Jibengongzi.Value) * zhuanzhengchuqinlv, 2);
+ hrSalaryDTO.Gongzuobutie += Math.Round((BasicPrice * zhuanzhengchuqinlv - hrSalaryDTO.Baomifei.Value - hrSalaryDTO.Jibengongzi.Value) , 2);
@@ -2223,7 +2223,8 @@
#region 閲囪喘椤圭洰褰曞叆
var projectDTOsyue = _projectService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin);
- if (projectDTOsyue!=null && projectDTOsyue.Count > 0 )
+ var zhengfuprojectDTOsyue = _projectService.GetListsalaryzhengfu(userList[i].Id, dateminkaoqin, datemaxkaoqin);
+ if ((projectDTOsyue!=null && projectDTOsyue.Count > 0 ) || (zhengfuprojectDTOsyue != null && zhengfuprojectDTOsyue.Count > 0))
{
var jijianidddd = fiPiecerateDTOs.Where(x => x.Project == "閲囪喘椤圭洰褰曞叆").FirstOrDefault();
if (jijianidddd != null)
@@ -2243,9 +2244,10 @@
if (gongzuoshijian)
{
var projectDTOri = projectDTOsyue.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ var zhengfuprojectDTOri = zhengfuprojectDTOsyue.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList();
if (jixiaotichengfangan.Tichengstandard == "01")
{
- decimal youxiaojijian = projectDTOri.Count - renwujishu;
+ decimal youxiaojijian = projectDTOri.Count + zhengfuprojectDTOri.Count - renwujishu;
if (youxiaojijian > 0)
{
hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
@@ -2277,7 +2279,7 @@
decimal renwujishu = jixiaotichengfangan.Renwu.Value;
if (jixiaotichengfangan.Tichengstandard == "01")
{
- decimal youxiaojijian = projectDTOsyue.Count - renwujishu;
+ decimal youxiaojijian = projectDTOsyue.Count + zhengfuprojectDTOsyue.Count - renwujishu;
if (youxiaojijian > 0)
{
hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
diff --git a/zhengcaioa/zhengcaioa/Views/Project/ADDZhengfuProject.cshtml b/zhengcaioa/zhengcaioa/Views/Project/ADDZhengfuProject.cshtml
index 0a71d3e..56011a9 100644
--- a/zhengcaioa/zhengcaioa/Views/Project/ADDZhengfuProject.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Project/ADDZhengfuProject.cshtml
@@ -237,7 +237,7 @@
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
- <label class="text-right col-sm-1 col-md-1 control-label">鍝佺洰<i class="red">*</i></label>
+ <label class="text-right col-sm-1 col-md-1 control-label">鍝佺洰</label>
<div class="col-sm-2 col-md-2">
<select id="Pingmu" class="form-control" name="Pingmu" data-placeholder="閫夋嫨 搴忓垪 ...">
<option value="" hassubinfo="true">璇烽�夋嫨</option>
@@ -269,7 +269,7 @@
<input id="NoticeTime" class="form-control" label="鍏憡鏃ユ湡" name="NoticeTime" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.NoticeTime.ToString("yyyy-MM-dd HH:mm:ss")" readonly="readonly">
</div>
- <label class="text-right col-sm-1 col-md-1 control-label">椤圭洰缂栧彿<i class="red">*</i></label>
+ <label class="text-right col-sm-1 col-md-1 control-label">椤圭洰缂栧彿</label>
<div class="col-sm-2 col-md-2">
<input id="OpenTenderCode" class="form-control" label="椤圭洰缂栧彿" name="OpenTenderCode" labtype="txt" addvisible="true" maxlength="100" editvisible="true" reg="" ismust="true" type="text" value="@Model.OpenTenderCode">
@@ -318,7 +318,7 @@
<input id="Budget" class="form-control" label="棰勭畻閲戦" name="Budget" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.Budget" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,4})?/)">
</div>
- <label class="text-right col-sm-1 col-md-1 control-label">寮�鏍囨棩鏈�<i class="red">*</i></label>
+ <label class="text-right col-sm-1 col-md-1 control-label">寮�鏍囨棩鏈�</label>
<div class="col-sm-2 col-md-2">
<input id="OpenTenderTime" class="form-control" label="寮�鏍囨棩鏈�" name="OpenTenderTime" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@(Model.OpenTenderTime.HasValue? Model.OpenTenderTime.Value.ToString("yyyy-MM-dd HH:mm:ss"):"")" readonly="readonly">
@@ -497,19 +497,19 @@
toastr.warning("閲囪喘鏂瑰紡涓嶈兘涓虹┖");
return;
}
- if ($("#Pingmu").val() == '') {
- toastr.warning("鍝佺洰涓嶈兘涓虹┖");
- return;
- }
+ //if ($("#Pingmu").val() == '') {
+ // toastr.warning("鍝佺洰涓嶈兘涓虹┖");
+ // return;
+ //}
if ($("#NoticeTime").val() == '') {
toastr.warning("鍏憡鏃ユ湡涓嶈兘涓虹┖");
return;
}
- if ($.trim($("#OpenTenderCode").val() )== '') {
- toastr.warning("椤圭洰缂栧彿涓嶈兘涓虹┖");
- return;
- }
+ //if ($.trim($("#OpenTenderCode").val() )== '') {
+ // toastr.warning("椤圭洰缂栧彿涓嶈兘涓虹┖");
+ // return;
+ //}
if ($.trim($("#Title").val()) == '') {
toastr.warning("椤圭洰鍚嶇О锛堥暱锛変笉鑳戒负绌�");
return;
--
Gitblit v1.9.1