找回证券业报送的逻辑,仅支持Excel模板报送
This commit is contained in:
@@ -19,158 +19,39 @@ namespace YLErp.Modules.SuperviseReportModule.SAC.Service
|
||||
|
||||
protected override DataFlagsEnum BusiDataType => DataFlagsEnum.A1003;
|
||||
|
||||
private List<OptFlagsEnum> _validOperationType = null;
|
||||
private List<OptFlagsEnum>? _validOperationType = null;
|
||||
public override List<OptFlagsEnum> ValidOperationType
|
||||
{
|
||||
get
|
||||
{
|
||||
if (_validOperationType == null)
|
||||
{
|
||||
_validOperationType = new List<OptFlagsEnum>() {
|
||||
_validOperationType ??= new List<OptFlagsEnum>() {
|
||||
OptFlagsEnum.A,
|
||||
OptFlagsEnum.U,
|
||||
OptFlagsEnum.D,
|
||||
};
|
||||
}
|
||||
return _validOperationType;
|
||||
}
|
||||
}
|
||||
|
||||
protected override SuperviseReportTypeEnum ReportType => SuperviseReportTypeEnum.SAC_SupAgrmt;
|
||||
List<SACReportNotes> noteList = new List<SACReportNotes>();
|
||||
private List<string> _cacheCodeList = new List<string>();
|
||||
|
||||
readonly List<SACReportNotes> noteList = new();
|
||||
private readonly List<string> _cacheCodeList = new();
|
||||
|
||||
protected override BodyModel GenerateBody(out bool noData, out List<string> fileList)
|
||||
{
|
||||
fileList = new List<string>();
|
||||
BodyModel model = new BodyModel();
|
||||
List<SupAgrmtModel> dataList = new List<SupAgrmtModel>();
|
||||
if ((PS.Config.ErpElement.SAC_ReportDataSource & SAC_ReportDataSourceEnum.Template) == SAC_ReportDataSourceEnum.Template)
|
||||
var model = new BodyModel();
|
||||
var dataList = new List<SupAgrmtModel>();
|
||||
if (_reqInfo.DataSource.HasFlag(SAC_ReportDataSourceEnum.Template))
|
||||
{
|
||||
dataList = GetSupAgrmtModel(ref fileList);
|
||||
}
|
||||
if ((PS.Config.ErpElement.SAC_ReportDataSource & SAC_ReportDataSourceEnum.System) == SAC_ReportDataSourceEnum.System)
|
||||
{
|
||||
LogFactory.GetLogger("GenerateBody").Info($"System:1");
|
||||
try
|
||||
{
|
||||
|
||||
|
||||
using (var baseDb = DbContextFactory.GetClientDbContext(null))
|
||||
{
|
||||
var nextDate = _reqInfo.ReportDate.AddDays(1);
|
||||
var fileObjList = (from c in baseDb.client
|
||||
join cf in baseDb.client_file
|
||||
on c.id equals cf.ClientId
|
||||
where c.ProcessStatus == "已开户" && cf.HasSent == false && cf.IsValid &&
|
||||
cf.FileTypeName == ConsGlobal.ClientFileType.EnhanceProtocol && cf.OptState == _operationType &&
|
||||
((c.ProcessOptDate >= _reqInfo.ReportDate && c.ProcessOptDate < nextDate && cf.OptDate < nextDate) ||//如果这一天开户,则把这一天之前(含这一天)的所有文件都报送了
|
||||
(cf.OptDate >= _reqInfo.ReportDate && cf.OptDate < nextDate && c.ProcessOptDate < _reqInfo.ReportDate))//如果这一天不是开户日期,则只在报送日期大于开户日期时,报送当日修改的文件
|
||||
&& cf.ApprovalOrder < 1
|
||||
select new
|
||||
{
|
||||
cf.id,
|
||||
cf.OptState,
|
||||
cf.ProtocolNumber,
|
||||
cf.MainProtocolNumber,
|
||||
cf.SignDate,
|
||||
cf.FilePath,
|
||||
cf.FileName,
|
||||
cf.FileDesc,
|
||||
}).ToArray();
|
||||
var cacheKey = $"{BusiDataType}";
|
||||
foreach (var item in fileObjList)
|
||||
{
|
||||
var info = new SupAgrmtModel();
|
||||
info.MasterAgrmtNo = item.MainProtocolNumber;
|
||||
info.OperationType = item.OptState;
|
||||
info.SupAgrmtNo = item.ProtocolNumber;
|
||||
info.SigningDate = item.SignDate?.ToString("yyyy-MM-dd");
|
||||
info.SupAgrmtType = ReportTypeMap[item.OptState == OptFlagsEnum.A ? "首次" : "变更"];
|
||||
info.SupAgrmtRemark = item.FileDesc;
|
||||
info.SupAgrmtAttTuple = new List<SupAgrmtAttModel>();
|
||||
var tuple = new SupAgrmtAttModel();
|
||||
tuple.SupAgrmtAtt = item.FileName;
|
||||
var cacheValue = info.MasterAgrmtNo + "_" + info.SupAgrmtNo;
|
||||
if (ReportStatus.CheckCacheInfo(cacheKey, cacheValue))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
info.SupAgrmtAttTuple.Add(tuple);
|
||||
|
||||
SACReportNotes note = base.GetReportNotes(ReportType, formatInfoTag(info)).FirstOrDefault();
|
||||
if (note == null && _operationType == OptFlagsEnum.A)
|
||||
{
|
||||
note = new SACReportNotes()
|
||||
{
|
||||
InfoCache = $"{{\"Tag\":\"{info.SupAgrmtNo}\",\"Source\":\"System\"}}",
|
||||
IsValid = true,
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
if (note == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
switch (_operationType)
|
||||
{
|
||||
case OptFlagsEnum.A:
|
||||
continue;//新增数据已报送,跳过
|
||||
case OptFlagsEnum.U:
|
||||
note.IsValid = true;
|
||||
break;
|
||||
case OptFlagsEnum.D:
|
||||
note.IsValid = false;
|
||||
break;
|
||||
case OptFlagsEnum.NONE:
|
||||
default:
|
||||
throw new ServiceException("未知操作类型");
|
||||
}
|
||||
}
|
||||
if (info.OperationType != OptFlagsEnum.A)
|
||||
{
|
||||
info.SupAgrmtID = note.BizId;
|
||||
}
|
||||
info.ExceID = base.formatExceID();
|
||||
if (!ReportStatus.CheckFileLength(item.FilePath))
|
||||
{
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
ReportStatus.AddCacheInfo(cacheKey, cacheValue);
|
||||
}
|
||||
dataList.Add(info);
|
||||
fileList.Add(item.FilePath);
|
||||
note.id = 0;
|
||||
note.DataId = item.id.ToString();
|
||||
note.ExceId = info.ExceID;
|
||||
note.CreateTime = DateTime.Now;
|
||||
note.FileTag = FileTag;
|
||||
note.ReportType = ReportType;
|
||||
note.ReportDate = _reqInfo.ReportDate;
|
||||
note.InfoTag = formatInfoTag(info, true);
|
||||
note.OptTime = note.CreateTime;
|
||||
note.RetCode = "";
|
||||
note.RetMsg = "";
|
||||
note.ReportResponse = false;
|
||||
note.BizId = "";
|
||||
note.changeStatus = false;
|
||||
noteList.Add(note);
|
||||
}
|
||||
}
|
||||
}
|
||||
catch(Exception ex)
|
||||
{
|
||||
LogFactory.GetLogger("GenerateBody").Info($"System:发生异常:" + ex.ToString()); ;
|
||||
}
|
||||
|
||||
}
|
||||
LogFactory.GetLogger("GenerateBody").Info($"System:2");
|
||||
var subsystemDataList = loadSubsystemDataSource<SupAgrmtModel>(fileList, AddSubsystemNote);
|
||||
if (subsystemDataList != null && subsystemDataList.Count > 0)
|
||||
{
|
||||
dataList.AddRange(subsystemDataList);
|
||||
}
|
||||
|
||||
noData = dataList.Count == 0;
|
||||
model.SupAgrmt = dataList;
|
||||
@@ -179,7 +60,7 @@ namespace YLErp.Modules.SuperviseReportModule.SAC.Service
|
||||
|
||||
public bool AddSubsystemNote(SupAgrmtModel model, List<string> fileList, string tag)
|
||||
{
|
||||
SACReportNotes note = base.GetReportNotes(ReportType, formatInfoTag(model, true)).FirstOrDefault();//参数true要加,要不A和D会查到同一条记录,在D时候,就会和A相同的数据
|
||||
var note = base.GetReportNotes(ReportType, formatInfoTag(model, true)).FirstOrDefault();//参数true要加,要不A和D会查到同一条记录,在D时候,就会和A相同的数据
|
||||
if (note == null)
|
||||
{
|
||||
note = new SACReportNotes()
|
||||
@@ -208,9 +89,9 @@ namespace YLErp.Modules.SuperviseReportModule.SAC.Service
|
||||
}
|
||||
}
|
||||
|
||||
if(model.SupAgrmtAttTuple != null && model.SupAgrmtAttTuple.Count > 0)
|
||||
if (model.SupAgrmtAttTuple != null && model.SupAgrmtAttTuple.Count > 0)
|
||||
{
|
||||
fileList.AddRange(model.SupAgrmtAttTuple.Select(x => x.SupAgrmtAtt));
|
||||
fileList.AddRange(model.SupAgrmtAttTuple.Select(x => x.SupAgrmtAtt)!);
|
||||
}
|
||||
model.ExceID = base.formatExceID();
|
||||
note.id = 0;
|
||||
@@ -232,13 +113,12 @@ namespace YLErp.Modules.SuperviseReportModule.SAC.Service
|
||||
|
||||
private List<SupAgrmtModel> GetSupAgrmtModel(ref List<string> fileList)
|
||||
{
|
||||
List<SupAgrmtModel> result = new List<SupAgrmtModel>();
|
||||
var result = new List<SupAgrmtModel>();
|
||||
if (_excelDataSource != null && _excelDataSource.Tables.Contains("补充协议"))
|
||||
{
|
||||
var cacheKey = $"{BusiDataType}";
|
||||
string sourcePath = Path.Combine(_excelDataSourceRootPath, "附件");
|
||||
DataTable dt = _excelDataSource.Tables["补充协议"];
|
||||
for (int i = 1; i < dt.Rows.Count; i++)
|
||||
var sourcePath = Path.Combine(_excelDataSourceRootPath, "附件");
|
||||
var dt = _excelDataSource.Tables["补充协议"];
|
||||
for (var i = 1; i < dt!.Rows.Count; i++)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(dt.Rows[i][0]?.ToString()))
|
||||
{
|
||||
@@ -248,12 +128,18 @@ namespace YLErp.Modules.SuperviseReportModule.SAC.Service
|
||||
var optType = OptFlagsEnum.NONE;
|
||||
switch (dt.Rows[i][2]?.ToString())
|
||||
{
|
||||
case "0":
|
||||
case "A":
|
||||
case "首次":
|
||||
optType = OptFlagsEnum.A;
|
||||
break;
|
||||
case "1":
|
||||
case "U":
|
||||
case "变更":
|
||||
optType = OptFlagsEnum.U;
|
||||
break;
|
||||
case "2":
|
||||
case "D":
|
||||
case "废止":
|
||||
optType = OptFlagsEnum.D;
|
||||
break;
|
||||
@@ -263,40 +149,38 @@ namespace YLErp.Modules.SuperviseReportModule.SAC.Service
|
||||
continue;
|
||||
}
|
||||
|
||||
SupAgrmtModel model = new SupAgrmtModel();
|
||||
|
||||
model.OperationType = optType == OptFlagsEnum.A ? OptFlagsEnum.A : OptFlagsEnum.U;
|
||||
model.MasterAgrmtNo = GetDataSetValue(dt, i, 0);
|
||||
model.SupAgrmtNo = GetDataSetValue(dt, i, 1);
|
||||
var model = new SupAgrmtModel
|
||||
{
|
||||
OperationType = optType == OptFlagsEnum.A ? OptFlagsEnum.A : OptFlagsEnum.U,
|
||||
MasterAgrmtNo = GetDataSetValue(dt, i, 0),
|
||||
SupAgrmtNo = GetDataSetValue(dt, i, 1)
|
||||
};
|
||||
var cacheValue = model.MasterAgrmtNo + "_" + model.SupAgrmtNo;
|
||||
if (ReportStatus.CheckCacheInfo(cacheKey, cacheValue))
|
||||
if (ReportStatus.CheckCacheInfo(CacheKey, cacheValue))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
model.SupAgrmtType = ConsReport.ReportTypeMap[optType == OptFlagsEnum.A ? "首次" : "变更"];
|
||||
model.SigningDate = GetDataSetValue(dt, i, 3);
|
||||
model.SupAgrmtRemark = GetDataSetValue(dt, i, 4);
|
||||
string[] atts = ((GetDataSetValue(dt, i, 5)) ?? "").Split(',');
|
||||
var atts = ((GetDataSetValue(dt, i, 5)) ?? "").Split(',');
|
||||
foreach (var item in atts)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(item))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
string path = Path.Combine(sourcePath, item);
|
||||
var path = Path.Combine(sourcePath, item);
|
||||
if (!ReportStatus.CheckFileLength(path))
|
||||
{
|
||||
break;
|
||||
}
|
||||
if (model.SupAgrmtAttTuple == null)
|
||||
{
|
||||
model.SupAgrmtAttTuple = new List<SupAgrmtAttModel>();
|
||||
}
|
||||
model.SupAgrmtAttTuple ??= new List<SupAgrmtAttModel>();
|
||||
model.SupAgrmtAttTuple.Add(new SupAgrmtAttModel() { SupAgrmtAtt = item });
|
||||
fileList.Add(path);
|
||||
}
|
||||
|
||||
SACReportNotes note = base.GetReportNotes(ReportType, formatInfoTag(model)).FirstOrDefault();
|
||||
var note = base.GetReportNotes(ReportType, formatInfoTag(model)).FirstOrDefault();
|
||||
if (note == null && _operationType == OptFlagsEnum.A)
|
||||
{
|
||||
note = new SACReportNotes()
|
||||
@@ -332,7 +216,7 @@ namespace YLErp.Modules.SuperviseReportModule.SAC.Service
|
||||
}
|
||||
if (model.SupAgrmtAttTuple?.Count > 0)
|
||||
{
|
||||
ReportStatus.AddCacheInfo(cacheKey, cacheValue);
|
||||
ReportStatus.AddCacheInfo(CacheKey, cacheValue);
|
||||
model.ExceID = base.formatExceID();
|
||||
result.Add(model);
|
||||
note.id = 0;
|
||||
@@ -357,7 +241,7 @@ namespace YLErp.Modules.SuperviseReportModule.SAC.Service
|
||||
|
||||
private string formatInfoTag(SupAgrmtModel model, bool suffixType = false)
|
||||
{
|
||||
string result = $"{BusiDataType}_{model.MasterAgrmtNo.Replace("_", "-")}_{model.SupAgrmtNo.Replace("_", "-")}_";
|
||||
var result = $"{BusiDataType}_{model.MasterAgrmtNo.Replace("_", "-")}_{model.SupAgrmtNo.Replace("_", "-")}_";
|
||||
if (suffixType)
|
||||
{
|
||||
result = $"{result}{_operationType}";
|
||||
@@ -365,25 +249,41 @@ namespace YLErp.Modules.SuperviseReportModule.SAC.Service
|
||||
return result;
|
||||
}
|
||||
|
||||
protected override string _changeCodeOfInfoTag(string infoTag, string newCode, out string originalCode)
|
||||
{
|
||||
var arr = infoTag.Split('_');
|
||||
if (arr.Length != 4)
|
||||
{
|
||||
throw new ServiceException($"InfoTag信息不匹配:{infoTag}");
|
||||
}
|
||||
originalCode = arr[2];
|
||||
arr[2] = newCode.Replace("_", "-");
|
||||
return string.Join("_", arr);
|
||||
}
|
||||
|
||||
protected override List<SacInfo> CheckBodyValue(BodyModel model, out bool checkStatus)
|
||||
{
|
||||
List<SacInfo> result = new List<SacInfo>();
|
||||
var result = new List<SacInfo>();
|
||||
if (model?.SupAgrmt != null)
|
||||
{
|
||||
CheckHelper<SupAgrmtModel> helper = new Common.CheckHelper<SupAgrmtModel>();
|
||||
CheckHelper<SupAgrmtAttModel> attHelper = new CheckHelper<SupAgrmtAttModel>();
|
||||
for (int i = 0; i < model.SupAgrmt.Count; i++)
|
||||
var helper = new Common.CheckHelper<SupAgrmtModel>();
|
||||
var attHelper = new CheckHelper<SupAgrmtAttModel>();
|
||||
for (var i = 0; i < model.SupAgrmt.Count; i++)
|
||||
{
|
||||
List<SacInfo> listRoot = new List<SacInfo>();
|
||||
var listRoot = new List<SacInfo>();
|
||||
var item = model.SupAgrmt[i];
|
||||
if (item.IgnoreCheck) continue;
|
||||
if (item.IgnoreCheck)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
helper.ExecuteCheck(item, (name, value, msg) =>
|
||||
{
|
||||
listRoot.Add(new SacInfo(name, value, msg));
|
||||
});
|
||||
if (item.SupAgrmtAttTuple != null)
|
||||
{
|
||||
for (int j = 0; j < item.SupAgrmtAttTuple.Count; j++)
|
||||
for (var j = 0; j < item.SupAgrmtAttTuple.Count; j++)
|
||||
{
|
||||
var listItem = new List<SacInfo>();
|
||||
var tuple = item.SupAgrmtAttTuple[j];
|
||||
@@ -393,16 +293,21 @@ namespace YLErp.Modules.SuperviseReportModule.SAC.Service
|
||||
});
|
||||
if (listItem.Count > 0)
|
||||
{
|
||||
var temp = new SacInfo("SupAgrmtAttTuple", j);
|
||||
temp.SubMaps = new List<SacInfo>(listItem);
|
||||
var temp = new SacInfo("SupAgrmtAttTuple", j)
|
||||
{
|
||||
SubMaps = new List<SacInfo>(listItem)
|
||||
};
|
||||
listRoot.Add(temp);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (listRoot.Count > 0)
|
||||
{
|
||||
var errMsg = new SacInfo("SupAgrmt", i);
|
||||
errMsg.SubMaps = new List<SacInfo>(listRoot);
|
||||
var errMsg = new SacInfo("SupAgrmt", i)
|
||||
{
|
||||
FieldValue = item.MasterAgrmtNo,
|
||||
SubMaps = new List<SacInfo>(listRoot)
|
||||
};
|
||||
result.Add(errMsg);
|
||||
}
|
||||
}
|
||||
@@ -428,7 +333,7 @@ namespace YLErp.Modules.SuperviseReportModule.SAC.Service
|
||||
};
|
||||
|
||||
}
|
||||
for (int i = 0; i < noteList.Count; i++)
|
||||
for (var i = 0; i < noteList.Count; i++)
|
||||
{
|
||||
base.SaveReportNotes(noteList[i]);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user