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

重写报修接口 bug

Browse Source
This commit is contained in:
周科达
2023-10-30 14:58:43 +08:00
parent 2291c4f096
commit ad9974b1af
1 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
View File

@@ -12,6 +12,7 @@ using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev; using JNPF.VisualDev;
using JNPF.VisualDev.Entitys; using JNPF.VisualDev.Entitys;
using JNPF.VisualDev.Interfaces; using JNPF.VisualDev.Interfaces;
using Mapster;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json; using Newtonsoft.Json;
using SqlSugar; using SqlSugar;
@@ -58,29 +59,60 @@ namespace Tnb.EquipMgr
if (!input.data.ContainsKey("create_time")) if (!input.data.ContainsKey("create_time"))
{ {
input.data.Add("create_time",DateTime.Now); input.data.Add("create_time",DateTime.Now);
}else if ( string.IsNullOrEmpty((string)input.data["create_time"]))
{
input.data["create_time"] = DateTime.Now;
} }
if (!input.data.ContainsKey("create_id")) if (!input.data.ContainsKey("create_id"))
{ {
input.data.Add("create_id",_userManager.UserId); input.data.Add("create_id",_userManager.UserId);
}else if ( string.IsNullOrEmpty((string)input.data["create_id"]))
{
input.data["create_id"] = _userManager.UserId;
} }
if (!input.data.ContainsKey("apply_user_id")) if (!input.data.ContainsKey("apply_user_id"))
{ {
input.data.Add("apply_user_id",_userManager.UserId); input.data.Add("apply_user_id",_userManager.UserId);
}else if ( string.IsNullOrEmpty((string)input.data["apply_user_id"]))
{
input.data["apply_user_id"] = _userManager.UserId;
} }
if (!input.data.ContainsKey("org_id")) if (!input.data.ContainsKey("org_id"))
{ {
input.data.Add("org_id",_userManager.GetUserInfo().Result.organizeId); input.data.Add("org_id",_userManager.GetUserInfo().Result.organizeId);
}else if ( string.IsNullOrEmpty((string)input.data["org_id"]))
{
input.data["org_id"] = _userManager.GetUserInfo().Result.organizeId;
} }
if (!input.data.ContainsKey("code")) if (!input.data.ContainsKey("code"))
{ {
input.data.Add("code",await _billRuleService.GetBillNumber(CodeTemplateConst.EQPREPAIR_CODE)); input.data.Add("code",await _billRuleService.GetBillNumber(CodeTemplateConst.EQPREPAIR_CODE));
}else if (string.IsNullOrEmpty((string)input.data["code"]))
{
input.data["code"] = await _billRuleService.GetBillNumber(CodeTemplateConst.EQPREPAIR_CODE);
} }
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
await _runService.Create(templateEntity, input); EqpRepairApply eqpRepairApply = new EqpRepairApply();
eqpRepairApply.code = (string)input.data["code"];
eqpRepairApply.name = (string)input.data["name"];
eqpRepairApply.equip_id = (string)input.data["equip_id"];
eqpRepairApply.expect_complete_time = input.data["expect_complete_time"]!=null && input.data["expect_complete_time"].ToString()!="" ? (DateTime?)input.data["expect_complete_time"] : null;
eqpRepairApply.is_ugent = (int?)(long)input.data["is_ugent"];
eqpRepairApply.attachment = (string)input.data["attachment"];
eqpRepairApply.apply_user_id = (string)input.data["apply_user_id"];
eqpRepairApply.create_id = (string)input.data["create_id"];
eqpRepairApply.create_time = DateTime.Now;
eqpRepairApply.org_id = (string)input.data["org_id"];
eqpRepairApply.remark = (string)input.data["remark"];
eqpRepairApply.description = (string)input.data["description"];
await _repository.InsertAsync(eqpRepairApply);
// VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
// await _runService.Create(templateEntity, input);
return await Task.FromResult(true); return await Task.FromResult(true);
} }
@@ -209,7 +241,7 @@ namespace Tnb.EquipMgr
{ {
EqpRepairApply eqpRepairApply = await _repository.GetSingleAsync(x=>x.id==input.id); EqpRepairApply eqpRepairApply = await _repository.GetSingleAsync(x=>x.id==input.id);
if (eqpRepairApply.status == RepairApplyStatus.TOBERECEIVED) if (eqpRepairApply.status == RepairApplyStatus.RECEIVED)
{ {
if (_userManager.UserId == eqpRepairApply.repairer_id) if (_userManager.UserId == eqpRepairApply.repairer_id)
{ {