Skip to content

K
Kivii.Third.Scjgj
Commit babb4f2a by Neo Turing
Options

初始化

parent c637ebd1
Showing with 159 additions and 141 deletions
Src/Extensions.cs 0 → 100644
using Kivii.Lims.Entities;
using Kivii.Third.Scjgj.Entities;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Kivii.Third.Scjgj
{
internal static class Extensions
{
internal static Report ConvertTo(this PlanDetail item)
{
Report rtns = new Report();
rtns.Metadata = new Dictionary<string, string>();
rtns.Metadata["SamplingOrderID"] = $"{item.PLAN_CODE}{item.LOT_NUM}";
rtns.SampleSourceBatchNumber = item.PLAN_CODE;
return rtns;
}
}
}
Src/Kivii.Third.Scjgj.V4.5.csproj
...@@ -54,7 +54,8 @@ ...@@ -54,7 +54,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Configs.cs" /> <Compile Include="Configs.cs" />
<Compile Include="Entities\Plan.cs" /> <Compile Include="Extensions.cs" />
<Compile Include="Plan.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RestfulPlan.cs" /> <Compile Include="RestfulPlan.cs" />
</ItemGroup> </ItemGroup>
...@@ -67,6 +68,9 @@ ...@@ -67,6 +68,9 @@
<ItemGroup> <ItemGroup>
<None Include="App.config" /> <None Include="App.config" />
<None Include="packages.config" /> <None Include="packages.config" />
<None Include="Resources\抽样系统中间库数据接口文档-v20210219.docx" />
<None Include="Resources\省局任务查询数据库.docx" />
</ItemGroup> </ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>
\ No newline at end of file
Src/Kivii.Third.Scjgj.V4.5.csproj.user 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
</Project>
\ No newline at end of file
Src/Entities/Plan.cs → Src/Plan.cs
...@@ -9,28 +9,30 @@ namespace Kivii.Third.Scjgj.Entities ...@@ -9,28 +9,30 @@ namespace Kivii.Third.Scjgj.Entities
{ {
[Api(Description = "省局任务")] [Api(Description = "省局任务")]
[Alias(Configs.TableNamePlan)] [Alias(Configs.TableNamePlan)]
public class Plan : Entity, IEntityIgnoreCreateTable,IEntityInAnyDb public class Plan : Entity, IEntityIgnoreCreateTable, IEntityInAssemblyDb
{ {
#region IEntity Ignore #region IEntity Ignore
[PrimaryKey] [PrimaryKey]
[IgnoreUpdate] [IgnoreUpdate]
[Alias("UUID")] [Alias("UUID")]
public new Guid Kvid { get; set; } public new Guid Kvid { get; set; }
[Ignore]
[Alias("CREATEDATE")]
public new DateTime CreateTime { get; set; } public new DateTime CreateTime { get; set; }
[Ignore]
/// <summary>
///// 结果通知日期
/// </summary>
//[Ignore]
[Alias("NOTICE_TIME")]
public new DateTime UpdateTime { get; set; } public new DateTime UpdateTime { get; set; }
[Ignore]
public new List<string> OnlyProperties { get; set; }
//[Ignore] //[Ignore]
/// <summary> /// <summary>
///// 任务状态(1.未下达 2.已下达 3.已领取 4.已完成 0.已撤回 5.已上传) ///// 任务状态(1.未下达 2.已下达 3.已领取 4.已完成 0.已撤回 5.已上传)
/// </summary> /// </summary>
[Alias("PLAN_STATE")] [Alias("PLAN_STATE")]
public new int Status { get; set; } public new int Status { get; set; }
[Ignore]
public new object Tag { get; set; }
#endregion #endregion
/// <summary> /// <summary>
...@@ -69,11 +71,11 @@ namespace Kivii.Third.Scjgj.Entities ...@@ -69,11 +71,11 @@ namespace Kivii.Third.Scjgj.Entities
[StringLength(1)] [StringLength(1)]
public string CHECK_KIND { get; set; } public string CHECK_KIND { get; set; }
/// <summary> ///// <summary>
/// 结果通知日期 ///// 结果通知日期
/// </summary> ///// </summary>
[StringLength(10)] //[StringLength(10)]
public string NOTICE_TIME { get; set; } //public string NOTICE_TIME { get; set; }
/// <summary> /// <summary>
/// 检测有效日期 /// 检测有效日期
...@@ -116,10 +118,10 @@ namespace Kivii.Third.Scjgj.Entities ...@@ -116,10 +118,10 @@ namespace Kivii.Third.Scjgj.Entities
[StringLength(1)] [StringLength(1)]
public string CHECK_TYPE { get; set; } public string CHECK_TYPE { get; set; }
/// <summary> ///// <summary>
/// 生成时间 ///// 生成时间
/// </summary> ///// </summary>
public DateTime CREATEDATE { get; set; } //public DateTime CREATEDATE { get; set; }
/// <summary> /// <summary>
/// 自增ID /// 自增ID
...@@ -309,35 +311,27 @@ namespace Kivii.Third.Scjgj.Entities ...@@ -309,35 +311,27 @@ namespace Kivii.Third.Scjgj.Entities
[Api(Description = "省局任务明细")] [Api(Description = "省局任务明细")]
[Alias(Configs.TableNamePlanDetail)] [Alias(Configs.TableNamePlanDetail)]
public class PlanDetail : Entity, IEntityIgnoreCreateTable, IEntityInAnyDb public class PlanDetail : Entity, IEntityIgnoreCreateTable, IEntityInAssemblyDb
{ {
#region IEntity Ignore #region IEntity Ignore
//[Ignore]
/// <summary>
/// 自增编号
/// </summary>
[PrimaryKey]
[Alias("ID")]
public new int Kvid { get; set; }
[Ignore] [Ignore]
public new DateTime CreateTime { get; set; } public new Guid Kvid { get; set; }
[Alias("CREATEDATE")]
public new DateTime CreateTime { get; set; }
[Ignore] [Ignore]
public new DateTime UpdateTime { get; set; } public new DateTime UpdateTime { get; set; }
[Ignore]
public new List<string> OnlyProperties { get; set; }
//[Ignore] //[Ignore]
/// 抽检任务状态 0:抽样人员待上传 1:抽样人员已上传 2:抽样信息上传照片未上传 3:抽样信息上传照片已上传 4:已提交（提交省公司） 5:提交审批 6:审批通过 7:驳回 8:无效 9:删除 /// 抽检任务状态 0:抽样人员待上传 1:抽样人员已上传 2:抽样信息上传照片未上传 3:抽样信息上传照片已上传 4:已提交（提交省公司） 5:提交审批 6:审批通过 7:驳回 8:无效 9:删除
[Alias("STATE")] [Alias("STATE")]
public new int Status { get; set; } public new int Status { get; set; }
[Ignore]
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>
/// 单据编号 /// 单据编号
...@@ -472,10 +466,10 @@ namespace Kivii.Third.Scjgj.Entities ...@@ -472,10 +466,10 @@ namespace Kivii.Third.Scjgj.Entities
[StringLength(2000)] [StringLength(2000)]
public string REMARKS { get; set; } public string REMARKS { get; set; }
/// <summary> ///// <summary>
/// 生成时间 ///// 生成时间
/// </summary> ///// </summary>
public DateTime CREATEDATE { get; set; } //public DateTime CREATEDATE { get; set; }
/// <summary> /// <summary>
/// 受检产品抽样批量 /// 受检产品抽样批量
......
Src/RestfulPlan.cs
using Kivii.Linq; using Kivii.Lims.Entities;
using Kivii.Linq;
using Kivii.Testing;
using Kivii.Third.Scjgj.Entities; using Kivii.Third.Scjgj.Entities;
using Kivii.Web; using Kivii.Web;
using System; using System;
...@@ -12,55 +14,39 @@ namespace Kivii.Third.Scjgj ...@@ -12,55 +14,39 @@ 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>();
//var rtns = new RestfulQueryResponse<Plan>(); rtns.Results = new List<Plan>();
//rtns.Results = new List<Plan>(); var factory = Kivii.Linq.LinqUtils.GetLinqConnectionFactory("Data Source=218.94.159.228:8083/sjdb;User Id=sjqzsfzydbl;Password=admin;", "Oracle");
//var conn = KiviiContext.GetOpenedDbConnection<Plan>(); using (var conn = factory.OpenDbConnection())
//var query = conn.From<Plan>(); {
//if (!QueryValues.IsNullOrEmpty()) query.Where(o => o.PLAN_CODE.Contains(QueryValues)); try
//if (Skip.HasValue && Skip.Value >= 0) query.Skip(Skip.Value); {
//if (Take.HasValue && Take.Value > 0) query.Take(Take.Value); var query = conn.From<Plan>();
//if (!OrderBy.IsNullOrEmpty()) query.OrderBy(OrderBy); if (!QueryValues.IsNullOrEmpty()) query.Where(o => o.PLAN_CODE.Contains(QueryValues));
//rtns.Results = conn.Select(query); if (Skip.HasValue && Skip.Value >= 0) query.Skip(Skip.Value);
if (Take.HasValue && Take.Value > 0) query.Take(Take.Value);
//rtns.Total = rtns.Results.Count; if (!OrderBy.IsNullOrEmpty()) query.OrderBy(OrderBy);
//return rtns; rtns.Results = conn.Select(query);
var conn = KiviiContext.GetOpenedDbConnection<Plan>();
var dynamicParams = Request.GetRequestParams();
var autoQuery = Request.TryResolve<IAutoQueryDb>(); rtns.Total = conn.Scalar<Plan, int>(o => Sql.Count(o.ID));
autoQuery.IncludeTotal = true; }
var request = new RestfulQuery<Plan>(); catch (Exception ex)
request = request.PopulateWith(this); {
var sqlExpress = autoQuery.CreateQuery(Request, conn, request, dynamicParams);
var rtns = autoQuery.Execute(Request, conn, request, sqlExpress); }
}
return rtns; return rtns;
} }
} }
...@@ -68,84 +54,87 @@ namespace Kivii.Third.Scjgj ...@@ -68,84 +54,87 @@ 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 int? Take { get; set; } = 50;
//public string OrderBy { 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; }
#region QueryArgs
public virtual int? Skip { get; set; }
public virtual int? Take { get; set; } //public bool Convert { get; set; }
//#region QueryArgs
//public virtual int? Skip { get; set; }
public virtual string OrderBy { get; set; } //public virtual int? Take { get; set; }
public string OrderByDesc { get; set; } //public virtual string OrderBy { get; set; }
public virtual string Include { get; set; } //public string OrderByDesc { get; set; }
public virtual string Fields { get; set; } //public virtual string Include { get; set; }
public string QueryKeys { get; set; } //public virtual string Fields { get; set; }
public string QueryValues { get; set; } //public string QueryKeys { get; set; }
//public string QueryValues { get; set; }
#endregion //#endregion
public override object OnExecution(IRequest req, IResponse res) public override object OnExecution(IRequest req, IResponse res)
{ {
var rtns = new RestfulQueryResponse<PlanDetail>();
//var rtns = new RestfulQueryResponse<Plan>(); rtns.Results = new List<PlanDetail>();
//rtns.Results = new List<Plan>(); var factory = Kivii.Linq.LinqUtils.GetLinqConnectionFactory("Data Source=218.94.159.228:8083/sjdb;User Id=sjqzsfzydbl;Password=admin;", "Oracle");
using (var conn = factory.OpenDbConnection())
{
try
{
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);
var results = conn.Select(query);
var total = conn.Scalar<PlanDetail, int>(o => Sql.Count(o.ID));
rtns.Results = results;
rtns.Total = total;
}
catch (Exception ex)
{
}
}
return rtns;
//var conn = KiviiContext.GetOpenedDbConnection<Plan>(); //var conn = KiviiContext.GetOpenedDbConnection<Plan>();
//var query = conn.From<Plan>(); //var query = conn.From<PlanDetail>();
//if (!QueryValues.IsNullOrEmpty()) query.Where(o => o.PLAN_CODE.Contains(QueryValues)); //if (!QueryValues.IsNullOrEmpty()) query.Where(o => o.PLAN_CODE.Contains(QueryValues));
//if (Skip.HasValue && Skip.Value >= 0) query.Skip(Skip.Value); //if (Skip.HasValue && Skip.Value >= 0) query.Skip(Skip.Value);
//if (Take.HasValue && Take.Value > 0) query.Take(Take.Value); //if (Take.HasValue && Take.Value > 0) query.Take(Take.Value);
//if (!OrderBy.IsNullOrEmpty()) query.OrderBy(OrderBy); //if (!OrderBy.IsNullOrEmpty()) query.OrderBy(OrderBy);
//rtns.Results = conn.Select(query); //var results = conn.Select(query);
//var total = conn.Scalar<PlanDetail, int>(o => Sql.Count(o.ID));
//rtns.Total = rtns.Results.Count; //var rtns = new RestfulQueryResponse<PlanDetail>();
//rtns.Results = new List<PlanDetail>();
//rtns.Results = results;
//rtns.Total = total;
//return rtns; //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;
} }
} }
//[RequiresAnyRole(MemberRoles.Everyone)] public class PlanDetailConvert : RestfulExecution<PlanDetail>
//public class PlanDetailQuery : RestfulExecution<PlanDetail> {
//{ public string BatchNumber { get; set; }//计划编号PLAN_CODE
// public int? Skip { get; set; } = 0;
public string PlanNumber { get; set; }//计划批次号LOT_NUM
// public int? Take { get; set; } = 50;
public override object OnExecution(IRequest req, IResponse res)
// public string OrderBy { get; set; } {
// public string QueryKeys { get; set; } BatchNumber.ThrowIfNullOrEmpty("请传入计划编号");
PlanNumber.ThrowIfNullOrEmpty("请传入批次号");
// public string QueryValues { get; set; } return base.OnExecution(req, res);
// 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