Browse Source

feat: 匹配总表,非珠海地区的计算式也要匹配

vian 1 year ago
parent
commit
b01e01ac36
1 changed files with 3 additions and 13 deletions
  1. 3 13
      modules/price_info_lib/facade/index.js

+ 3 - 13
modules/price_info_lib/facade/index.js

@@ -632,10 +632,6 @@ async function calcPriceIndex(libID, period, areaID, compilationID) {
 }
 
 async function exportExcelData(libID, areaID) {
-    console.log(`libID`);
-    console.log(libID);
-    console.log(`areaID`);
-    console.log(areaID);
     const area = await priceInfoAreaModel.findOne({ ID: areaID }).lean();
     if (!area) {
         return [];
@@ -672,8 +668,8 @@ const getSummaryMap = (items) => {
 }
 
 // 匹配总表
-// 按规则匹配信息价的编码、别名编码、计算式(只匹配珠海建筑,要单独标记珠海地区); 
-// 匹配规则:名称+规格型号+单位,与总表一致则自动填入编码、别名编码、计算式(珠海建筑);
+// 按规则匹配信息价的编码、别名编码、计算式
+// 匹配规则:名称+规格型号+单位,与总表一致则自动填入编码、别名编码、计算式
 const matchSummary = async (compilationID, libID, areaID) => {
     const updateBulks = [];
     const areaFilter = { compilationID };
@@ -699,12 +695,7 @@ const matchSummary = async (compilationID, libID, areaID) => {
             const updateObj = {
                 code: matched.code,
                 classCode: matched.classCode,
-            }
-            console.log(matched);
-            console.log(updateObj);
-            const areaName = areaNameMap[priceItem.areaID];
-            if (/珠海/.test(areaName)) {
-                updateObj.expString = matched.expString;
+                expString: matched.expString,
             }
             updateBulks.push({
                 updateOne: {
@@ -715,7 +706,6 @@ const matchSummary = async (compilationID, libID, areaID) => {
         }
     });
     if (updateBulks.length) {
-        console.log(`updateBulks.length`, updateBulks.length);
         await priceInfoItemModel.bulkWrite(updateBulks);
     }
 }