Skip to content

K
Kivii.Third.Scjgj
Commit 9626789a by 陶然
Options

优化

parent 06c18f03
Showing with 164 additions and 66 deletions
Src/Entities/Plan.cs
...@@ -9,21 +9,28 @@ namespace Kivii.Third.Scjgj.Entities ...@@ -9,21 +9,28 @@ namespace Kivii.Third.Scjgj.Entities
{ {
[Api(Description = "省局任务")] [Api(Description = "省局任务")]
[Alias(Configs.TableNamePlan)] [Alias(Configs.TableNamePlan)]
public class Plan : IEntity, IEntityIgnoreCreateTable,IEntityInAnyDb public class Plan : Entity, IEntityIgnoreCreateTable,IEntityInAnyDb
{ {
#region IEntity Ignore #region IEntity Ignore
[PrimaryKey]
[IgnoreUpdate]
[Alias("UUID")]
public new Guid Kvid { get; set; }
[Ignore] [Ignore]
public Guid Kvid { get; set; } public new DateTime CreateTime { get; set; }
[Ignore]
public DateTime CreateTime { get; set; }
[Ignore]
public DateTime UpdateTime { get; set; }
[Ignore] [Ignore]
public List<string> OnlyProperties { get; set; } public new DateTime UpdateTime { get; set; }
[Ignore] [Ignore]
public int Status { get; set; } public new List<string> OnlyProperties { get; set; }
//[Ignore]
/// <summary>
///// 任务状态(1.未下达 2.已下达 3.已领取 4.已完成 0.已撤回 5.已上传)
/// </summary>
[Alias("PLAN_STATE")]
public new int Status { get; set; }
[Ignore] [Ignore]
public object Tag { get; set; } public new object Tag { get; set; }
#endregion #endregion
/// <summary> /// <summary>
...@@ -50,11 +57,11 @@ namespace Kivii.Third.Scjgj.Entities ...@@ -50,11 +57,11 @@ namespace Kivii.Third.Scjgj.Entities
[StringLength(2000)] [StringLength(2000)]
public string CONTENTS { get; set; } public string CONTENTS { get; set; }
/// <summary> ///// <summary>
/// 任务状态(1.未下达 2.已下达 3.已领取 4.已完成 0.已撤回 5.已上传) ///// 任务状态(1.未下达 2.已下达 3.已领取 4.已完成 0.已撤回 5.已上传)
/// </summary> ///// </summary>
[StringLength(1)] //[StringLength(1)]
public string PLAN_STATE { get; set; } //public string PLAN_STATE { get; set; }
/// <summary> /// <summary>
/// 任务类型（已作废） /// 任务类型（已作废）
...@@ -292,38 +299,45 @@ namespace Kivii.Third.Scjgj.Entities ...@@ -292,38 +299,45 @@ namespace Kivii.Third.Scjgj.Entities
[StringLength(2)] [StringLength(2)]
public string PLAN_INFO_SYN_TYPE { get; set; } public string PLAN_INFO_SYN_TYPE { get; set; }
/// <summary> ///// <summary>
/// 唯一标识（取方案系统UUID） ///// 唯一标识（取方案系统UUID）
/// </summary> ///// </summary>
[PrimaryKey] //[PrimaryKey]
[StringLength(50)] //[StringLength(50)]
public string UUID { get; set; } //public string UUID { get; set; }
} }
[Api(Description = "省局任务明细")] [Api(Description = "省局任务明细")]
[Alias(Configs.TableNamePlanDetail)] [Alias(Configs.TableNamePlanDetail)]
public class PlanDetail : IEntity, IEntityIgnoreCreateTable, IEntityInAnyDb public class PlanDetail : Entity, IEntityIgnoreCreateTable, IEntityInAnyDb
{ {
#region IEntity Ignore #region IEntity Ignore
//[Ignore]
/// <summary>
/// 自增编号
/// </summary>
[PrimaryKey]
[Alias("ID")]
public new int Kvid { get; set; }
[Ignore] [Ignore]
public Guid Kvid { get; set; } public new DateTime CreateTime { get; set; }
[Ignore]
public DateTime CreateTime { get; set; }
[Ignore]
public DateTime UpdateTime { get; set; }
[Ignore] [Ignore]
public List<string> OnlyProperties { get; set; } public new DateTime UpdateTime { get; set; }
[Ignore] [Ignore]
public int Status { get; set; } public new List<string> OnlyProperties { get; set; }
//[Ignore]
/// 抽检任务状态 0:抽样人员待上传 1:抽样人员已上传 2:抽样信息上传照片未上传 3:抽样信息上传照片已上传 4:已提交（提交省公司） 5:提交审批 6:审批通过 7:驳回 8:无效 9:删除
[Alias("STATE")]
public new int Status { get; set; }
[Ignore] [Ignore]
public object Tag { get; set; } public new object Tag { get; set; }
#endregion #endregion
/// <summary> ///// <summary>
/// 自增编号 ///// 自增编号
/// </summary> ///// </summary>
[PrimaryKey] //[PrimaryKey]
public int ID { get; set; } //public int ID { get; set; }
/// <summary> /// <summary>
/// 单据编号 /// 单据编号
...@@ -469,11 +483,11 @@ namespace Kivii.Third.Scjgj.Entities ...@@ -469,11 +483,11 @@ namespace Kivii.Third.Scjgj.Entities
[StringLength(100)] [StringLength(100)]
public string GOODS_CHECK_LOT { get; set; } public string GOODS_CHECK_LOT { get; set; }
/// <summary> ///// <summary>
/// 抽检任务状态 0:抽样人员待上传 1:抽样人员已上传 2:抽样信息上传照片未上传 3:抽样信息上传照片已上传 4:已提交（提交省公司） 5:提交审批 6:审批通过 7:驳回 8:无效 9:删除 ///// 抽检任务状态 0:抽样人员待上传 1:抽样人员已上传 2:抽样信息上传照片未上传 3:抽样信息上传照片已上传 4:已提交（提交省公司） 5:提交审批 6:审批通过 7:驳回 8:无效 9:删除
/// </summary> ///// </summary>
[StringLength(1)] //[StringLength(1)]
public string STATE { get; set; } //public string STATE { get; set; }
/// <summary> /// <summary>
/// 生产企业-企业抽样-企业厂门，厂牌和抽样人员;市场买样-企业抽样-企业门票、销售柜台、营业执照、抽样人员、执法人员照片;电商买样-图片附件group_id（PC端的产品信息截图对应APP端所有打包截图）;其他来源-企业抽样-企业门票、销售柜台、营业执照、抽样人员、执法人员照片 /// 生产企业-企业抽样-企业厂门，厂牌和抽样人员;市场买样-企业抽样-企业门票、销售柜台、营业执照、抽样人员、执法人员照片;电商买样-图片附件group_id（PC端的产品信息截图对应APP端所有打包截图）;其他来源-企业抽样-企业门票、销售柜台、营业执照、抽样人员、执法人员照片
......
Src/RestfulPlan.cs
...@@ -12,27 +12,55 @@ namespace Kivii.Third.Scjgj ...@@ -12,27 +12,55 @@ namespace Kivii.Third.Scjgj
[RequiresAnyRole(MemberRoles.Everyone)] [RequiresAnyRole(MemberRoles.Everyone)]
public class PlanQuery : RestfulExecution<Plan> public class PlanQuery : RestfulExecution<Plan>
{ {
public int? Skip { get; set; } = 0; //public int? Skip { get; set; } = 0;
public int? Take { get; set; } = 50; //public int? Take { get; set; } = 50;
//public string OrderBy { get; set; }
//public string QueryKeys { get; set; }
//public string QueryValues { get; set; }
#region QueryArgs
public virtual int? Skip { get; set; }
public virtual int? Take { get; set; }
public virtual string OrderBy { get; set; }
public string OrderByDesc { get; set; }
public virtual string Include { get; set; }
public virtual string Fields { get; set; }
public string OrderBy { get; set; }
public string QueryKeys { get; set; } public string QueryKeys { get; set; }
public string QueryValues { get; set; } public string QueryValues { get; set; }
#endregion
public override object OnExecution(IRequest req, IResponse res) public override object OnExecution(IRequest req, IResponse res)
{ {
var rtns = new RestfulQueryResponse<Plan>();
rtns.Results = new List<Plan>(); //var rtns = new RestfulQueryResponse<Plan>();
//rtns.Results = new List<Plan>();
//var conn = KiviiContext.GetOpenedDbConnection<Plan>();
//var query = conn.From<Plan>();
//if (!QueryValues.IsNullOrEmpty()) query.Where(o => o.PLAN_CODE.Contains(QueryValues));
//if (Skip.HasValue && Skip.Value >= 0) query.Skip(Skip.Value);
//if (Take.HasValue && Take.Value > 0) query.Take(Take.Value);
//if (!OrderBy.IsNullOrEmpty()) query.OrderBy(OrderBy);
//rtns.Results = conn.Select(query);
//rtns.Total = rtns.Results.Count;
//return rtns;
var conn = KiviiContext.GetOpenedDbConnection<Plan>(); var conn = KiviiContext.GetOpenedDbConnection<Plan>();
var query = conn.From<Plan>(); var dynamicParams = Request.GetRequestParams();
if (!QueryValues.IsNullOrEmpty()) query.Where(o => o.PLAN_CODE.Contains(QueryValues)); var autoQuery = Request.TryResolve<IAutoQueryDb>();
if (Skip.HasValue && Skip.Value >= 0) query.Skip(Skip.Value); autoQuery.IncludeTotal = true;
if (Take.HasValue && Take.Value > 0) query.Take(Take.Value); var request = new RestfulQuery<Plan>();
if (!OrderBy.IsNullOrEmpty()) query.OrderBy(OrderBy); request = request.PopulateWith(this);
rtns.Results = conn.Select(query); var sqlExpress = autoQuery.CreateQuery(Request, conn, request, dynamicParams);
var rtns = autoQuery.Execute(Request, conn, request, sqlExpress);
rtns.Total = rtns.Results.Count;
return rtns; return rtns;
} }
} }
...@@ -40,28 +68,84 @@ namespace Kivii.Third.Scjgj ...@@ -40,28 +68,84 @@ namespace Kivii.Third.Scjgj
[RequiresAnyRole(MemberRoles.Everyone)] [RequiresAnyRole(MemberRoles.Everyone)]
public class PlanDetailQuery : RestfulExecution<PlanDetail> public class PlanDetailQuery : RestfulExecution<PlanDetail>
{ {
public int? Skip { get; set; } = 0; //public int? Skip { get; set; } = 0;
//public int? Take { get; set; } = 50;
//public string OrderBy { get; set; }
//public string QueryKeys { get; set; }
//public string QueryValues { get; set; }
#region QueryArgs
public virtual int? Skip { get; set; }
public int? Take { get; set; } = 50; public virtual int? Take { get; set; }
public virtual string OrderBy { get; set; }
public string OrderByDesc { get; set; }
public virtual string Include { get; set; }
public virtual string Fields { get; set; }
public string OrderBy { get; set; }
public string QueryKeys { get; set; } public string QueryKeys { get; set; }
public string QueryValues { get; set; } public string QueryValues { get; set; }
#endregion
public override object OnExecution(IRequest req, IResponse res) public override object OnExecution(IRequest req, IResponse res)
{ {
var rtns = new RestfulQueryResponse<PlanDetail>();
rtns.Results = new List<PlanDetail>(); //var rtns = new RestfulQueryResponse<Plan>();
var conn = KiviiContext.GetOpenedDbConnection<Plan>(); //rtns.Results = new List<Plan>();
var query = conn.From<PlanDetail>(); //var conn = KiviiContext.GetOpenedDbConnection<Plan>();
if (!QueryValues.IsNullOrEmpty()) query.Where(o => o.PLAN_CODE.Contains(QueryValues)); //var query = conn.From<Plan>();
if (Skip.HasValue&&Skip.Value>=0) query.Skip(Skip.Value); //if (!QueryValues.IsNullOrEmpty()) query.Where(o => o.PLAN_CODE.Contains(QueryValues));
if (Take.HasValue&&Take.Value>0) query.Take(Take.Value); //if (Skip.HasValue && Skip.Value >= 0) query.Skip(Skip.Value);
if (!OrderBy.IsNullOrEmpty()) query.OrderBy(OrderBy); //if (Take.HasValue && Take.Value > 0) query.Take(Take.Value);
rtns.Results = conn.Select(query); //if (!OrderBy.IsNullOrEmpty()) query.OrderBy(OrderBy);
//rtns.Results = conn.Select(query);
rtns.Total = rtns.Results.Count;
//rtns.Total = rtns.Results.Count;
//return rtns;
var conn = KiviiContext.GetOpenedDbConnection<PlanDetail>();
var dynamicParams = Request.GetRequestParams();
var autoQuery = Request.TryResolve<IAutoQueryDb>();
autoQuery.IncludeTotal = true;
var request = new RestfulQuery<PlanDetail>();
request = request.PopulateWith(this);
var sqlExpress = autoQuery.CreateQuery(Request, conn, request, dynamicParams);
var rtns = autoQuery.Execute(Request, conn, request, sqlExpress);
return rtns; return rtns;
} }
} }
//[RequiresAnyRole(MemberRoles.Everyone)]
//public class PlanDetailQuery : RestfulExecution<PlanDetail>
//{
// public int? Skip { get; set; } = 0;
// public int? Take { get; set; } = 50;
// public string OrderBy { get; set; }
// public string QueryKeys { get; set; }
// public string QueryValues { get; set; }
// public override object OnExecution(IRequest req, IResponse res)
// {
// var rtns = new RestfulQueryResponse<PlanDetail>();
// rtns.Results = new List<PlanDetail>();
// var conn = KiviiContext.GetOpenedDbConnection<Plan>();
// var query = conn.From<PlanDetail>();
// if (!QueryValues.IsNullOrEmpty()) query.Where(o => o.PLAN_CODE.Contains(QueryValues));
// if (Skip.HasValue&&Skip.Value>=0) query.Skip(Skip.Value);
// if (Take.HasValue&&Take.Value>0) query.Take(Take.Value);
// if (!OrderBy.IsNullOrEmpty()) query.OrderBy(OrderBy);
// rtns.Results = conn.Select(query);
// rtns.Total = rtns.Results.Count;
// return rtns;
// }
//}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment