lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交质量接口修改

Browse Source
This commit is contained in:
高飞
2023-03-16 14:35:01 +08:00
parent f2a3954a44
commit 49afa7e25d
17 changed files with 826 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataBase/版本日志/SGGLDB_V2023-03-16.sql
+4
View File
@@ -0,0 +1,4 @@
alter table Meeting_CQMSMeeting add AttachUrl nvarchar(1000) null
GO
alter table RewardAndPunish_RewardAndPunish add AttachUrl nvarchar(1000) null
GO
SGGL/BLL/API/APIBaseInfoService.cs
+40
View File
@@ -813,5 +813,45 @@ namespace BLL
return items;
}
#endregion
#region 获取质量会议主持人
/// <summary>
/// 获取质量会议主持人
/// </summary>
/// <returns></returns>
public static List<Model.BaseInfoItem> getCQMSMeetingHostMan(string projectId,string unitId)
{
var list = BLL.SitePerson_PersonService.GetSitePerson_PersonListByUnitIdsRoleIds(projectId, unitId, null);
List<Model.BaseInfoItem> items = new List<Model.BaseInfoItem>();
foreach (var item in list)
{
Model.BaseInfoItem b = new Model.BaseInfoItem();
b.BaseInfoId = item.PersonId;
b.BaseInfoName = item.PersonName;
items.Add(b);
}
return items;
}
#endregion
#region 获取质量会议参加人员
/// <summary>
/// 获取质量会议参加人员
/// </summary>
/// <returns></returns>
public static List<Model.BaseInfoItem> getAttentPerson(string projectId)
{
var list = BLL.SitePerson_PersonService.GetSitePerson_PersonListByProjectIdUnitTypeRoleIds(projectId, Const.ProjectUnitType_1 + "," + Const.ProjectUnitType_2, null);
List<Model.BaseInfoItem> items = new List<Model.BaseInfoItem>();
foreach (var item in list)
{
Model.BaseInfoItem b = new Model.BaseInfoItem();
b.BaseInfoId = item.PersonId;
b.BaseInfoName = item.PersonName;
items.Add(b);
}
return items;
}
#endregion
}
}
SGGL/BLL/API/APIUnitService.cs
+19
View File
@@ -36,6 +36,25 @@ namespace BLL
}
}
/// <summary>
/// 获取项目所有单位信息
/// </summary>
/// <param name="projectId"></param>
/// <returns></returns>
public static List<Model.BaseInfoItem> getProjectUnitLists(string projectId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var units = (from x in db.Base_Unit
join y in db.Project_ProjectUnit
on x.UnitId equals y.UnitId
where y.ProjectId == projectId
orderby x.UnitName
select new Model.BaseInfoItem { BaseInfoId = x.UnitId, BaseInfoCode = x.UnitCode, BaseInfoName = x.UnitName }).ToList();
return units;
}
}
/// <summary>
/// 根据projectId、unitType获取单位信息（总包1;施工分包2;监理3;业主4;其他5）
/// </summary>
SGGL/BLL/CQMS/Meeting/CQMS_MeetingApproveService.cs
+99
View File
@@ -91,6 +91,18 @@ namespace BLL
}
}
}
public static string GetHandleManName(string MeetingId)
{
string name = string.Empty;
var a = Funs.DB.Meeting_CQMSMeetingApprove.FirstOrDefault(x => x.MeetingId == MeetingId && x.ApproveDate == null);
if (a != null)
{
name = BLL.Person_PersonsService.GetPersonsNameById(a.ApproveMan);
}
return name;
}
/// <summary>
/// 根据质量会议编号获取一个质量会议审批信息
/// </summary>
@@ -155,5 +167,92 @@ namespace BLL
{
return db.Meeting_CQMSMeetingApprove.FirstOrDefault(x => x.MeetingId == MeetingId && x.ApproveType == BLL.Const.CQMSMeeting_Compile);
}
public static List<Model.Meeting_CQMSMeetingApprove> GetListDataByIdForApi(string id)
{
using (var db = new Model.SGGLDB(Funs.ConnString))
{
var q = from x in db.Meeting_CQMSMeetingApprove
where x.MeetingId == id && x.ApproveDate != null && x.ApproveType != "S"
orderby x.ApproveDate
select new
{
x.MeetingApproveId,
x.MeetingId,
ApproveMan = (from y in db.Person_Persons where y.PersonId == x.ApproveMan select y.PersonName).First(),
x.ApproveDate,
x.IsAgree,
x.ApproveIdea,
x.ApproveType,
};
List<Model.Meeting_CQMSMeetingApprove> res = new List<Model.Meeting_CQMSMeetingApprove>();
var list = q.ToList();
foreach (var item in list)
{
Model.Meeting_CQMSMeetingApprove approve = new Model.Meeting_CQMSMeetingApprove();
approve.MeetingApproveId = item.MeetingApproveId;
approve.MeetingId = item.MeetingId;
approve.ApproveMan = item.ApproveMan;
approve.ApproveDate = item.ApproveDate;
approve.IsAgree = item.IsAgree;
approve.ApproveIdea = item.ApproveIdea;
approve.ApproveType = item.ApproveType;
res.Add(approve);
}
return res;
}
}
public static Model.Meeting_CQMSMeetingApprove getCurrApproveForApi(string id)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
Model.Meeting_CQMSMeetingApprove newApprove = db.Meeting_CQMSMeetingApprove.FirstOrDefault(e => e.MeetingId == id && e.ApproveType != "S" && e.ApproveDate == null);
return newApprove;
}
}
public static string AddMeetingApproveForApi(Model.Meeting_CQMSMeetingApprove approve)
{
using (var db = new Model.SGGLDB(Funs.ConnString))
{
string newKeyID = SQLHelper.GetNewID(typeof(Model.Meeting_CQMSMeetingApprove));
Model.Meeting_CQMSMeetingApprove newApprove = new Model.Meeting_CQMSMeetingApprove();
newApprove.MeetingApproveId = newKeyID;
newApprove.MeetingId = approve.MeetingId;
newApprove.ApproveMan = approve.ApproveMan;
newApprove.ApproveDate = approve.ApproveDate;
newApprove.ApproveIdea = approve.ApproveIdea;
newApprove.IsAgree = approve.IsAgree;
newApprove.ApproveType = approve.ApproveType;
db.Meeting_CQMSMeetingApprove.InsertOnSubmit(newApprove);
db.SubmitChanges();
return newKeyID;
}
}
public static void UpdateMeetingApproveForApi(Model.Meeting_CQMSMeetingApprove approve)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
Model.Meeting_CQMSMeetingApprove newApprove = db.Meeting_CQMSMeetingApprove.FirstOrDefault(e => e.MeetingApproveId == approve.MeetingApproveId && e.ApproveDate == null);
if (newApprove != null)
{
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/Meeting/CQMS_MeetingService.cs
+262 -1
View File
@@ -112,7 +112,7 @@ namespace BLL
newCQMSMeeting.MeetingTheme = CQMSMeeting.MeetingTheme;
newCQMSMeeting.MeetingContents = CQMSMeeting.MeetingContents;
newCQMSMeeting.State = CQMSMeeting.State;
db.SubmitChanges();
}
}
@@ -156,5 +156,266 @@ namespace BLL
else
return null;
}
/// <summary>
/// 根据状态选择下一步办理类型
/// </summary>
/// <param name="state"></param>
/// <returns></returns>
public static List<Model.BaseInfoItem> GetDHandleTypeByStateForApi(string state)
{
List<Model.BaseInfoItem> list = new List<Model.BaseInfoItem>();
if (state == Const.CQMSMeeting_Compile || state == Const.CQMSMeeting_ReCompile)
{
Model.BaseInfoItem item = new Model.BaseInfoItem();
item.BaseInfoId = Const.CQMSMeeting_Audit;
item.BaseInfoName = "总包质量经理审批";
list.Add(item);
return list;
}
else if (state == Const.CQMSMeeting_Audit)
{
Model.BaseInfoItem item = new Model.BaseInfoItem();
item.BaseInfoId = Const.CQMSMeeting_Complete;
item.BaseInfoName = "审批完成";
list.Add(item);
Model.BaseInfoItem item2 = new Model.BaseInfoItem();
item2.BaseInfoId = Const.CQMSMeeting_ReCompile;
item2.BaseInfoName = "重新编制";
list.Add(item2);
return list;
}
else
return null;
}
/// <summary>
/// 根据状态选择下一步办理类型
/// </summary>
/// <param name="state"></param>
/// <returns></returns>
public static List<Model.BaseInfoItem> GetHandleManListForApi(string state, string id, string projectId)
{
List<Model.BaseInfoItem> list = new List<Model.BaseInfoItem>();
if (state == Const.CQMSMeeting_Compile)
{
return null;
}
else if (state == Const.CQMSMeeting_ReCompile)
{
var user = BLL.Person_PersonsService.GetPerson_PersonsById(BLL.CQMS_MeetingApproveService.GetAuditMan(id, BLL.Const.CQMSMeeting_Compile).ApproveMan);
Model.BaseInfoItem item = new Model.BaseInfoItem();
item.BaseInfoId = user.PersonId;
item.BaseInfoName = user.PersonName;
list.Add(item);
return list;
}
else if (state == Const.CQMSMeeting_Audit)
{
var users = BLL.SitePerson_PersonService.GetSitePerson_PersonListByProjectIdUnitTypeRoleIds(projectId, Const.ProjectUnitType_1, null);
foreach (var user in users)
{
Model.BaseInfoItem item = new Model.BaseInfoItem();
item.BaseInfoId = user.PersonId;
item.BaseInfoName = user.PersonName;
list.Add(item);
}
return list;
}
else
return null;
}
/// <summary>
/// 把状态转换代号为文字形式
/// </summary>
/// <param name="state"></param>
/// <returns></returns>
public static string ConvertState(object state)
{
if (state != null)
{
if (state.ToString() == BLL.Const.CQMSMeeting_ReCompile)
{
return "重新编制";
}
else if (state.ToString() == BLL.Const.CQMSMeeting_Compile)
{
return "编制";
}
else if (state.ToString() == BLL.Const.CQMSMeeting_Audit)
{
return "总包质量经理审批";
}
else if (state.ToString() == BLL.Const.CQMSMeeting_Complete)
{
return "审批完成";
}
else
{
return "";
}
}
return "";
}
public static List<Model.Meeting_CQMSMeeting> getListDataForApi(string projectId, int startRowIndex, int maximumRows, string meetingType)
{
using (var db = new Model.SGGLDB(Funs.ConnString))
{
IQueryable<Model.Meeting_CQMSMeeting> q = db.Meeting_CQMSMeeting;
if (!string.IsNullOrEmpty(projectId))
{
q = q.Where(e => e.ProjectId == projectId);
}
if (!string.IsNullOrEmpty(meetingType))
{
q = q.Where(e => e.MeetingType == meetingType);
}
var qres = from x in q
orderby x.CompileDate descending
select new
{
x.MeetingId,
x.ProjectId,
x.UnitId,
UnitName = (from y in db.Base_Unit where y.UnitId == x.UnitId select y.UnitName).First(),
x.MeetingType,
MeetingTypeStr = x.MeetingType == "M" ? "质量月例会" : "质量专题会",
x.MeetingCode,
x.MeetingDate,
x.Place,
x.HostMan,
HostManName = BLL.Person_PersonsService.getPersonsNamesPersonIds(x.HostMan),
x.AttentPerson,
AttentPersonName = BLL.Person_PersonsService.getPersonsNamesPersonIds(x.AttentPerson),
x.AttentPersonNum,
x.MeetingTheme,
x.MeetingContents,
x.CompileDate,
x.CompileMan,
x.State,
StateStr = ConvertState(x.State),
CompileManName = (from y in db.Person_Persons where y.PersonId == x.CompileMan select y.PersonName).First(),
HandleManName = BLL.CQMS_MeetingApproveService.GetHandleManName(x.MeetingId),
x.AttachUrl,
};
List<Model.Meeting_CQMSMeeting> res = new List<Model.Meeting_CQMSMeeting>();
var list = qres.Skip(startRowIndex).Take(maximumRows).ToList();
foreach (var item in list)
{
Model.Meeting_CQMSMeeting cd = new Model.Meeting_CQMSMeeting();
cd.MeetingId = item.MeetingId;
cd.ProjectId = item.ProjectId;
cd.UnitId = item.UnitId + "$" + item.UnitName;
cd.MeetingType = item.MeetingType + "$" + item.MeetingTypeStr;
cd.MeetingCode = item.MeetingCode;
cd.MeetingDate = item.MeetingDate;
cd.Place = item.Place;
cd.HostMan = item.HostMan + "$" + item.HostManName;
cd.AttentPerson = item.AttentPerson + "$" + item.AttentPersonName;
cd.AttentPersonNum = item.AttentPersonNum;
cd.MeetingTheme = item.MeetingTheme;
cd.MeetingContents = item.MeetingContents;
cd.CompileDate = item.CompileDate;
cd.CompileMan = item.CompileMan + "$" + item.CompileManName;
cd.State = item.State + "$" + item.StateStr + "$" + item.HandleManName;
cd.AttachUrl = AttachFileService.getFileUrl(item.MeetingId);
res.Add(cd);
}
return res;
}
}
/// <summary>
/// 获取质量会议信息
/// </summary>
/// <param name="UnitWorkId"></param>
/// <returns></returns>
public static Model.Meeting_CQMSMeeting GetMeetingByMeetingIdForApi(string MeetingId)
{
using (var db = new Model.SGGLDB(Funs.ConnString))
{
var q = db.Meeting_CQMSMeeting.FirstOrDefault(e => e.MeetingId == MeetingId);
if (q != null)
{
q.UnitId = q.UnitId + "$" + BLL.UnitService.GetUnitNameByUnitId(q.UnitId);
q.MeetingType = q.MeetingType + "$" + (q.MeetingType == "M" ? "质量月例会" : "质量专题会");
q.HostMan = q.HostMan + "$" + BLL.Person_PersonsService.getPersonsNamesPersonIds(q.HostMan);
q.AttentPerson = q.AttentPerson + "$" + BLL.Person_PersonsService.getPersonsNamesPersonIds(q.AttentPerson);
q.CompileMan = q.CompileMan + "$" + BLL.Person_PersonsService.GetPersonsNameById(q.CompileMan);
q.State = q.State + "$" + ConvertState(q.State) + "$" + BLL.CQMS_MeetingApproveService.GetHandleManName(q.MeetingId);
q.AttachUrl = AttachFileService.getFileUrl(q.MeetingId);
}
return q;
}
}
public static void AddMeetingForApi(Model.Meeting_CQMSMeeting Meeting)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
Model.Meeting_CQMSMeeting newCQMSMeeting = new Model.Meeting_CQMSMeeting
{
MeetingId = Meeting.MeetingId,
ProjectId = Meeting.ProjectId,
UnitId = Meeting.UnitId,
MeetingType = Meeting.MeetingType,
MeetingCode = Meeting.MeetingCode,
MeetingDate = Meeting.MeetingDate,
Place = Meeting.Place,
HostMan = Meeting.HostMan,
AttentPerson = Meeting.AttentPerson,
AttentPersonNum = Meeting.AttentPersonNum,
MeetingTheme = Meeting.MeetingTheme,
MeetingContents = Meeting.MeetingContents,
State = Meeting.State,
CompileMan = Meeting.CompileMan,
CompileDate = Meeting.CompileDate,
};
db.Meeting_CQMSMeeting.InsertOnSubmit(Meeting);
db.SubmitChanges();
Model.Meeting_CQMSMeetingApprove approve = new Model.Meeting_CQMSMeetingApprove();
approve.MeetingApproveId = BLL.SQLHelper.GetNewID();
approve.MeetingId = Meeting.MeetingId;
approve.ApproveType = BLL.Const.CQMSMeeting_Compile;
approve.ApproveMan = Meeting.CompileMan;
approve.ApproveDate = Meeting.CompileDate;
db.Meeting_CQMSMeetingApprove.InsertOnSubmit(approve);
db.SubmitChanges();
}
}
public static void UpdateMeetingForApi(Model.Meeting_CQMSMeeting Meeting)
{
using (var db = new Model.SGGLDB(Funs.ConnString))
{
Model.Meeting_CQMSMeeting newMeeting = db.Meeting_CQMSMeeting.First(e => e.MeetingId == Meeting.MeetingId);
if (!string.IsNullOrEmpty(Meeting.UnitId))
newMeeting.UnitId = Meeting.UnitId;
if (!string.IsNullOrEmpty(Meeting.MeetingCode))
newMeeting.MeetingCode = Meeting.MeetingCode;
if (Meeting.MeetingDate.HasValue)
newMeeting.MeetingDate = Meeting.MeetingDate;
if (!string.IsNullOrEmpty(Meeting.Place))
newMeeting.Place = Meeting.Place;
if (!string.IsNullOrEmpty(Meeting.HostMan))
newMeeting.HostMan = Meeting.HostMan;
if (!string.IsNullOrEmpty(Meeting.AttentPerson))
newMeeting.AttentPerson = Meeting.AttentPerson;
if (Meeting.AttentPersonNum.HasValue)
newMeeting.AttentPersonNum = Meeting.AttentPersonNum;
if (!string.IsNullOrEmpty(Meeting.MeetingTheme))
newMeeting.MeetingTheme = Meeting.MeetingTheme;
if (!string.IsNullOrEmpty(Meeting.MeetingContents))
newMeeting.MeetingContents = Meeting.MeetingContents;
if (!string.IsNullOrEmpty(Meeting.State))
newMeeting.State = Meeting.State;
db.SubmitChanges();
}
}
}
}
SGGL/BLL/CQMS/Plan/CQMS_MainPlanApproveService.cs
+2 -2
View File
@@ -118,7 +118,7 @@ namespace BLL
public static string GetHandleManName(string MainPlanId)
{
string name = string.Empty;
var a= Funs.DB.Plan_MainPlanApprove.FirstOrDefault(x => x.MainPlanId == MainPlanId && x.ApproveDate == null);
var a = Funs.DB.Plan_MainPlanApprove.FirstOrDefault(x => x.MainPlanId == MainPlanId && x.ApproveDate == null);
if (a != null)
{
name = BLL.Person_PersonsService.GetPersonsNameById(a.ApproveMan);
@@ -246,7 +246,7 @@ namespace BLL
cd.ApproveDate = item.ApproveDate;
cd.IsAgree = item.IsAgree;
cd.ApproveIdea = item.ApproveIdea;
cd.ApproveType = item.ApproveType;
cd.ApproveType = item.ApproveType + "$" + CQMS_MainPlanService.ConvertState(item.ApproveType);
res.Add(cd);
}
return res;
SGGL/BLL/CQMS/Plan/CQMS_MainPlanService.cs
+3 -3
View File
@@ -195,7 +195,7 @@ namespace BLL
x.State,
StateStr = ConvertState(x.State),
CompileManName = (from y in db.Person_Persons where y.PersonId == x.CompileMan select y.PersonName).First(),
HandleManName = BLL.CQMS_MainPlanApproveService.GetHandleManName(x.State),
HandleManName = BLL.CQMS_MainPlanApproveService.GetHandleManName(x.MainPlanId),
FilePath = x.FilePath,
};
List<Model.Plan_MainPlan> res = new List<Model.Plan_MainPlan>();
@@ -209,7 +209,7 @@ namespace BLL
cd.FileName = item.FileName;
cd.CompileDate = item.CompileDate;
cd.CompileMan = item.CompileMan + "$" + item.CompileManName;
cd.State = item.State + "$" + item.StateStr + "&" + item.HandleManName;
cd.State = item.State + "$" + item.StateStr + "$" + item.HandleManName;
cd.FilePath = item.FilePath;
res.Add(cd);
}
@@ -227,7 +227,7 @@ namespace BLL
var q = Funs.DB.Plan_MainPlan.FirstOrDefault(e => e.MainPlanId == MainPlanId);
if (q != null)
{
q.State = q.State + "$" + ConvertState(q.State) + "$" + BLL.CQMS_MainPlanApproveService.GetHandleManName(q.State);
q.State = q.State + "$" + ConvertState(q.State) + "$" + BLL.CQMS_MainPlanApproveService.GetHandleManName(q.MainPlanId);
q.CompileMan = q.CompileMan + "$" + BLL.Person_PersonsService.GetPersonsNameById(q.CompileMan);
}
return q;
SGGL/BLL/CQMS/Plan/CQMS_SubPlanApproveService.cs
+1 -1
View File
@@ -288,7 +288,7 @@ namespace BLL
cd.ApproveDate = item.ApproveDate;
cd.IsAgree = item.IsAgree;
cd.ApproveIdea = item.ApproveIdea;
cd.ApproveType = item.ApproveType;
cd.ApproveType = item.ApproveType + "$" + CQMS_SubPlanService.ConvertState(item.ApproveType);
res.Add(cd);
}
return res;
SGGL/BLL/CQMS/Plan/CQMS_SubPlanService.cs
+3 -3
View File
@@ -228,7 +228,7 @@ namespace BLL
UnitName = BLL.UnitService.GetUnitNameByUnitId(x.UnitId),
UnitWorkNames=BLL.UnitWorkService.GetUnitWorkName(x.UnitWorkIds),
CNProfessionalNames=BLL.CNProfessionalService.GetCNProfessionalNameByCode(x.CNProfessionalCodes),
HandleManName = BLL.CQMS_SubPlanApproveService.GetHandleManName(x.State),
HandleManName = BLL.CQMS_SubPlanApproveService.GetHandleManName(x.SubPlanId),
FilePath = x.FilePath,
};
List<Model.Plan_SubPlan> res = new List<Model.Plan_SubPlan>();
@@ -245,7 +245,7 @@ namespace BLL
cd.CNProfessionalCodes = item.CNProfessionalCodes + "$" + item.CNProfessionalNames;
cd.CompileDate = item.CompileDate;
cd.CompileMan = item.CompileMan + "$" + item.CompileManName;
cd.State = item.State + "$" + item.StateStr + "&" + item.HandleManName;
cd.State = item.State + "$" + item.StateStr + "$" + item.HandleManName;
cd.Edition = item.Edition;
cd.FilePath = item.FilePath;
res.Add(cd);
@@ -268,7 +268,7 @@ namespace BLL
q.UnitWorkIds = q.UnitWorkIds + "$" + BLL.UnitWorkService.GetUnitWorkName(q.UnitWorkIds);
q.CNProfessionalCodes = q.CNProfessionalCodes + "$" + BLL.CNProfessionalService.GetCNProfessionalNameByCode(q.CNProfessionalCodes);
q.CompileMan=q.CompileMan + "$" + BLL.Person_PersonsService.GetPersonsNameById(q.CompileMan);
q.State = q.State + "$" + ConvertState(q.State) + "$" + BLL.CQMS_SubPlanApproveService.GetHandleManName(q.State);
q.State = q.State + "$" + ConvertState(q.State) + "$" + BLL.CQMS_SubPlanApproveService.GetHandleManName(q.SubPlanId);
}
return q;
}
SGGL/BLL/CQMS/RewardAndPunish/RewardAndPunishService.cs
+68
View File
@@ -115,5 +115,73 @@ namespace BLL
else
return null;
}
//public static List<Model.Meeting_CQMSMeeting> getListDataForApi(string projectId, int startRowIndex, int maximumRows, string type)
//{
// using (var db = new Model.SGGLDB(Funs.ConnString))
// {
// IQueryable<Model.RewardAndPunish_RewardAndPunish> q = db.RewardAndPunish_RewardAndPunish;
// if (!string.IsNullOrEmpty(projectId))
// {
// q = q.Where(e => e.ProjectId == projectId);
// }
// if (type!="0")
// {
// q = q.Where(e => e.Type == type);
// }
// var qres = from x in q
// orderby x.CompileDate descending
// select new
// {
// x.MeetingId,
// x.ProjectId,
// x.UnitId,
// UnitName = (from y in db.Base_Unit where y.UnitId == x.UnitId select y.UnitName).First(),
// x.MeetingType,
// MeetingTypeStr = x.MeetingType == "M" ? "质量月例会" : "质量专题会",
// x.MeetingCode,
// x.MeetingDate,
// x.Place,
// x.HostMan,
// HostManName = BLL.Person_PersonsService.getPersonsNamesPersonIds(x.HostMan),
// x.AttentPerson,
// AttentPersonName = BLL.Person_PersonsService.getPersonsNamesPersonIds(x.AttentPerson),
// x.AttentPersonNum,
// x.MeetingTheme,
// x.MeetingContents,
// x.CompileDate,
// x.CompileMan,
// x.State,
// StateStr = ConvertState(x.State),
// CompileManName = (from y in db.Person_Persons where y.PersonId == x.CompileMan select y.PersonName).First(),
// HandleManName = BLL.CQMS_MeetingApproveService.GetHandleManName(x.MeetingId),
// x.AttachUrl,
// };
// List<Model.Meeting_CQMSMeeting> res = new List<Model.Meeting_CQMSMeeting>();
// var list = qres.Skip(startRowIndex).Take(maximumRows).ToList();
// foreach (var item in list)
// {
// Model.Meeting_CQMSMeeting cd = new Model.Meeting_CQMSMeeting();
// cd.MeetingId = item.MeetingId;
// cd.ProjectId = item.ProjectId;
// cd.UnitId = item.UnitId + "$" + item.UnitName;
// cd.MeetingType = item.MeetingType + "$" + item.MeetingTypeStr;
// cd.MeetingCode = item.MeetingCode;
// cd.MeetingDate = item.MeetingDate;
// cd.Place = item.Place;
// cd.HostMan = item.HostMan + "$" + item.HostManName;
// cd.AttentPerson = item.AttentPerson + "$" + item.AttentPersonName;
// cd.AttentPersonNum = item.AttentPersonNum;
// cd.MeetingTheme = item.MeetingTheme;
// cd.MeetingContents = item.MeetingContents;
// cd.CompileDate = item.CompileDate;
// cd.CompileMan = item.CompileMan + "$" + item.CompileManName;
// cd.State = item.State + "$" + item.StateStr + "$" + item.HandleManName;
// cd.AttachUrl = AttachFileService.getFileUrl(item.MeetingId);
// res.Add(cd);
// }
// return res;
// }
//}
}
}
SGGL/BLL/CQMS/Train/CQMS_TrainPlanService.cs
+3
View File
@@ -131,6 +131,7 @@ namespace BLL
x.RealTrainPersons,
x.CompileDate,
x.CompileMan,
x.AttachUrl,
CompileManName = (from y in db.Person_Persons where y.PersonId == x.CompileMan select y.PersonName).First(),
};
List<Model.Train_TrainPlan> res = new List<Model.Train_TrainPlan>();
@@ -152,6 +153,7 @@ namespace BLL
cd.RealTrainPersons = item.RealTrainPersons;
cd.CompileDate = item.CompileDate;
cd.CompileMan = item.CompileMan + "$" + item.CompileManName;
cd.AttachUrl = AttachFileService.getFileUrl(item.TrainPlanId);
res.Add(cd);
}
return res;
@@ -173,6 +175,7 @@ namespace BLL
q.PlanTrainPersons = q.PlanTrainPersons + "$" + ConvertPlanTrainPersons(q.PlanTrainPersons);
q.TrainTypeId = q.TrainTypeId + "$" + (from y in db.Base_CQMSTrainType where y.TrainTypeId == q.TrainTypeId select y.TrainTypeName).First();
q.RealTrainPersons = q.RealTrainPersons + "$" + Person_PersonsService.getPersonsNamesPersonIds(q.RealTrainPersons);
q.HostMan = q.HostMan + "$" + BLL.Person_PersonsService.getPersonsNamesPersonIds(q.HostMan);
q.CompileMan = q.CompileMan + "$" + BLL.Person_PersonsService.GetPersonsNameById(q.CompileMan);
q.AttachUrl = AttachFileService.getFileUrl(q.TrainPlanId);
}
SGGL/FineUIPro.Web/CQMS/RewardAndPunish/RewardAndPunish.aspx.cs
+1 -1
View File
@@ -66,7 +66,7 @@ namespace FineUIPro.Web.CQMS.RewardAndPunish
strSql += " AND ins.UnitId=@UnitId";
listStr.Add(new SqlParameter("@UnitId", drpUnit.SelectedValue));
}
if (this.rblType.SelectedValue != "0")
if (this.rblType.SelectedValue != "0")
{
strSql += " AND ins.Type=@Type";
listStr.Add(new SqlParameter("@Type", rblType.SelectedValue));
SGGL/Model/Model.cs
+24
View File
@@ -124992,6 +124992,8 @@ namespace Model
private System.Nullable<System.DateTime> _CompileDate;
private string _AttachUrl;
private EntityRef<Base_Project> _Base_Project;
private EntitySet<Meeting_CQMSMeetingApprove> _Meeting_CQMSMeetingApprove;
@@ -125030,6 +125032,8 @@ namespace Model
partial void OnCompileManChanged();
partial void OnCompileDateChanging(System.Nullable<System.DateTime> value);
partial void OnCompileDateChanged();
partial void OnAttachUrlChanging(string value);
partial void OnAttachUrlChanged();
#endregion
public Meeting_CQMSMeeting()
@@ -125343,6 +125347,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttachUrl", DbType="NVarChar(1000)")]
public string AttachUrl
{
get
{
return this._AttachUrl;
}
set
{
if ((this._AttachUrl != value))
{
this.OnAttachUrlChanging(value);
this.SendPropertyChanging();
this._AttachUrl = value;
this.SendPropertyChanged("AttachUrl");
this.OnAttachUrlChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Meeting_CQMSMeeting_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project
{
SGGL/WebAPI/Controllers/CQMS/CQMSMeetingController.cs
+246
View File
@@ -11,6 +11,252 @@ namespace WebAPI.Controllers
/// </summary>
public class CQMSMeetingController : ApiController
{
/// <summary>
/// 根据项目id获取质量会议列表集合
/// </summary>
/// <param name="projectId"></param>
/// <param name="index"></param>
/// <param name="page"></param>
/// <param name="meetingType"></param>
/// <returns></returns>
[HttpGet]
public ResponseData<List<Meeting_CQMSMeeting>> getMeetingList(string projectId, int index, int page, string meetingType)
{
ResponseData<List<Meeting_CQMSMeeting>> res = new ResponseData<List<Meeting_CQMSMeeting>>();
res.successful = true;
res.resultValue = BLL.CQMS_MeetingService.getListDataForApi(projectId, index, page, meetingType);
return res;
}
/// <summary>
/// 根据id获取质量会议详情
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpGet]
public ResponseData<Meeting_CQMSMeeting> GetMeetingByMeetingId(string id)
{
ResponseData<Meeting_CQMSMeeting> res = new ResponseData<Meeting_CQMSMeeting>();
Meeting_CQMSMeeting cd = BLL.CQMS_MeetingService.GetMeetingByMeetingIdForApi(id);
res.successful = true;
res.resultValue = BeanUtil.CopyOjbect<Meeting_CQMSMeeting>(cd, true);
return res;
}
/// <summary>
/// 根据id获取审核记录集合
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public ResponseData<List<Meeting_CQMSMeetingApprove>> GetApproveById(string id)
{
ResponseData<List<Meeting_CQMSMeetingApprove>> res = new ResponseData<List<Meeting_CQMSMeetingApprove>>();
res.successful = true;
res.resultValue = BLL.CQMS_MeetingApproveService.GetListDataByIdForApi(id);
return res;
}
/// <summary>
/// 根据id获取当前办理人审批信息
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public ResponseData<Meeting_CQMSMeetingApprove> GetCurrApproveById(string id)
{
ResponseData<Meeting_CQMSMeetingApprove> res = new ResponseData<Meeting_CQMSMeetingApprove>();
res.successful = true;
res.resultValue = BeanUtil.CopyOjbect<Meeting_CQMSMeetingApprove>(BLL.CQMS_MeetingApproveService.getCurrApproveForApi(id), true);
return res;
}
/// <summary>
/// 保存会议主表信息
/// </summary>
/// <param name="meeting"></param>
/// <returns></returns>
[HttpPost]
public ResponseData<string> AddCQMSMeeting([FromBody] Model.Meeting_CQMSMeeting meeting)
{
ResponseData<string> res = new ResponseData<string>();
try
{
if (string.IsNullOrEmpty(meeting.MeetingId))
{
meeting.MeetingId = Guid.NewGuid().ToString();
BLL.CQMS_MeetingService.AddMeetingForApi(meeting);
if (meeting.MeetingType == "M")
{
SaveAttachFile(meeting.MeetingId, BLL.Const.CQMSMonthMeetingMenuId, meeting.AttachUrl);
}
else
{
SaveAttachFile(meeting.MeetingId, BLL.Const.CQMSSpecialMeetingMenuId, meeting.AttachUrl);
}
res.resultValue = meeting.MeetingId;
}
else
{
BLL.CQMS_MeetingService.UpdateMeetingForApi(meeting);
if (meeting.MeetingType == "M")
{
SaveAttachFile(meeting.MeetingId, BLL.Const.CQMSMonthMeetingMenuId, meeting.AttachUrl);
}
else
{
SaveAttachFile(meeting.MeetingId, BLL.Const.CQMSSpecialMeetingMenuId, meeting.AttachUrl);
}
res.resultValue = meeting.MeetingId;
}
res.successful = true;
}
catch (Exception e)
{
res.resultHint = e.StackTrace;
res.successful = false;
}
return res;
}
public static void SaveAttachFile(string dataId, string menuId, string url)
{
Model.ToDoItem toDoItem = new Model.ToDoItem
{
MenuId = menuId,
DataId = dataId,
UrlStr = url,
};
APIUpLoadFileService.SaveAttachUrl(toDoItem);
}
/// <summary>
/// 新增办理信息
/// </summary>
/// <param name="approve"></param>
/// <returns></returns>
[HttpPost]
public ResponseData<string> AddApprove([FromBody] Model.Meeting_CQMSMeetingApprove approve)
{
ResponseData<string> res = new ResponseData<string>();
try
{
Model.Meeting_CQMSMeeting Meeting = new Model.Meeting_CQMSMeeting();
Meeting.MeetingId = approve.MeetingId;
Meeting.State = approve.ApproveType;
BLL.CQMS_MeetingService.UpdateMeetingForApi(Meeting);
res.resultValue = BLL.CQMS_MeetingApproveService.AddMeetingApproveForApi(approve);
res.successful = true;
}
catch (Exception e)
{
res.resultHint = e.StackTrace;
res.successful = false;
}
return res;
}
/// <summary>
/// 更新办理信息
/// </summary>
/// <param name="approve"></param>
/// <returns></returns>
[HttpPost]
public ResponseData<string> UpdateApprove([FromBody] Model.Meeting_CQMSMeetingApprove approve)
{
ResponseData<string> res = new ResponseData<string>();
try
{
approve.ApproveDate = DateTime.Now;
BLL.CQMS_MeetingApproveService.UpdateMeetingApproveForApi(approve);
res.successful = true;
}
catch (Exception e)
{
res.resultHint = e.StackTrace;
res.successful = false;
}
return res;
}
/// <summary>
/// 获取主持人信息
/// </summary>
/// <returns></returns>
public Model.ResponeData getHostMan(string projectId, string unitId)
{
var responeData = new Model.ResponeData();
try
{
responeData.data = APIBaseInfoService.getCQMSMeetingHostMan(projectId, unitId);
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
/// <summary>
/// 获取质量会议参加人员
/// </summary>
/// <returns></returns>
public Model.ResponeData getAttentPerson(string projectId)
{
var responeData = new Model.ResponeData();
try
{
responeData.data = APIBaseInfoService.getAttentPerson(projectId);
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
/// <summary>
/// 根据状态获取办理步骤 0-重新编制，1-编制，2-总包质量经理审批，C-审批完成
/// </summary>
/// <returns></returns>
public Model.ResponeData getHandleListByState(string state)
{
var responeData = new Model.ResponeData();
try
{
responeData.data = CQMS_MeetingService.GetDHandleTypeByStateForApi(state);
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
/// <summary>
/// 根据办理步骤获取办理人
/// </summary>
/// <returns></returns>
public Model.ResponeData getHandleManListByState(string state, string id, string projectId)
{
var responeData = new Model.ResponeData();
try
{
responeData.data = CQMS_MeetingService.GetHandleManListForApi(state, id, projectId);
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
}
}
SGGL/WebAPI/Controllers/CQMS/CQMSRewardAndPunishController.cs
+28
View File
@@ -0,0 +1,28 @@
using BLL;
using Model;
using System;
using System.Collections.Generic;
using System.Web.Http;
namespace WebAPI.Controllers
{
public class CQMSRewardAndPunishController : ApiController
{
/// <summary>
/// 根据项目id获取质量会议列表集合
/// </summary>
/// <param name="projectId"></param>
/// <param name="index"></param>
/// <param name="page"></param>
/// <param name="type">0-全部，1-奖励，2-处罚</param>
/// <returns></returns>
[HttpGet]
public ResponseData<List<RewardAndPunish_RewardAndPunish>> getMeetingList(string projectId, int index, int page, string type)
{
ResponseData<List<RewardAndPunish_RewardAndPunish>> res = new ResponseData<List<RewardAndPunish_RewardAndPunish>>();
res.successful = true;
//res.resultValue = BLL.RewardAndPunishService.getListDataForApi(projectId, index, page, type);
return res;
}
}
}
SGGL/WebAPI/Controllers/UnitController.cs
+22
View File
@@ -55,6 +55,28 @@ namespace WebAPI.Controllers
}
#endregion
#region 获取项目所有单位
/// <summary>
/// 获取项目所有单位
/// </summary>
/// <returns></returns>
public Model.ResponeData getProjectUnitLists(string projectId)
{
var responeData = new Model.ResponeData();
try
{
responeData.data = APIUnitService.getProjectUnitLists(projectId);
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 根据projectId、unitType获取单位信息（总包1;施工分包2;监理3;业主4;其他5）
/// <summary>
/// 根据projectId、unitType获取单位信息（总包1;施工分包2;监理3;业主4;其他5）
SGGL/WebAPI/WebAPI.csproj
+1
View File
@@ -170,6 +170,7 @@
<Compile Include="Controllers\CQMS\CQMSMeetingController.cs" />
<Compile Include="Controllers\CQMS\CQMSPersonManageController.cs" />
<Compile Include="Controllers\CQMS\CQMSPlanController.cs" />
<Compile Include="Controllers\CQMS\CQMSRewardAndPunishController.cs" />
<Compile Include="Controllers\CQMS\CQMSTrainController.cs" />
<Compile Include="Controllers\CQMS\WBSController.cs" />
<Compile Include="Controllers\HJGL\HJGLIndexController.cs" />