- 黑名单新增、删除、批量导入、批量移出在配置审批节点后,审批通过才生效 - 新增黑名单待提交后可提交审批;仅首节点未审批时可撤回,进入后续节点禁止撤回 - 增加黑名单审批列表、审批弹窗、审批操作日志及状态筛选 - 支持审批配置中的“黑名单审批”流程及对应菜单、模块权限、操作权限 - 黑名单审批中禁止同名记录覆盖备注;已在黑名单中的同名导入会明确提示本次将修改备注 - 未配置审批节点时保持原有直接生效行为 - 增加黑名单审批状态机单测,39/39 通过 - 修正撤回全部失败时仍提示“撤回审批成功”的问题
83 lines
2.2 KiB
C#
83 lines
2.2 KiB
C#
using System.Collections.Generic;
|
|
using System.ComponentModel;
|
|
using System.ComponentModel.DataAnnotations.Schema;
|
|
using YLErp.DBModels;
|
|
using YLErp.Helpers;
|
|
using YLErp.Models.Tag;
|
|
|
|
namespace YLErp.Model
|
|
{
|
|
[Table("client_black")]
|
|
public class client_black : DBModelWithOperator, IDataEntity, IDataTraceV2, IClonable<client_black>
|
|
{
|
|
public const string 未提交 = "未提交";
|
|
public const string 新增审批中 = "新增审批中";
|
|
public const string 新增已拒绝 = "新增已拒绝";
|
|
public const string 已加入 = "已加入";
|
|
public const string 删除审批中 = "删除审批中";
|
|
public const string 删除已拒绝 = "删除已拒绝";
|
|
|
|
/// <summary>
|
|
/// 客户名称
|
|
/// </summary>
|
|
[DisplayName("客户名称")]
|
|
[DataChange]
|
|
public string Name { get; set; }
|
|
|
|
/// <summary>
|
|
/// 备注
|
|
/// <para>长度不应超过255</para>
|
|
/// </summary>
|
|
[DisplayName("备注")]
|
|
[DataChange]
|
|
public string Remarks { get; set; }
|
|
|
|
[DisplayName("提交审批时间")]
|
|
public DateTime? ApprovalOptDate { get; set; }
|
|
|
|
[DisplayName("提交审批人")]
|
|
public string ApprovalOptName { get; set; }
|
|
|
|
public int ApprovalProcess { get; set; }
|
|
|
|
[DisplayName("状态")]
|
|
public string State { get; set; } = "";
|
|
|
|
[DisplayName("创建人")]
|
|
public int? creator_id { get; set; }
|
|
|
|
[DisplayName("创建人")]
|
|
public string creator_name { get; set; }
|
|
|
|
[DisplayName("创建时间")]
|
|
public DateTime? creator_time { get; set; }
|
|
|
|
public client_black Clone()
|
|
{
|
|
return (client_black)MemberwiseClone();
|
|
}
|
|
|
|
public string GetDataTraceKeyId()
|
|
{
|
|
return id.ToString();
|
|
}
|
|
|
|
public string GetDataTraceKeyInfo()
|
|
{
|
|
return "客户黑名单:" + Name;
|
|
}
|
|
|
|
/// <summary>
|
|
/// 客户标签
|
|
/// </summary>
|
|
[NotMapped]
|
|
public List<TagDto> Tags { get; set; }
|
|
|
|
/// <summary>
|
|
/// 客户标签
|
|
/// </summary>
|
|
[NotMapped]
|
|
public string OutputTags { get; set; }
|
|
}
|
|
}
|