Commit 037febc1 by 陶然

优化

parent b6ebcc10
......@@ -25,7 +25,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<OutputPath>..\..\Kivii%27s Releases\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
......@@ -276,4 +276,11 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>if "$(ConfigurationName)"=="Release" if exist "$(TargetDir)Reactor\dotNET_Reactor.exe" (call "$(TargetDir)Reactor\dotNET_Reactor.exe" -file "$(TargetPath)" -targetfile "$(TargetDir)Release\$(TargetFileName)" -stringencryption 0 -antitamp 1 -suppressildasm 1)</PostBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
......@@ -22,6 +22,7 @@ namespace Kivii.Finances.Transforms
public DateTime EndTime { get; set; }
public List<string> Types { get; set; }
public bool IsOperated { get; set; }//如果True则查询OperateTime否则默认CreateTime
public override object OnExecution(IRequest req, IResponse res)
{
......@@ -39,7 +40,9 @@ namespace Kivii.Finances.Transforms
var conn = KiviiContext.GetOpenedDbConnection<Settlement>();
var sqlExpress = conn.From<Settlement>();
sqlExpress.Where(o => o.OffsetKvid == Guid.Empty);
sqlExpress.And(o => o.CreateTime >= beginTime && o.CreateTime < endTime);
if (IsOperated) sqlExpress.And(o => o.OperateTime >= beginTime && o.OperateTime < endTime);
else sqlExpress.And(o => o.CreateTime >= beginTime && o.CreateTime < endTime);
//sqlExpress.And(o => o.CreateTime >= beginTime && o.CreateTime < endTime);
if (!OwnerKvids.IsNullOrEmpty()) sqlExpress.And(o => Sql.In(o.OwnerKvid, OwnerKvids));
#region 如果是GroupByOwner的处理情况
......
......@@ -565,7 +565,7 @@ namespace Kivii.Finances.Transforms
sqlExpress.And(o => o.OperateTime >= BeginTime && o.OperateTime < EndTime);
sqlExpress.And(o => (Sql.In(o.ParentKvid, querySplits) || Sql.In(o.OwnerKvid, OwnerKvids)));
sqlExpress.OrderBy(o => o.OwnerName);
sqlExpress.Select(o => new { o.OwnerKvid, o.OwnerName, o.Amount, o.AmountInvoice, o.AmountUsed, o.OperateTime, o.CreateTime, o.Type, o.Kvid });
//sqlExpress.Select(o => new { o.OwnerKvid, o.OwnerName, o.Amount, o.AmountInvoice, o.AmountUsed, o.OperateTime, o.CreateTime, o.Type, o.Kvid });
sqlExpress.GroupBy(o => o.OwnerName);
sqlExpress.Select(o => new
......
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