bugs

modules/main/facade/project_facade.js

@@ -30,6 +30,7 @@ let ration_glj_model = mongoose.model('ration_glj');
 let rationTemplateModel = mongoose.model('ration_template');
 let project_glj_model = mongoose.model('glj_list');
 let ration_glj_facade = require("../../ration_glj/facade/ration_glj_facade");
+let glj_calculate_facade = require("../../ration_glj/facade/glj_calculate_facade");
 const uuidV1 = require('uuid/v1');
 const gljUtil = require('../../../public/gljUtil');
 let stdColSettingModel = mongoose.model('std_main_col_lib');
@@ -281,6 +282,11 @@ async function updateNodes(datas){
             if(type == projectConsts.BILLS){
                 billTasks.push(getTask(node));
             }else if(type == projectConsts.RATION){
+                //处理面积增加费的数据
+                if(node.data.hasOwnProperty("areaIncreaseFee")){
+                    let t = await glj_calculate_facade.calculateQuantity({rationID:node.data.ID},true,false,node.data.areaIncreaseFee);
+                    node.data.adjustState = t.adjustState;
+                }
                 rationTasks.push(getTask(node));
             }else if(type == projectConsts.RATION_GLJ){
                 rationGLJTasks.push(getTask(node));
@@ -317,7 +323,9 @@ async function updateNodes(datas){
     projectGLJTasks.length>0?asyncTasks.push(project_glj_model.bulkWrite(projectGLJTasks)):"";
     projectTasks.length>0?asyncTasks.push(projectsModel.bulkWrite(projectTasks)):"";
     rationTemplateTasks.length>0?asyncTasks.push(rationTemplateModel.bulkWrite(rationTemplateTasks)):"";
-    return  asyncTasks.length>0?await Promise.all(asyncTasks):"";
+    asyncTasks.length>0?await Promise.all(asyncTasks):"";
+    return datas;
+
 
     function getTask(node,idFiled = 'ID') {
 

web/building_saas/main/js/models/exportSEIInterface.js

@@ -36,11 +36,11 @@ async function exportSEI(projectID) {
     let project = getProject(result);
     await prepareTenderDatas(tenderProjects,project);
 
-
     if(!_.isEmpty(errorMap)){
         showError(errorMap);
         return pr.end();
     }
+
     toXml(project);
 
     pr.end();
@@ -112,7 +112,7 @@ async function exportSEI(projectID) {
             valuationType:source.property.valuationType,
             taxType:source.property.taxType,
             property:source.property,
-            name:source.name
+            projectName:source.name
         };
         return tender;
     }
@@ -315,7 +315,7 @@ async function exportSEI(projectID) {
     function setEngineerInfo(tender) {//设置工程信息
         let infos = tender.property.engineerInfos?tender.property.engineerInfos:[];
         let errors =  infoRequireChecking(infos);
-        if(errors.length > 0) errorMap[tender.name] = errors;
+        if(errors.length > 0) errorMap[tender.projectName] = errors;
         let info = {
             name:"工程信息",
             attrs:[