From 0879713a184c48a0306a771a1e151387d5a9cf4c Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期一, 28 六月 2021 12:40:37 +0800
Subject: [PATCH] 电话费用录入修改
---
zhengcaioa/Services/ProjectService.cs | 75 ++++++++++++++++++++++++++++++++++---
1 files changed, 68 insertions(+), 7 deletions(-)
diff --git a/zhengcaioa/Services/ProjectService.cs b/zhengcaioa/Services/ProjectService.cs
index e57e271..4097033 100644
--- a/zhengcaioa/Services/ProjectService.cs
+++ b/zhengcaioa/Services/ProjectService.cs
@@ -27,6 +27,16 @@
ResultEntity resultEntity = new ResultEntity();
try
{
+ var checkUserSn = _context.Projects.Where(x => x.Name == projectDTO.Name && x.RecStatus == "A" && x.Id != projectDTO.Id).FirstOrDefault();
+ if (checkUserSn != null && (string.IsNullOrWhiteSpace(projectDTO.Id) || (!string.IsNullOrWhiteSpace(projectDTO.Id) && checkUserSn.Id != projectDTO.Id)))
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "椤圭洰閲嶅";
+ return resultEntity;
+ }
+
+
+
var project = _mapper.Map<Project>(projectDTO);
// var ZhuanjiaList = projectDTO.ZhuanjiaList;
//if(ZhuanjiaList!=null&& ZhuanjiaList.Length > 0)
@@ -292,17 +302,68 @@
}
- if (!string.IsNullOrWhiteSpace(searchEntity.StartTimestar))
+ if (!string.IsNullOrWhiteSpace(searchEntity.Reasonname))
{
- sql.Append(" and a.start_time >='"+ searchEntity.StartTimestar.Trim().Replace("'","''") + "'");
-
- }
- if (!string.IsNullOrWhiteSpace(searchEntity.StartTimeend))
- {
- sql.Append(" and a.start_time <='" + DateTime.Parse(searchEntity.StartTimeend.Trim().Replace("'", "''")).AddDays(1).ToString("yyyy-MM-dd") + "'"); ;
+ sql.Append(" and exists (select b.[ProjectId] from [Projectreason] b where a.[Id]=b.[ProjectId] and b.[reasonname] like '%" + searchEntity.Reasonname + "%') ");
}
+ if (!string.IsNullOrWhiteSpace(searchEntity.ShiFouyReasonname))
+ {
+ if (searchEntity.ShiFouyReasonname == "A")
+ {
+ sql.Append(" and exists (select b.[ProjectId] from [Projectreason] b where a.[Id]=b.[ProjectId] ) ");
+
+ }
+ else
+ {
+ sql.Append(" and not exists (select b.[ProjectId] from [Projectreason] b where a.[Id]=b.[ProjectId] ) ");
+ }
+
+
+ }
+
+
+ if (!string.IsNullOrWhiteSpace(searchEntity.fblx))
+ {
+ if (searchEntity.fblx == "A")
+ {
+ sql.Append(" and a.fblx is not null ");
+ }
+ else
+ {
+ sql.Append(" and a.fblx is null ");
+ }
+
+
+ }
+
+ DateTime StartTimestarstart = DateTime.Now;
+ DateTime StartTimestarend = DateTime.Now;
+ if (!string.IsNullOrWhiteSpace(searchEntity.StartTimestar))
+ {
+ string[] StartTimestars = searchEntity.StartTimestar.Split("|");
+ DateTime.TryParse(StartTimestars[0], out StartTimestarstart);
+ DateTime.TryParse(StartTimestars[1], out StartTimestarend);
+ //Createtimeend = Createtimeend.AddDays(1);
+ }
+
+
+ if (!string.IsNullOrWhiteSpace(searchEntity.StartTimestar))
+ {
+ sql.Append(" and a.start_time >='" + StartTimestarstart.ToString("yyyy-MM-dd") + "'");
+
+ }
+ if (!string.IsNullOrWhiteSpace(searchEntity.StartTimestar))
+ {
+ sql.Append(" and a.start_time <='" + StartTimestarend.AddDays(1).ToString("yyyy-MM-dd") + "'");
+
+ }
+
+
+
+
+
if (!string.IsNullOrWhiteSpace(searchEntity.Sheng))
{
sql.Append(" and a.[sheng] = '" + searchEntity.Sheng.Trim().Replace("'", "''") + "' ");
--
Gitblit v1.9.1