|
@@ -248,13 +248,13 @@ function getDateForApi(journalList, period) {
|
|
return matchQuater.date;
|
|
return matchQuater.date;
|
|
}
|
|
}
|
|
// 没匹配到季度数据,去匹配半年数据
|
|
// 没匹配到季度数据,去匹配半年数据
|
|
- if (month / 6 <= 1 ) {
|
|
|
|
|
|
+ if (month / 6 <= 1) {
|
|
const firstHalfYear = journalList.find(dateItem => dateItem.date === `${year}-06-25`);
|
|
const firstHalfYear = journalList.find(dateItem => dateItem.date === `${year}-06-25`);
|
|
if (firstHalfYear) {
|
|
if (firstHalfYear) {
|
|
return firstHalfYear.date;
|
|
return firstHalfYear.date;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if (month /6 > 1) {
|
|
|
|
|
|
+ if (month / 6 > 1) {
|
|
const secondHalfYear = journalList.find(dateItem => dateItem.date === `${year}-12-25`);
|
|
const secondHalfYear = journalList.find(dateItem => dateItem.date === `${year}-12-25`);
|
|
if (secondHalfYear) {
|
|
if (secondHalfYear) {
|
|
return secondHalfYear.date;
|
|
return secondHalfYear.date;
|
|
@@ -310,6 +310,7 @@ async function getPriceInfoSource(token, period, city, county) {
|
|
taxPrice: item.tax_price,
|
|
taxPrice: item.tax_price,
|
|
noTaxPrice: item.no_tax_price,
|
|
noTaxPrice: item.no_tax_price,
|
|
specs: item.spec,
|
|
specs: item.spec,
|
|
|
|
+ dateRemark: item.notes,
|
|
remark: item.notes,
|
|
remark: item.notes,
|
|
}));
|
|
}));
|
|
/* if (insertData.length) {
|
|
/* if (insertData.length) {
|
|
@@ -442,6 +443,7 @@ async function saveData(compilationID, period, areaID, sourceData, classNameMap)
|
|
unit: sourceItem.unit,
|
|
unit: sourceItem.unit,
|
|
specs: sourceItem.specs,
|
|
specs: sourceItem.specs,
|
|
taxPrice: sourceItem.taxPrice,
|
|
taxPrice: sourceItem.taxPrice,
|
|
|
|
+ dateRemark: sourceItem.dateRemark,
|
|
remark: sourceItem.remark,
|
|
remark: sourceItem.remark,
|
|
};
|
|
};
|
|
}
|
|
}
|