wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

外修申请流程退回

Browse Source
This commit is contained in:
周科达
2023-05-29 16:28:10 +08:00
parent 686de1be34
commit ec889a802a
2 changed files with 65 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
EquipMgr/Tnb.EquipMgr/EqpRepairOutApplyService.cs
View File

@@ -6,6 +6,7 @@ using JNPF.DependencyInjection;
using JNPF.DynamicApiController; using JNPF.DynamicApiController;
using JNPF.FriendlyException; using JNPF.FriendlyException;
using JNPF.WorkFlow.Interfaces.Service; using JNPF.WorkFlow.Interfaces.Service;
using JNPF.WorkFlow.Service;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using SqlSugar; using SqlSugar;
@@ -24,11 +25,14 @@ namespace Tnb.EquipMgr
{ {
private readonly ISqlSugarRepository<EqpRepairOutApply> _repository; private readonly ISqlSugarRepository<EqpRepairOutApply> _repository;
private readonly IUserManager _userManager; private readonly IUserManager _userManager;
private readonly IFlowTaskService _flowTaskService; private readonly FlowTaskService _flowTaskService;
private const string flowId = "26299060075302"; /// <summary>
/// flow_templatejson 表的id
/// </summary>
private const string flowId = "26414803850262";
public EqpRepairOutApplyService(ISqlSugarRepository<EqpRepairOutApply> repository, public EqpRepairOutApplyService(ISqlSugarRepository<EqpRepairOutApply> repository,
IFlowTaskService flowTaskService, FlowTaskService flowTaskService,
IUserManager userManager) IUserManager userManager)
{ {
_repository = repository; _repository = repository;
@@ -71,19 +75,19 @@ namespace Tnb.EquipMgr
} }
else else
{ {
await _repository.UpdateAsync(x=>new EqpRepairOutApply // await _repository.UpdateAsync(x=>new EqpRepairOutApply
{ // {
repair_apply_id = input.repair_apply_id, // repair_apply_id = input.repair_apply_id,
equip_id = input.equip_id, // equip_id = input.equip_id,
supplier_id = input.supplier_id, // supplier_id = input.supplier_id,
estimated_cost = input.estimated_cost, // estimated_cost = input.estimated_cost,
construction_period_requirement = input.construction_period_requirement, // construction_period_requirement = input.construction_period_requirement,
out_apply_reason = input.out_apply_reason, // out_apply_reason = input.out_apply_reason,
remark = input.remark, // remark = input.remark,
create_id = _userManager.UserId, // create_id = _userManager.UserId,
create_time = DateTime.Now, // create_time = DateTime.Now,
approve_status = RepairOutApplyStatus.TOBEAPPROVE, // approve_status = RepairOutApplyStatus.TOBEAPPROVE,
},x=>x.id==input.id); // },x=>x.id==input.id);
} }
await db.Updateable<EqpRepairApply>() await db.Updateable<EqpRepairApply>()
@@ -99,25 +103,52 @@ namespace Tnb.EquipMgr
//todo 退回流程 //todo 退回流程
if (result.IsSuccess) if (result.IsSuccess)
{ {
_flowTaskService.Create(new FlowTaskSubmitModel() if (string.IsNullOrEmpty(input.id))
{ {
flowId = flowId, _flowTaskService.Create(new FlowTaskSubmitModel()
parentId = "0",
formData = new JObject()
{ {
{"id",id}, flowId = flowId,
{"repair_apply_id",input.repair_apply_id}, parentId = "0",
{"equip_id",input.equip_id}, formData = new JObject()
{"create_id",_userManager.UserId}, {
{"supplier_id",input.supplier_id}, {"id",id},
{"estimated_cost",input.estimated_cost}, {"repair_apply_id",input.repair_apply_id},
{"construction_period_requirement",input.construction_period_requirement}, {"equip_id",input.equip_id},
{"out_apply_reason",input.out_apply_reason}, {"create_id",_userManager.UserId},
{"remark",input.remark}, {"supplier_id",input.supplier_id},
{"approve_status",RepairOutApplyStatus.TOBEAPPROVE}, {"estimated_cost",input.estimated_cost},
} {"construction_period_requirement",input.construction_period_requirement},
{"out_apply_reason",input.out_apply_reason},
}); {"remark",input.remark},
{"approve_status",RepairOutApplyStatus.TOBEAPPROVE},
}
});
}
else
{
var entity = await _repository.GetSingleAsync(x=>x.id==input.id);
_flowTaskService.Update("",new FlowTaskSubmitModel()
{
flowId = flowId,
parentId = "0",
id = entity.flow_task_id,
formData = new JObject()
{
{"id",id},
{"repair_apply_id",input.repair_apply_id},
{"equip_id",input.equip_id},
{"create_id",_userManager.UserId},
{"supplier_id",input.supplier_id},
{"estimated_cost",input.estimated_cost},
{"construction_period_requirement",input.construction_period_requirement},
{"out_apply_reason",input.out_apply_reason},
{"remark",input.remark},
{"approve_status",RepairOutApplyStatus.TOBEAPPROVE},
}
});
}
} }
return result.IsSuccess ? "操作成功" : result.ErrorMessage; return result.IsSuccess ? "操作成功" : result.ErrorMessage;
} }

1
EquipMgr/Tnb.EquipMgr/Tnb.EquipMgr.csproj
View File

@@ -12,6 +12,7 @@
<ProjectReference Include="..\..\BasicData\Tnb.BasicData.Interfaces\Tnb.BasicData.Interfaces.csproj" /> <ProjectReference Include="..\..\BasicData\Tnb.BasicData.Interfaces\Tnb.BasicData.Interfaces.csproj" />
<ProjectReference Include="..\..\system\Tnb.Systems\Tnb.Systems.csproj" /> <ProjectReference Include="..\..\system\Tnb.Systems\Tnb.Systems.csproj" />
<ProjectReference Include="..\..\visualdev\Tnb.VisualDev.Engine\Tnb.VisualDev.Engine.csproj" /> <ProjectReference Include="..\..\visualdev\Tnb.VisualDev.Engine\Tnb.VisualDev.Engine.csproj" />
<ProjectReference Include="..\..\workflow\Tnb.WorkFlow\Tnb.WorkFlow.csproj" />
<ProjectReference Include="..\Tnb.EquipMgr.Interfaces\Tnb.EquipMgr.Interfaces.csproj" /> <ProjectReference Include="..\Tnb.EquipMgr.Interfaces\Tnb.EquipMgr.Interfaces.csproj" />
</ItemGroup> </ItemGroup>