提交代码
This commit is contained in:
@@ -639,6 +639,7 @@
|
||||
<Compile Include="Party\ThemePartyDayService.cs" />
|
||||
<Compile Include="Party\TwoOneGoodSelectionService.cs" />
|
||||
<Compile Include="Party\WorkPlanService.cs" />
|
||||
<Compile Include="Person\Person_BusinessTripService.cs" />
|
||||
<Compile Include="Person\Person_MeetingService.cs" />
|
||||
<Compile Include="Person\PersonTotalService.cs" />
|
||||
<Compile Include="Person\Person_DutyService.cs" />
|
||||
@@ -650,6 +651,7 @@
|
||||
<Compile Include="Person\Person_ShuntApproveService.cs" />
|
||||
<Compile Include="Person\Person_ShuntDetailService.cs" />
|
||||
<Compile Include="Person\Person_ShuntService.cs" />
|
||||
<Compile Include="Person\Person_TestRunPerformanceService.cs" />
|
||||
<Compile Include="Person\Person_TrainingPlanService.cs" />
|
||||
<Compile Include="ProjectData\MainItemService.cs" />
|
||||
<Compile Include="ProjectData\ProjectData_CodeTemplateRuleService.cs" />
|
||||
@@ -865,6 +867,7 @@
|
||||
<Compile Include="ZHGL\Supervise\SuperviseCheckRectifyService.cs" />
|
||||
<Compile Include="ZHGL\Supervise\SuperviseCheckReportItemService.cs" />
|
||||
<Compile Include="ZHGL\Supervise\SuperviseCheckReportService.cs" />
|
||||
<Compile Include="ZHGL\TestRunPerformance\TestRunPerformanceMonthReportService.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Model\Model.csproj">
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
@@ -102,5 +103,104 @@ namespace BLL
|
||||
Funs.FineUIPleaseSelect(dropName);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static ListItem[] GetTypes()
|
||||
{
|
||||
var q = (from x in Funs.DB.Base_TestRunPerformanceStandard orderby x.Code select new { Value = x.Type, Code1 = x.Code1 }).Distinct().ToList();
|
||||
q = q.OrderBy(x => x.Code1).ToList();
|
||||
ListItem[] list = new ListItem[q.Count()];
|
||||
for (int i = 0; i < q.Count(); i++)
|
||||
{
|
||||
list[i] = new ListItem(q[i].Value ?? "", q[i].Value);
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 项目表下拉框
|
||||
/// </summary>
|
||||
/// <param name="dropName">下拉框名字</param>
|
||||
/// <param name="isShowPlease">是否显示请选择</param>
|
||||
public static void InitTypeDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
|
||||
{
|
||||
dropName.DataValueField = "Text";
|
||||
dropName.DataTextField = "Text";
|
||||
dropName.DataSource = GetTypes();
|
||||
dropName.DataBind();
|
||||
if (isShowPlease)
|
||||
{
|
||||
Funs.FineUIPleaseSelect(dropName);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static ListItem[] GetItems(string type)
|
||||
{
|
||||
var q = (from x in Funs.DB.Base_TestRunPerformanceStandard where x.Type == type orderby x.Code select new { Value = x.Item, Code1 = x.Code2 }).Distinct().ToList();
|
||||
q = q.OrderBy(x => x.Code1).ToList();
|
||||
ListItem[] list = new ListItem[q.Count()];
|
||||
for (int i = 0; i < q.Count(); i++)
|
||||
{
|
||||
list[i] = new ListItem(q[i].Value ?? "", q[i].Value);
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 项目表下拉框
|
||||
/// </summary>
|
||||
/// <param name="dropName">下拉框名字</param>
|
||||
/// <param name="isShowPlease">是否显示请选择</param>
|
||||
public static void InitItemDropDownList(FineUIPro.DropDownList dropName, string type, bool isShowPlease)
|
||||
{
|
||||
dropName.DataValueField = "Text";
|
||||
dropName.DataTextField = "Text";
|
||||
dropName.DataSource = GetItems(type);
|
||||
dropName.DataBind();
|
||||
if (isShowPlease)
|
||||
{
|
||||
Funs.FineUIPleaseSelect(dropName);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static ListItem[] GetUnits(string type, string item)
|
||||
{
|
||||
var q = (from x in Funs.DB.Base_TestRunPerformanceStandard where x.Type == type && x.Item == item orderby x.Code select new { Value = x.Unit, Code1 = x.Code3, x.TestRunPerformanceStandardId }).ToList();
|
||||
q = q.OrderBy(x => x.Code1).ToList();
|
||||
ListItem[] list = new ListItem[q.Count()];
|
||||
for (int i = 0; i < q.Count(); i++)
|
||||
{
|
||||
list[i] = new ListItem(q[i].Value ?? "", q[i].TestRunPerformanceStandardId);
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 项目表下拉框
|
||||
/// </summary>
|
||||
/// <param name="dropName">下拉框名字</param>
|
||||
/// <param name="isShowPlease">是否显示请选择</param>
|
||||
public static void InitUnitDropDownList(FineUIPro.DropDownList dropName, string type, string item, bool isShowPlease)
|
||||
{
|
||||
dropName.DataValueField = "Value";
|
||||
dropName.DataTextField = "Text";
|
||||
dropName.DataSource = GetUnits(type, item);
|
||||
dropName.DataBind();
|
||||
if (isShowPlease)
|
||||
{
|
||||
Funs.FineUIPleaseSelect(dropName);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -799,6 +799,16 @@ namespace BLL
|
||||
/// </summary>
|
||||
public const string PersonDutyMenuId = "A913653D-1EBB-4F55-97C9-81CC5B5913C4";
|
||||
|
||||
/// <summary>
|
||||
/// 员工出差记录
|
||||
/// </summary>
|
||||
public const string BusinessTripMenuId = "522EAECC-3D40-4804-A066-A43BA8F6BFC1";
|
||||
|
||||
/// <summary>
|
||||
/// 员工开车绩效记录
|
||||
/// </summary>
|
||||
public const string TestRunPerformanceMenuId = "16229932-671B-4E04-BB61-A5C7DE4CE47F";
|
||||
|
||||
/// <summary>
|
||||
/// HSSE公司管理规定发布
|
||||
/// </summary>
|
||||
@@ -4876,6 +4886,11 @@ namespace BLL
|
||||
/// 开车绩效评分标准
|
||||
/// </summary>
|
||||
public const string TestRunPerformanceStandardMenuId = "383290E0-60AE-4D16-8B5E-3899B85EC2ED";
|
||||
|
||||
/// <summary>
|
||||
/// 开车人员月绩效报告
|
||||
/// </summary>
|
||||
public const string TestRunPerformanceMonthReportMenuId = "C1240FCB-4C72-445E-82B5-EBFAA87D0AC6";
|
||||
#endregion
|
||||
|
||||
#region 施工综合流程定义
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
public class Person_BusinessTripService
|
||||
{
|
||||
/// <summary>
|
||||
/// 获取人员信息
|
||||
/// </summary>
|
||||
/// <param name="BusinessTripId">人员Id</param>
|
||||
/// <returns>人员信息</returns>
|
||||
public static Model.Person_BusinessTrip GetPersonBusinessTripById(string BusinessTripId)
|
||||
{
|
||||
return Funs.DB.Person_BusinessTrip.FirstOrDefault(e => e.BusinessTripId == BusinessTripId);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 增加人员总结信息
|
||||
/// </summary>
|
||||
/// <param name="user">人员实体</param>
|
||||
public static void AddPersonBusinessTrip(Model.Person_BusinessTrip BusinessTrip)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
Model.Person_BusinessTrip newBusinessTrip = new Model.Person_BusinessTrip
|
||||
{
|
||||
BusinessTripId = BusinessTrip.BusinessTripId,
|
||||
Type = BusinessTrip.Type,
|
||||
ProjectId = BusinessTrip.ProjectId,
|
||||
UserId = BusinessTrip.UserId,
|
||||
ArriveDate = BusinessTrip.ArriveDate,
|
||||
LeaveDate = BusinessTrip.LeaveDate,
|
||||
};
|
||||
db.Person_BusinessTrip.InsertOnSubmit(newBusinessTrip);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 修改人员总结信息
|
||||
/// </summary>
|
||||
/// <param name="user">实体</param>
|
||||
public static void UpdatePersonBusinessTrip(Model.Person_BusinessTrip BusinessTrip)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
Model.Person_BusinessTrip newBusinessTrip = db.Person_BusinessTrip.FirstOrDefault(e => e.BusinessTripId == BusinessTrip.BusinessTripId);
|
||||
if (newBusinessTrip != null)
|
||||
{
|
||||
newBusinessTrip.Type = BusinessTrip.Type;
|
||||
newBusinessTrip.ProjectId = BusinessTrip.ProjectId;
|
||||
newBusinessTrip.ArriveDate = BusinessTrip.ArriveDate;
|
||||
newBusinessTrip.LeaveDate = BusinessTrip.LeaveDate;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据人员Id删除一个人员信息
|
||||
/// </summary>
|
||||
/// <param name="Person_BusinessTripId"></param>
|
||||
public static void DeletePersonBusinessTrip(string BusinessTripId)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
Model.Person_BusinessTrip user = db.Person_BusinessTrip.FirstOrDefault(e => e.BusinessTripId == BusinessTripId);
|
||||
if (user != null)
|
||||
{
|
||||
db.Person_BusinessTrip.DeleteOnSubmit(user);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,75 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
public class Person_TestRunPerformanceService
|
||||
{
|
||||
/// <summary>
|
||||
/// 获取人员信息
|
||||
/// </summary>
|
||||
/// <param name="TestRunPerformanceId">人员Id</param>
|
||||
/// <returns>人员信息</returns>
|
||||
public static Model.Person_TestRunPerformance GetPersonTestRunPerformanceById(string TestRunPerformanceId)
|
||||
{
|
||||
return Funs.DB.Person_TestRunPerformance.FirstOrDefault(e => e.TestRunPerformanceId == TestRunPerformanceId);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 增加人员总结信息
|
||||
/// </summary>
|
||||
/// <param name="user">人员实体</param>
|
||||
public static void AddPersonTestRunPerformance(Model.Person_TestRunPerformance TestRunPerformance)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
Model.Person_TestRunPerformance newTestRunPerformance = new Model.Person_TestRunPerformance
|
||||
{
|
||||
TestRunPerformanceId = TestRunPerformance.TestRunPerformanceId,
|
||||
ProjectId = TestRunPerformance.ProjectId,
|
||||
UserId = TestRunPerformance.UserId,
|
||||
Months = TestRunPerformance.Months,
|
||||
JobContent = TestRunPerformance.JobContent,
|
||||
TestRunPerformanceStandardId = TestRunPerformance.TestRunPerformanceStandardId,
|
||||
Days = TestRunPerformance.Days,
|
||||
};
|
||||
db.Person_TestRunPerformance.InsertOnSubmit(newTestRunPerformance);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 修改人员总结信息
|
||||
/// </summary>
|
||||
/// <param name="user">实体</param>
|
||||
public static void UpdatePersonTestRunPerformance(Model.Person_TestRunPerformance TestRunPerformance)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
Model.Person_TestRunPerformance newTestRunPerformance = db.Person_TestRunPerformance.FirstOrDefault(e => e.TestRunPerformanceId == TestRunPerformance.TestRunPerformanceId);
|
||||
if (newTestRunPerformance != null)
|
||||
{
|
||||
newTestRunPerformance.Months = TestRunPerformance.Months;
|
||||
newTestRunPerformance.JobContent = TestRunPerformance.JobContent;
|
||||
newTestRunPerformance.TestRunPerformanceStandardId = TestRunPerformance.TestRunPerformanceStandardId;
|
||||
newTestRunPerformance.Days = TestRunPerformance.Days;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据人员Id删除一个人员信息
|
||||
/// </summary>
|
||||
/// <param name="Person_TestRunPerformanceId"></param>
|
||||
public static void DeletePersonTestRunPerformance(string TestRunPerformanceId)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
Model.Person_TestRunPerformance user = db.Person_TestRunPerformance.FirstOrDefault(e => e.TestRunPerformanceId == TestRunPerformanceId);
|
||||
if (user != null)
|
||||
{
|
||||
db.Person_TestRunPerformance.DeleteOnSubmit(user);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -391,6 +391,34 @@
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 项目表下拉框
|
||||
/// </summary>
|
||||
/// <param name="dropName">下拉框名字</param>
|
||||
/// <param name="isShowPlease">是否显示请选择</param>
|
||||
public static void InitAllProjectDropDownList2(FineUIPro.DropDownList dropName, bool isShowPlease)
|
||||
{
|
||||
dropName.DataValueField = "ProjectId";
|
||||
dropName.DataTextField = "ProjectName";
|
||||
var projectlist = BLL.ProjectService.GetAllProjectDropDownList();
|
||||
Model.Base_Project project = new Base_Project();
|
||||
project.ProjectId = "0";
|
||||
project.ProjectName = "本部";
|
||||
List<Model.Base_Project> list = new List<Base_Project>();
|
||||
list.Add(project);
|
||||
list.AddRange(projectlist);
|
||||
dropName.DataSource = list;
|
||||
dropName.DataBind();
|
||||
if (projectlist.Count() == 0)
|
||||
{
|
||||
isShowPlease = true;
|
||||
}
|
||||
if (isShowPlease)
|
||||
{
|
||||
Funs.FineUIPleaseSelect(dropName);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
|
||||
@@ -44,6 +44,7 @@ namespace BLL
|
||||
newGoodsBuyItem.GoodsBuyId = GoodsBuyItem.GoodsBuyId;
|
||||
newGoodsBuyItem.GoodsModelId = GoodsBuyItem.GoodsModelId;
|
||||
newGoodsBuyItem.Quantity = GoodsBuyItem.Quantity;
|
||||
newGoodsBuyItem.Num = GoodsBuyItem.Num;
|
||||
newGoodsBuyItem.RequiredTime = GoodsBuyItem.RequiredTime;
|
||||
db.DriverGoods_GoodsBuyItem.InsertOnSubmit(newGoodsBuyItem);
|
||||
db.SubmitChanges();
|
||||
|
||||
@@ -0,0 +1,72 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
public class TestRunPerformanceMonthReportService
|
||||
{
|
||||
/// <summary>
|
||||
/// 根据主键获取开车人员月绩效报告
|
||||
/// </summary>
|
||||
/// <param name="TestRunPerformanceMonthReportId"></param>
|
||||
/// <returns></returns>
|
||||
public static Model.ZHGL_TestRunPerformanceMonthReport GetTestRunPerformanceMonthReportById(string TestRunPerformanceMonthReportId)
|
||||
{
|
||||
return Funs.DB.ZHGL_TestRunPerformanceMonthReport.FirstOrDefault(e => e.TestRunPerformanceMonthReportId == TestRunPerformanceMonthReportId);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 添加开车人员月绩效报告
|
||||
/// </summary>
|
||||
/// <param name="TestRunPerformanceMonthReport"></param>
|
||||
public static void AddTestRunPerformanceMonthReport(Model.ZHGL_TestRunPerformanceMonthReport TestRunPerformanceMonthReport)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
Model.ZHGL_TestRunPerformanceMonthReport newTestRunPerformanceMonthReport = new Model.ZHGL_TestRunPerformanceMonthReport
|
||||
{
|
||||
TestRunPerformanceMonthReportId = TestRunPerformanceMonthReport.TestRunPerformanceMonthReportId,
|
||||
Year = TestRunPerformanceMonthReport.Year,
|
||||
UserId = TestRunPerformanceMonthReport.UserId,
|
||||
CompileMan = TestRunPerformanceMonthReport.CompileMan,
|
||||
CompileDate = TestRunPerformanceMonthReport.CompileDate
|
||||
};
|
||||
db.ZHGL_TestRunPerformanceMonthReport.InsertOnSubmit(newTestRunPerformanceMonthReport);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 修改开车人员月绩效报告
|
||||
/// </summary>
|
||||
/// <param name="TestRunPerformanceMonthReport"></param>
|
||||
public static void UpdateTestRunPerformanceMonthReport(Model.ZHGL_TestRunPerformanceMonthReport TestRunPerformanceMonthReport)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
Model.ZHGL_TestRunPerformanceMonthReport newTestRunPerformanceMonthReport = db.ZHGL_TestRunPerformanceMonthReport.FirstOrDefault(e => e.TestRunPerformanceMonthReportId == TestRunPerformanceMonthReport.TestRunPerformanceMonthReportId);
|
||||
if (newTestRunPerformanceMonthReport != null)
|
||||
{
|
||||
newTestRunPerformanceMonthReport.Year = TestRunPerformanceMonthReport.Year;
|
||||
newTestRunPerformanceMonthReport.UserId = TestRunPerformanceMonthReport.UserId;
|
||||
newTestRunPerformanceMonthReport.CompileMan = TestRunPerformanceMonthReport.CompileMan;
|
||||
newTestRunPerformanceMonthReport.CompileDate = TestRunPerformanceMonthReport.CompileDate;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据主键删除开车人员月绩效报告
|
||||
/// </summary>
|
||||
/// <param name="TestRunPerformanceMonthReportId"></param>
|
||||
public static void DeleteTestRunPerformanceMonthReportById(string TestRunPerformanceMonthReportId)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
Model.ZHGL_TestRunPerformanceMonthReport TestRunPerformanceMonthReport = db.ZHGL_TestRunPerformanceMonthReport.FirstOrDefault(e => e.TestRunPerformanceMonthReportId == TestRunPerformanceMonthReportId);
|
||||
if (TestRunPerformanceMonthReport != null)
|
||||
{
|
||||
db.ZHGL_TestRunPerformanceMonthReport.DeleteOnSubmit(TestRunPerformanceMonthReport);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user