zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并最新

Browse Source
This commit is contained in:
李超
2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/CQMS/Check/CheckFineApproveService.cs
+264
View File
@@ -0,0 +1,264 @@
using Newtonsoft.Json.Serialization;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BLL
{
public class CheckFineApproveService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 获取质量巡检模板列表
/// </summary>
/// <param name="satartRowIndex"></param>
/// <param name="maximumRows"></param>
/// <returns></returns>
public static DataTable getListData(string CheckFineId)
{
var res = from x in db.Check_CheckFineApprove
where x.CheckFineId == CheckFineId && x.ApproveDate != null && x.ApproveType != "S"
orderby x.ApproveDate
select new
{
x.CheckFineApproveId,
x.CheckFineId,
ApproveMan = (from y in db.Sys_User where y.UserId == x.ApproveMan select y.UserName).First(),
x.ApproveDate,
x.IsAgree,
x.ApproveIdea,
x.ApproveType,
};
return Funs.LINQToDataTable(res);
}
/// <summary>
/// 根据质量巡检编号删除对应的所有质量巡检审批信息
/// </summary>
/// <param name="CheckFineId">质量巡检编号</param>
public static void DeleteCheckFineApprovesByCheckFineId(string CheckFineId)
{
Model.SGGLDB db = Funs.DB;
var q = (from x in db.Check_CheckFineApprove where x.CheckFineId == CheckFineId select x).ToList();
db.Check_CheckFineApprove.DeleteAllOnSubmit(q);
db.SubmitChanges();
}
/// <summary>
/// 获取登录人的通知信息
/// </summary>
/// <param name="CheckFineId"></param>
/// <param name="userId"></param>
/// <returns></returns>
public static IQueryable getList(string userId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var res = from x in db.Check_CheckFineApprove
join ca in db.Check_CheckFine on x.CheckFineId equals ca.CheckFineId
where x.ApproveDate == null && x.ApproveType == "S" && x.ApproveMan == userId
orderby x.ApproveDate
select new
{
//x.CheckFineApproveId,
x.CheckFineId,
//x.ApproveDate,
//x.IsAgree,
//x.ApproveIdea,
//x.ApproveType,
ca.DocCode
};
return res.AsQueryable().Distinct();
}
}
/// <summary>
/// 更新通知信息提醒
/// </summary>
/// <param name="CheckFineId"></param>
/// <param name="userId"></param>
/// <returns></returns>
public static Model.Check_CheckFineApprove GetSee(string CheckFineId, string userId)
{
return db.Check_CheckFineApprove.FirstOrDefault(x => x.CheckFineId == CheckFineId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
}
public static void See(string CheckFineId, string userId)
{
using (var db = new Model.SGGLDB(Funs.ConnString))
{
var res = db.Check_CheckFineApprove.FirstOrDefault(x => x.CheckFineId == CheckFineId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
if (res != null)
{
res.ApproveDate = DateTime.Now;
db.SubmitChanges();
}
}
}
/// <summary>
/// 根据质量巡检编号获取一个质量巡检审批信息
/// </summary>
/// <param name="CheckFineId">质量巡检编号</param>
/// <returns>一个质量巡检审批实体</returns>
public static Model.Check_CheckFineApprove GetCheckFineApproveByCheckFineId(string CheckFineId)
{
return db.Check_CheckFineApprove.FirstOrDefault(x => x.CheckFineId == CheckFineId && x.ApproveType != "S" && x.ApproveDate == null);
}
/// <summary>
/// 修改质量巡检审批信息
/// </summary>
/// <param name="managerRuleApprove">质量巡检审批实体</param>
public static void UpdateCheckFineApprove(Model.Check_CheckFineApprove approve)
{
Model.SGGLDB db = Funs.DB;
Model.Check_CheckFineApprove newApprove = db.Check_CheckFineApprove.First(e => e.CheckFineApproveId == approve.CheckFineApproveId && e.ApproveDate == null);
newApprove.CheckFineId = approve.CheckFineId;
newApprove.ApproveMan = approve.ApproveMan;
newApprove.ApproveDate = approve.ApproveDate;
newApprove.ApproveIdea = approve.ApproveIdea;
newApprove.IsAgree = approve.IsAgree;
newApprove.ApproveType = approve.ApproveType;
db.SubmitChanges();
}
/// <summary>
/// 增加质量巡检审批信息
/// </summary>
/// <param name="managerRuleApprove">质量巡检审批实体</param>
public static void AddCheckFineApprove(Model.Check_CheckFineApprove approve)
{
Model.SGGLDB db = Funs.DB;
string newKeyID = SQLHelper.GetNewID(typeof(Model.Check_CheckFineApprove));
Model.Check_CheckFineApprove newApprove = new Model.Check_CheckFineApprove();
newApprove.CheckFineApproveId = newKeyID;
newApprove.CheckFineId = approve.CheckFineId;
newApprove.ApproveMan = approve.ApproveMan;
newApprove.ApproveDate = approve.ApproveDate;
newApprove.ApproveIdea = approve.ApproveIdea;
newApprove.IsAgree = approve.IsAgree;
newApprove.ApproveType = approve.ApproveType;
db.Check_CheckFineApprove.InsertOnSubmit(newApprove);
db.SubmitChanges();
}
public static string AddCheckFineApproveForApi(Model.Check_CheckFineApprove approve)
{
using (var db = new Model.SGGLDB(Funs.ConnString))
{
string newKeyID = SQLHelper.GetNewID(typeof(Model.Check_CheckFineApprove));
Model.Check_CheckFineApprove newApprove = new Model.Check_CheckFineApprove();
newApprove.CheckFineApproveId = newKeyID;
newApprove.CheckFineId = approve.CheckFineId;
newApprove.ApproveMan = approve.ApproveMan;
newApprove.ApproveDate = approve.ApproveDate;
newApprove.ApproveIdea = approve.ApproveIdea;
newApprove.IsAgree = approve.IsAgree;
newApprove.ApproveType = approve.ApproveType;
db.Check_CheckFineApprove.InsertOnSubmit(newApprove);
db.SubmitChanges();
return newKeyID;
}
}
/// <summary>
/// 现场质量经理审核信息
/// </summary>
/// <param name="CheckFineId"></param>
/// <returns></returns>
public static Model.Check_CheckFineApprove GetAudit1(string CheckFineId)
{
return db.Check_CheckFineApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.CheckFineId == CheckFineId && x.ApproveType == BLL.Const.CheckFine_Audit1);
}
/// <summary>
/// 现场经理/施工经理审批信息
/// </summary>
/// <param name="CheckFineId"></param>
/// <returns></returns>
public static Model.Check_CheckFineApprove GetAudit2(string CheckFineId)
{
return db.Check_CheckFineApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.CheckFineId == CheckFineId && x.ApproveType == BLL.Const.CheckFine_Audit2);
}
public static Model.Check_CheckFineApprove GetComplie(string CheckFineId)
{
return db.Check_CheckFineApprove.FirstOrDefault(x => x.CheckFineId == CheckFineId && x.ApproveType == BLL.Const.CheckFine_Compile);
}
public static List<Model.Check_CheckFineApprove> GetListDataByCodeForApi(string code)
{
using (var db = new Model.SGGLDB(Funs.ConnString))
{
var q = from x in db.Check_CheckFineApprove
where x.CheckFineId == code && x.ApproveDate != null && x.ApproveType != "S"
orderby x.ApproveDate
select new
{
x.CheckFineApproveId,
x.CheckFineId,
x.ApproveMan,
ApproveManName = (from y in db.Sys_User where y.UserId == x.ApproveMan select y.UserName).First(),
x.ApproveDate,
x.IsAgree,
x.ApproveIdea,
x.ApproveType,
};
List<Model.Check_CheckFineApprove> res = new List<Model.Check_CheckFineApprove>();
var list = q.ToList();
foreach (var item in list)
{
Model.Check_CheckFineApprove approve = new Model.Check_CheckFineApprove();
approve.CheckFineApproveId = item.CheckFineApproveId;
approve.CheckFineId = item.CheckFineId;
approve.ApproveMan = item.ApproveMan + "$" + item.ApproveManName;
approve.ApproveDate = item.ApproveDate;
approve.IsAgree = item.IsAgree;
approve.ApproveIdea = item.ApproveIdea;
approve.ApproveType = item.ApproveType;
res.Add(approve);
}
return res;
}
}
public static Model.Check_CheckFineApprove getCurrApproveForApi(string checkFineCode)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
Model.Check_CheckFineApprove newApprove = db.Check_CheckFineApprove.FirstOrDefault(e => e.CheckFineId == checkFineCode && e.ApproveType != "S" && e.ApproveDate == null);
if (newApprove != null)
{
Model.Sys_User user = BLL.UserService.GetUserByUserId(newApprove.ApproveMan);
if (user != null)
{
newApprove.ApproveIdea = user.UserName;
}
}
return newApprove;
}
}
public static void UpdateCheckFineApproveForApi(Model.Check_CheckFineApprove approve)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
Model.Check_CheckFineApprove newApprove = db.Check_CheckFineApprove.FirstOrDefault(e => e.CheckFineApproveId == approve.CheckFineApproveId && e.ApproveDate == null);
if (newApprove != null)
{
if (!string.IsNullOrEmpty(approve.CheckFineId))
{
newApprove.CheckFineId = approve.CheckFineId;
}
if (!string.IsNullOrEmpty(approve.ApproveMan))
newApprove.ApproveMan = approve.ApproveMan;
if (approve.ApproveDate.HasValue)
newApprove.ApproveDate = approve.ApproveDate;
if (!string.IsNullOrEmpty(approve.ApproveIdea))
newApprove.ApproveIdea = approve.ApproveIdea;
if (approve.IsAgree.HasValue)
newApprove.IsAgree = approve.IsAgree;
if (!string.IsNullOrEmpty(approve.ApproveType))
newApprove.ApproveType = approve.ApproveType;
db.SubmitChanges();
}
}
}
}
}
SGGL/BLL/CQMS/Check/CheckFineService.cs
+42 -1
View File
@@ -108,6 +108,47 @@ namespace BLL
}
public static void Init(FineUIPro.DropDownList dropName, string state, bool isShowPlease)
{
dropName.DataValueField = "Value";
dropName.DataTextField = "Text";
dropName.DataSource = GetDHandleTypeByState(state);
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
}
/// <summary>
/// 根据状态选择下一步办理类型
/// </summary>
/// <param name="state"></param>
/// <returns></returns>
public static ListItem[] GetDHandleTypeByState(string state)
{
if (state == Const.CheckFine_Compile || state == Const.CheckFine_ReCompile) //无是否同意
{
ListItem[] lis = new ListItem[1];
lis[0] = new ListItem("现场质量经理审核", Const.CheckFine_Audit1);
return lis;
}
else if (state == Const.CheckFine_Audit1)//有是否同意
{
ListItem[] lis = new ListItem[2];
lis[0] = new ListItem("现场经理/施工经理审批", Const.CheckFine_Audit2);//是 加载
lis[1] = new ListItem("重新编制", Const.CheckFine_ReCompile);//否加载
return lis;
}
else if (state == Const.CheckFine_Audit2)//无是否同意
{
ListItem[] lis = new ListItem[2];
lis[0] = new ListItem("审批完成", Const.CheckFine_Complete);
lis[1] = new ListItem("重新编制", Const.CheckFine_ReCompile);
return lis;
}
else
return null;
}
}
}
SGGL/BLL/CQMS/Check/RewardAndPunishService.cs
+1 -1
View File
@@ -80,7 +80,7 @@ namespace BLL
ListItem[] list = new ListItem[2];
list[0] = new ListItem("奖励通知单", "0");
list[1] = new ListItem("奖励通知单", "1");
list[1] = new ListItem("处罚通知单", "1");
dropName.DataValueField = "Value";
dropName.DataTextField = "Text";
dropName.DataSource = list;
SGGL/BLL/CQMS/Comprehensive/InspectionPersonApproveService.cs
+9
View File
@@ -60,6 +60,15 @@ namespace BLL.CQMS.Comprehensive
}
public static Model.Comprehensive_InspectionPersonApprove GetApprove2(string InspectionPersonId)
{
var q = from x in Funs.DB.Comprehensive_InspectionPersonApprove
where x.InspectionPersonId == InspectionPersonId && x.ApproveType != "S" && x.ApproveDate == null && x.ApproveType=="2"
select x;
return q.FirstOrDefault();
}
public static Model.Comprehensive_InspectionPersonApprove GetState(string InspectionPersonId)
{
var q = from x in Funs.DB.Comprehensive_InspectionPersonApprove
SGGL/BLL/CQMS/Solution/CQMSConstructSolutionService.cs
+23
View File
@@ -60,6 +60,7 @@ namespace BLL
newConstructSolution.UnitWorkIds = constructSolution.UnitWorkIds;
newConstructSolution.CNProfessionalCodes = constructSolution.CNProfessionalCodes;
newConstructSolution.AttachUrl = constructSolution.AttachUrl;
newConstructSolution.IsHSSE = constructSolution.IsHSSE;
newConstructSolution.CompileMan = constructSolution.CompileMan;
newConstructSolution.CompileDate = constructSolution.CompileDate;
newConstructSolution.State = constructSolution.State;
@@ -67,6 +68,27 @@ namespace BLL
newConstructSolution.SpecialSchemeTypeId = constructSolution.SpecialSchemeTypeId;
db.Solution_CQMSConstructSolution.InsertOnSubmit(newConstructSolution);
db.SubmitChanges();
if (newConstructSolution.IsHSSE == true)
{
Model.Solution_HSSEConstructSolution newHSSEConstructSolution = new Model.Solution_HSSEConstructSolution();
newHSSEConstructSolution.ConstructSolutionId = SQLHelper.GetNewID();
newHSSEConstructSolution.Code = constructSolution.Code;
newHSSEConstructSolution.ProjectId = constructSolution.ProjectId;
newHSSEConstructSolution.UnitId = constructSolution.UnitId;
newHSSEConstructSolution.SolutionName = constructSolution.SolutionName;
newHSSEConstructSolution.SolutionType = constructSolution.SolutionType;
newHSSEConstructSolution.UnitWorkIds = constructSolution.UnitWorkIds;
newHSSEConstructSolution.CNProfessionalCodes = constructSolution.CNProfessionalCodes;
newHSSEConstructSolution.AttachUrl = constructSolution.AttachUrl;
newHSSEConstructSolution.CompileMan = constructSolution.CompileMan;
newHSSEConstructSolution.CompileDate = constructSolution.CompileDate;
newHSSEConstructSolution.State = constructSolution.State;
newHSSEConstructSolution.Edition = constructSolution.Edition;
newHSSEConstructSolution.SpecialSchemeTypeId = constructSolution.SpecialSchemeTypeId;
newHSSEConstructSolution.CQMSConstructSolutionId= constructSolution.ConstructSolutionId;
db.Solution_HSSEConstructSolution.InsertOnSubmit(newHSSEConstructSolution);
db.SubmitChanges();
}
}
/// <summary>
/// 修改方案审查信息
@@ -91,6 +113,7 @@ namespace BLL
newConstructSolution.UnitWorkIds = constructSolution.UnitWorkIds;
newConstructSolution.CNProfessionalCodes = constructSolution.CNProfessionalCodes;
newConstructSolution.AttachUrl = constructSolution.AttachUrl;
newConstructSolution.IsHSSE = constructSolution.IsHSSE;
newConstructSolution.State = constructSolution.State;
newConstructSolution.Edition = constructSolution.Edition;
newConstructSolution.SpecialSchemeTypeId = constructSolution.SpecialSchemeTypeId;
SGGL/BLL/CQMS/WBS/DivisionProjectService.cs
+10
View File
@@ -152,6 +152,16 @@ namespace BLL
return Funs.DB.WBS_DivisionProject.FirstOrDefault(x => x.DivisionProjectId == divisionProjectId);
}
/// <summary>
/// 根据主键返回一个分部/子分部信息
/// </summary>
/// <param name="cnProfessionalCode">分部/子分部编号</param>
/// <returns></returns>
public static Model.WBS_DivisionProject GetDivisionProjectByUnitWorkIdAndOldDivisionId(string unitWorkId, string oldDivisionId)
{
return Funs.DB.WBS_DivisionProject.FirstOrDefault(x => x.UnitWorkId == unitWorkId && x.OldDivisionId == oldDivisionId);
}
/// <summary>
/// 判断分部/子分部编号是否存在
/// </summary>