|
@@ -591,6 +591,16 @@ func GetFiccRreportToCygxArticle(cont context.Context) (err error) {
|
|
|
if lenArr == 0 {
|
|
|
return
|
|
|
}
|
|
|
+ reportByHandList, e := ficc_report.GetCygxFiccReportByHandList() // 手动同步过来的报告
|
|
|
+ if e != nil {
|
|
|
+ err = errors.New("GetCygxFiccReportByHandList, Err: " + e.Error())
|
|
|
+ return
|
|
|
+ }
|
|
|
+ ficcReporIdsHand := make(map[int]bool) // Ficc 研报手动同步过来的报告ID
|
|
|
+ for _, v := range reportByHandList {
|
|
|
+ ficcReporIdsHand[v.FiccReportId] = true
|
|
|
+ }
|
|
|
+
|
|
|
condition = ` AND id IN (` + utils.GetOrmInReplace(lenArr) + `) `
|
|
|
pars = make([]interface{}, 0)
|
|
|
pars = append(pars, cygxFiccReportIds)
|
|
@@ -606,7 +616,7 @@ func GetFiccRreportToCygxArticle(cont context.Context) (err error) {
|
|
|
}
|
|
|
|
|
|
for _, v := range listCygxFiccReport {
|
|
|
- if !ficcReporIdsPush[v.ReportId] {
|
|
|
+ if !ficcReporIdsPush[v.ReportId] && !ficcReporIdsHand[v.ReportId] { // 手动同步过来的报告不做删除处理
|
|
|
removeficcReporIds = append(removeficcReporIds, v.ReportId)
|
|
|
}
|
|
|
}
|