Skip to content

J
JunmpPoliceStation
Commit 66f2a021 by zxw
Options

调拨拆分查询getbyid

parent a6211cdb
正在显示 包含 61 行增加 和 50 行删除
JmpModel/Model/DataContext/JunmppolicesqlContext.cs
......@@ -11,11 +11,15 @@ namespace JmpModel.Model.DataContext
{
public JunmppolicesqlContext()
{
//60秒超时
this.Database.SetCommandTimeout(60);
}
public JunmppolicesqlContext(DbContextOptions<JunmppolicesqlContext> options)
: base(options)
{
//60秒超时
this.Database.SetCommandTimeout(60);
}
public virtual DbSet<AlipayConfig> AlipayConfigs { get; set; }
......
JunmpPoliceStation/Controllers/TransferController.cs
......@@ -82,50 +82,57 @@ namespace JunmpPoliceStation.Controllers
var param = new string[] {
"CommonJpProcessHistories",
"CommonJpTransferApplies",
"CommonJpTransferApplies.Transfer",
"CommonJpTransferApplies.CommonJpTransfers",
"CommonJpTransferApplies.Target",
"CommonJpTransferApplies.TransferWarehouseNavigation" ,
"CommonJpProcessHistories" ,
"CommonJpTransferApplies.CommonJpTransferDetailEstimates.EquipmentSize" ,
"CommonJpTransferApplies.CommonJpTransferDetailEstimates.EquipmentDetail" ,
"CommonJpTransferApplies.CommonJpTransferDetailEstimates.Supplier" ,
"CommonJpTransferApplies.CommonJpTransferDetailRealities.Size" ,
"CommonJpTransferApplies.CommonJpTransferDetailRealities.EquipmentDetail" ,
"CommonJpTransferApplies.CommonJpTransferDetailRealities.Supplier" ,
"CommonJpTransferApplies.CommonJpTransferDetailRealities.Warehouse" ,
};
Expression<Func<CommonJpProcessCurrent, bool>> expression = p => p.OrderId != null;
var param2 = new string[] {
"Transfer",
"CommonJpTransfers",
"Target",
"TransferWarehouseNavigation" ,
"CommonJpTransferDetailEstimates.EquipmentSize" ,
"CommonJpTransferDetailEstimates.EquipmentDetail" ,
"CommonJpTransferDetailEstimates.Supplier" ,
"CommonJpTransferDetailRealities.Size" ,
"CommonJpTransferDetailRealities.EquipmentDetail" ,
"CommonJpTransferDetailRealities.Supplier" ,
"CommonJpTransferDetailRealities.Warehouse" ,
};
Expression<Func<CommonJpTransferApply, bool>> expression = p => true;
if (string.IsNullOrEmpty(type))
{
expression = LambdaExtensions.And(expression, p => p.OrderId.Equals(id) || p.CommonJpTransferApplies.Where(c => c.Order.Equals(id)).Count() > 0);
expression = LambdaExtensions.AndAlso(expression, p => p.Id.Equals(id) || p.Order.Equals(id));
}
else
{
if (type.Equals("调拨") || type.Equals("跨库借用"))
{
expression = LambdaExtensions.And(expression, p => p.OrderId.Equals(id) || p.CommonJpTransferApplies.Where(c => c.Order.Equals(id)).Count() > 0);
}
else if (type.Equals("跨库归还"))
{
expression = LambdaExtensions.And(expression, p => p.OrderId.Equals(id) || p.CommonJpTransferApplies.FirstOrDefault().CommonJpTransfers.Where(p => p.Order.Equals(id)).Count() > 0);
expression = LambdaExtensions.AndAlso(expression, p => p.Id.Equals(id) || p.Order.Equals(id));
}
//else if (type.Equals("跨库归还"))
//{
// expression = LambdaExtensions.And(expression, p => p.OrderId.Equals(id) || p.CommonJpTransferApplies.FirstOrDefault().CommonJpTransfers.Where(p => p.Order.Equals(id)).Count() > 0);
//}
}
//expression = expression.AndAlso(x =>
// x.CommonJpTransferApplies.FirstOrDefault().CreateTime < new DateTime(2023, 1, 9));
var transfer = _unitOfWork.CommonJpProcessCurrentRepository.GetList(expression, null, false, param).ToList();
var transfer = _unitOfWork.TransferApplyRepository.GetList(expression, null, false, param2).ToList();
if (transfer.Count > 0)
{
var first = transfer[0];
var process = _unitOfWork.CommonJpProcessCurrentRepository
.GetList(x => x.OrderId == first.Id, null, false, param).ToList();
string value = RedisCacheHelper.GetStringValue(transfer.FirstOrDefault().CommonJpTransferApplies.FirstOrDefault().Order);//获取数据
string value = RedisCacheHelper.GetStringValue(first.Order);//获取数据
if (!string.IsNullOrEmpty(value))
{
......@@ -135,7 +142,7 @@ namespace JunmpPoliceStation.Controllers
var transferData = transfer.Select(t => new
var transferData = process.Select(t => new
{
type = t.CommonJpTransferApplies.First().ActionType.ToString().Equals("0") ? 0 : t.CommonJpTransferApplies.First().ActionType.ToString().Equals("1") ? 7 : 9,
......@@ -147,34 +154,34 @@ namespace JunmpPoliceStation.Controllers
t.UserType,
t.DataScope,
t.OrgId,
t.CommonJpTransferApplies?.FirstOrDefault()?.UpdateTime,
first.UpdateTime,
t.CurrentStepName,
expectedReturnTime = t.CommonJpTransferApplies?.FirstOrDefault()?.ExpectedReturnTime,
CurrentOrg = t.CommonJpTransferApplies?.FirstOrDefault()?.TransferId,
id = t.CommonJpTransferApplies?.FirstOrDefault()?.Id,
applyId = t.CommonJpTransferApplies?.FirstOrDefault()?.ApplyUser,
applyName = t.CommonJpTransferApplies?.FirstOrDefault()?.ApplyUserName,
applyTime = t.CommonJpTransferApplies?.FirstOrDefault()?.ApplyTime,
note = t.CommonJpTransferApplies?.FirstOrDefault()?.Reason,
createTime = t.CommonJpTransferApplies?.FirstOrDefault()?.CreateTime,
warehouseName = t.CommonJpTransferApplies?.FirstOrDefault()?.TransferWarehouseNavigation?.Name,
warehouseId = t.CommonJpTransferApplies?.FirstOrDefault()?.TransferWarehouse,
order = t.CommonJpTransferApplies?.FirstOrDefault()?.CommonJpTransfers?.FirstOrDefault()?.Order == null ? t.CommonJpTransferApplies?.FirstOrDefault().Order : t.CommonJpTransferApplies?.FirstOrDefault()?.CommonJpTransfers?.FirstOrDefault()?.Order,
transferName = t.CommonJpTransferApplies?.FirstOrDefault()?.Transfer?.Name,
transferShortName = string.IsNullOrEmpty(t.CommonJpTransferApplies?.FirstOrDefault()?.Transfer?.DName) ?
t.CommonJpTransferApplies?.FirstOrDefault()?.Transfer?.Name
: t.CommonJpTransferApplies?.FirstOrDefault()?.Transfer?.DName,
transferId = t.CommonJpTransferApplies?.FirstOrDefault()?.Transfer?.Id,
targetName = t.CommonJpTransferApplies?.FirstOrDefault()?.Target?.Name,
targetShortName = string.IsNullOrEmpty(t.CommonJpTransferApplies?.FirstOrDefault()?.Target?.DName) ?
t.CommonJpTransferApplies?.FirstOrDefault()?.Target?.Name
: t.CommonJpTransferApplies?.FirstOrDefault()?.Target?.DName,
targetId = t.CommonJpTransferApplies?.FirstOrDefault()?.Target?.Id,
expectedReturnTime = first.ExpectedReturnTime,
CurrentOrg = first.TransferId,
id = first.Id,
applyId = first.ApplyUser,
applyName = first.ApplyUserName,
applyTime = first.ApplyTime,
note = first.Reason,
createTime = first.CreateTime,
warehouseName = first.TransferWarehouseNavigation?.Name,
warehouseId = first.TransferWarehouse,
order = first.CommonJpTransfers?.FirstOrDefault()?.Order == null ? t.CommonJpTransferApplies?.FirstOrDefault().Order : first.CommonJpTransfers?.FirstOrDefault()?.Order,
transferName = first.Transfer?.Name,
transferShortName = string.IsNullOrEmpty(first.Transfer?.DName) ?
first.Transfer?.Name
: first.Transfer?.DName,
transferId = first.Transfer?.Id,
targetName = first.Target?.Name,
targetShortName = string.IsNullOrEmpty(first.Target?.DName) ?
first.Target?.Name
: first.Target?.DName,
targetId = first.Target?.Id,
actionResult = t.CommonJpProcessHistories?
.OrderBy(p => p.UpdateTime)
.FirstOrDefault()?
.AuditUserId.Equals(t.CommonJpTransferApplies?.FirstOrDefault()?.ApplyUser) == true ? "0" : "1",
.AuditUserId.Equals(first.ApplyUser) == true ? "0" : "1",
historyList = t.CommonJpProcessHistories?.Select(x => new
......@@ -187,7 +194,7 @@ namespace JunmpPoliceStation.Controllers
x.AuditMind,
x.AuditUserName
}).OrderByDescending(c => c.UpdateTime),
detailList = t.CommonJpTransferApplies?.FirstOrDefault()?.CommonJpTransferDetailEstimates?.Select(x => new
detailList = first.CommonJpTransferDetailEstimates?.Select(x => new
{
equipmentSizeId = x.EquipmentSize?.Id,
......@@ -203,8 +210,8 @@ namespace JunmpPoliceStation.Controllers
price = x.Price,
}).OrderBy(p => p.equipmentDetailName),
realityDetailList = t.CommonJpTransferApplies?.FirstOrDefault()?.CommonJpTransferDetailRealities.Count() == 0 ? entity.realityDetailList
: t.CommonJpTransferApplies?.FirstOrDefault()?.CommonJpTransferDetailRealities?.Select(x => new
realityDetailList = first.CommonJpTransferDetailRealities.Count() == 0 ? entity.realityDetailList
: first.CommonJpTransferDetailRealities?.Select(x => new
{
realityId = x.Id,
equipmentSizeId = x.Size?.Id,
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论