找回证券业报送的逻辑,仅支持Excel模板报送
This commit is contained in:
@@ -15,25 +15,23 @@ namespace YLErp.Modules.SuperviseReportModule.SAC.Service
|
||||
|
||||
protected override DataFlagsEnum BusiDataType => DataFlagsEnum.A1010;
|
||||
|
||||
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_OtherReport;
|
||||
List<SACReportNotes> noteList = new List<SACReportNotes>();
|
||||
|
||||
readonly List<SACReportNotes> noteList = new();
|
||||
|
||||
public override bool CheckRequestParamer(ReportInfo req, out string errMsg)
|
||||
{
|
||||
@@ -63,7 +61,7 @@ namespace YLErp.Modules.SuperviseReportModule.SAC.Service
|
||||
errMsg = "其他事项报告非新增报送时,对应的业务编码不应为空";
|
||||
return false;
|
||||
}
|
||||
SACReportNotes note = base.GetReportNotes(ReportType, formatInfoTag(req.OtherReportDate?.ToString("yyyy-MM-dd"))).Where(O => O.ReportDate == req.OtherReportDate).FirstOrDefault();
|
||||
var note = base.GetReportNotes(ReportType, formatInfoTag(req.OtherReportDate?.ToString("yyyy-MM-dd"))).Where(O => O.ReportDate == req.OtherReportDate).FirstOrDefault();
|
||||
if (note == null)
|
||||
{
|
||||
errMsg = $"{req.OtherReportDate?.ToString("yyyy-MM-dd")}不存在报送成功的其他事项报告记录,请重新选择";
|
||||
@@ -72,7 +70,7 @@ namespace YLErp.Modules.SuperviseReportModule.SAC.Service
|
||||
if (req.OtherReportStatus == OptFlagsEnum.U)
|
||||
{
|
||||
var fileIds = tempFilesService.QueryTempFile(req.ReportDate, "其他事项报告").Select(O => O.id.ToString()).ToArray();
|
||||
string[] fileIdArr = note.DataId.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
|
||||
var fileIdArr = note.DataId.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
|
||||
if (!fileIds.Except(fileIdArr).Any())
|
||||
{
|
||||
errMsg = $"{req.ReportDate.ToString("yyyy-MM-dd")}已上传其他事项报告附件都已报送成功,不需要再次报送";
|
||||
@@ -103,9 +101,11 @@ namespace YLErp.Modules.SuperviseReportModule.SAC.Service
|
||||
fileList = new List<string>();
|
||||
noData = false;
|
||||
var noteKey = formatInfoTag(_reqInfo.ReportDate.ToString("yyyy-MM-dd"));
|
||||
BodyModel model = new BodyModel();
|
||||
model.OtherReport = new OtherReportModel();
|
||||
SACReportNotes note = base.GetReportNotes(ReportType, noteKey).FirstOrDefault();
|
||||
var model = new BodyModel
|
||||
{
|
||||
OtherReport = new OtherReportModel()
|
||||
};
|
||||
var note = base.GetReportNotes(ReportType, noteKey).FirstOrDefault();
|
||||
if (note == null && _operationType == OptFlagsEnum.A)
|
||||
{
|
||||
note = new SACReportNotes()
|
||||
@@ -161,8 +161,10 @@ namespace YLErp.Modules.SuperviseReportModule.SAC.Service
|
||||
{
|
||||
ReportStatus.AddCacheInfo(noteKey, item.fileName);
|
||||
}
|
||||
var info = new OtherReportFileDetailModel();
|
||||
info.OtherReportFile = item.fileName;
|
||||
var info = new OtherReportFileDetailModel
|
||||
{
|
||||
OtherReportFile = item.fileName
|
||||
};
|
||||
if (model.OtherReport.OtherReportFileTuple == null)
|
||||
{
|
||||
model.OtherReport.OtherReportFileTuple = new List<OtherReportFileDetailModel>();
|
||||
@@ -174,8 +176,8 @@ namespace YLErp.Modules.SuperviseReportModule.SAC.Service
|
||||
model.OtherReport.DetailedDescription = _reqInfo.OtherReportDesc;
|
||||
}
|
||||
model.OtherReport.ExceID = base.formatExceID();
|
||||
List<SACReportNotes> notes = base.GetReportNotes(ReportType, noteKey);
|
||||
noData = (!(model.OtherReport.OtherReportFileTuple?.Count > 0));
|
||||
var notes = base.GetReportNotes(ReportType, noteKey);
|
||||
noData = !(model.OtherReport.OtherReportFileTuple?.Count > 0);
|
||||
if (!noData)
|
||||
{
|
||||
note.id = 0;
|
||||
@@ -198,19 +200,19 @@ namespace YLErp.Modules.SuperviseReportModule.SAC.Service
|
||||
|
||||
protected override List<SacInfo> CheckBodyValue(BodyModel model, out bool checkStatus)
|
||||
{
|
||||
List<SacInfo> result = new List<SacInfo>();
|
||||
var result = new List<SacInfo>();
|
||||
if (model?.OtherReport != null)
|
||||
{
|
||||
List<SacInfo> listRoot = new List<SacInfo>();
|
||||
CheckHelper<OtherReportModel> helper = new CheckHelper<OtherReportModel>();
|
||||
CheckHelper<OtherReportFileDetailModel> detailHelper = new CheckHelper<OtherReportFileDetailModel>();
|
||||
var listRoot = new List<SacInfo>();
|
||||
var helper = new CheckHelper<OtherReportModel>();
|
||||
var detailHelper = new CheckHelper<OtherReportFileDetailModel>();
|
||||
helper.ExecuteCheck(model.OtherReport, (name, value, msg) =>
|
||||
{
|
||||
listRoot.Add(new SacInfo(name, value, msg));
|
||||
});
|
||||
if (model.OtherReport.OtherReportFileTuple != null)
|
||||
{
|
||||
for (int i = 0; i < model.OtherReport.OtherReportFileTuple.Count; i++)
|
||||
for (var i = 0; i < model.OtherReport.OtherReportFileTuple.Count; i++)
|
||||
{
|
||||
var listItem = new List<SacInfo>();
|
||||
var item = model.OtherReport.OtherReportFileTuple[i];
|
||||
@@ -220,16 +222,20 @@ namespace YLErp.Modules.SuperviseReportModule.SAC.Service
|
||||
});
|
||||
if (listItem.Count > 0)
|
||||
{
|
||||
var temp = new SacInfo("OtherReportFileTuple", i);
|
||||
temp.SubMaps = new List<SacInfo>(listItem);
|
||||
var temp = new SacInfo("OtherReportFileTuple", i)
|
||||
{
|
||||
SubMaps = new List<SacInfo>(listItem)
|
||||
};
|
||||
listRoot.Add(temp);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (listRoot.Count > 0)
|
||||
{
|
||||
var errMsg = new SacInfo("OtherReport");
|
||||
errMsg.SubMaps = new List<SacInfo>(listRoot);
|
||||
var errMsg = new SacInfo("OtherReport")
|
||||
{
|
||||
SubMaps = new List<SacInfo>(listRoot)
|
||||
};
|
||||
result.Add(errMsg);
|
||||
}
|
||||
}
|
||||
@@ -239,7 +245,7 @@ namespace YLErp.Modules.SuperviseReportModule.SAC.Service
|
||||
|
||||
private string formatInfoTag(string tag, bool suffixType = false)
|
||||
{
|
||||
string result = $"{BusiDataType}_{tag}_";
|
||||
var result = $"{BusiDataType}_{tag}_";
|
||||
if (suffixType)
|
||||
{
|
||||
result = $"{result}{_operationType}";
|
||||
@@ -247,10 +253,16 @@ namespace YLErp.Modules.SuperviseReportModule.SAC.Service
|
||||
return result;
|
||||
}
|
||||
|
||||
protected override string _changeCodeOfInfoTag(string infoTag, string newCode, out string originalCode)
|
||||
{
|
||||
//定期报告中不存在编号,也就不存在修改编号的情况;
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public override bool BeforeOfGenerated(out string errMsg)
|
||||
{
|
||||
errMsg = "";
|
||||
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