河北专项检查和移动端
This commit is contained in:
@@ -86,51 +86,51 @@ namespace FineUIPro.Web.OfficeCheck.Inspect
|
||||
where x.InspectionItemId == this.InspectionItemId
|
||||
select new
|
||||
{
|
||||
x.InspectionItemId,
|
||||
x.InspectionDescribe,
|
||||
x.PhotoUrl,
|
||||
x.VideoUrl,
|
||||
inspectionJoin.PersonResponsible,
|
||||
x.EvaluateResults,
|
||||
inspectionJoin.InspectMan,
|
||||
x.TimeLimited,
|
||||
x.RectificationDescription
|
||||
//x.InspectionItemId,
|
||||
//x.InspectionDescribe,
|
||||
//x.PhotoUrl,
|
||||
//x.VideoUrl,
|
||||
//inspectionJoin.PersonResponsible,
|
||||
//x.EvaluateResults,
|
||||
//inspectionJoin.InspectMan,
|
||||
//x.TimeLimited,
|
||||
//x.RectificationDescription
|
||||
}).FirstOrDefault();
|
||||
if (registration != null)
|
||||
{
|
||||
this.txtInspectionDescribe.Text = registration.InspectionDescribe;
|
||||
// this.UploadPhoto.Text = registration.PhotoUrl;
|
||||
// this.UploadVideo.Text = registration.VideoUrl;
|
||||
if (registration.InspectMan != null)
|
||||
{
|
||||
//查询用户名
|
||||
var user = (from x in Funs.DB.Sys_User
|
||||
where x.UserId == registration.InspectMan
|
||||
select new { x.UserName }).FirstOrDefault();
|
||||
if (user != null)
|
||||
{
|
||||
this.txtCheckManName.Text = user.UserName;
|
||||
}
|
||||
}
|
||||
this.txtEvaluateResults.Text = registration.EvaluateResults;
|
||||
if (registration.PersonResponsible != null)
|
||||
{
|
||||
//查询用户名
|
||||
var user = (from x in Funs.DB.Sys_User
|
||||
where x.UserId == registration.PersonResponsible
|
||||
select new { x.UserName }).FirstOrDefault();
|
||||
if (user != null)
|
||||
{
|
||||
this.txtResponsibleManName.Text = user.UserName;
|
||||
}
|
||||
}
|
||||
if (registration.TimeLimited != null)
|
||||
{
|
||||
this.txtTimeLimited.Text = string.Format("{0:yyyy-MM-dd HH:mm:ss}", registration.TimeLimited);
|
||||
}
|
||||
this.txtRectificationDescription.Text = registration.RectificationDescription;
|
||||
this.PersonResponsible = registration.PersonResponsible;
|
||||
}
|
||||
//if (registration != null)
|
||||
//{
|
||||
// this.txtInspectionDescribe.Text = registration.InspectionDescribe;
|
||||
// // this.UploadPhoto.Text = registration.PhotoUrl;
|
||||
// // this.UploadVideo.Text = registration.VideoUrl;
|
||||
// if (registration.InspectMan != null)
|
||||
// {
|
||||
// //查询用户名
|
||||
// var user = (from x in Funs.DB.Sys_User
|
||||
// where x.UserId == registration.InspectMan
|
||||
// select new { x.UserName }).FirstOrDefault();
|
||||
// if (user != null)
|
||||
// {
|
||||
// this.txtCheckManName.Text = user.UserName;
|
||||
// }
|
||||
// }
|
||||
// this.txtEvaluateResults.Text = registration.EvaluateResults;
|
||||
// if (registration.PersonResponsible != null)
|
||||
// {
|
||||
// //查询用户名
|
||||
// var user = (from x in Funs.DB.Sys_User
|
||||
// where x.UserId == registration.PersonResponsible
|
||||
// select new { x.UserName }).FirstOrDefault();
|
||||
// if (user != null)
|
||||
// {
|
||||
// this.txtResponsibleManName.Text = user.UserName;
|
||||
// }
|
||||
// }
|
||||
// if (registration.TimeLimited != null)
|
||||
// {
|
||||
// this.txtTimeLimited.Text = string.Format("{0:yyyy-MM-dd HH:mm:ss}", registration.TimeLimited);
|
||||
// }
|
||||
// this.txtRectificationDescription.Text = registration.RectificationDescription;
|
||||
// this.PersonResponsible = registration.PersonResponsible;
|
||||
//}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -166,19 +166,19 @@ namespace FineUIPro.Web.OfficeCheck.Inspect
|
||||
var register = Inspect_InspectionService.GetInspectItemsById(this.InspectionItemId);
|
||||
if (register != null)
|
||||
{
|
||||
var file = AttachFileService.GetAttachFile(register.InspectionItemId + "_3", BLL.Const.ProjectSafetyInspectionMenuId);
|
||||
if (file != null && file.AttachUrl != "")
|
||||
{
|
||||
register.States = "3"; //已整改待复查
|
||||
register.RectificationPhotoUrl = file.AttachUrl.Trim();
|
||||
}
|
||||
else
|
||||
{
|
||||
ShowNotify("请先上传整改后照片!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
//var file = AttachFileService.GetAttachFile(register.InspectionItemId + "_3", BLL.Const.ProjectSafetyInspectionMenuId);
|
||||
//if (file != null && file.AttachUrl != "")
|
||||
//{
|
||||
// register.States = "3"; //已整改待复查
|
||||
// //register.RectificationPhotoUrl = file.AttachUrl.Trim();
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// ShowNotify("请先上传整改后照片!", MessageBoxIcon.Warning);
|
||||
// return;
|
||||
//}
|
||||
|
||||
Inspect_InspectionService.UpdateInspectionItem(register);
|
||||
//Inspect_InspectionService.UpdateInspectionItem(register);
|
||||
if (isClosed)
|
||||
{
|
||||
if (string.IsNullOrEmpty(Request.Params["Main"]))
|
||||
|
||||
Reference in New Issue
Block a user