Merge branch 'ic-deliver' of gitlab.gongsibao.com:jiangyong/zhichan into ic-deliver

ic-deliver/app/base/controller/impl/bizchance/schemeCtl.js

@@ -156,6 +156,88 @@ class SchemeCtl extends CtlBase {
         && pobj.planInfo && pobj.planInfo != 'undefined'){
         try{
             pobj.currentStatus = "beforeConfirmation";//同时把方案的状态也更新为待确认
+            if (pobj.planInfo.caseRemarks && pobj.planInfo.caseRemarks != 'undefined'){
+                pobj.planInfo.memoInfo = pobj.planInfo.caseRemarks;//备注信息
+            }
+            if (pobj.planInfo.cmpName && pobj.planInfo.cmpName != 'undefined'){
+                pobj.planInfo.companyName = pobj.planInfo.cmpName;//公司名称
+            }
+            //是否刻章
+            if (pobj.planInfo.cmpSealSevCase && pobj.planInfo.cmpSealSevCase != 'undefined'){
+                pobj.planInfo.isWhether = pobj.planInfo.cmpSealSevCase;
+            }
+            if (pobj.planInfo.psSealSevCase && pobj.planInfo.psSealSevCase != 'undefined'){
+                pobj.planInfo.isWhether = pobj.planInfo.psSealSevCase
+            }
+            //纳税人类型
+            if (pobj.planInfo.psTaxpayerType && pobj.planInfo.psTaxpayerType != 'undefined'){
+                pobj.planInfo.taxPayerType = pobj.planInfo.psTaxpayerType;
+            }
+            if (pobj.planInfo.cmpTaxPayerType && pobj.planInfo.cmpTaxPayerType != 'undefined'){
+                pobj.planInfo.taxPayerType = pobj.planInfo.cmpTaxPayerType;
+            }
+            if (pobj.planInfo.agentTaxpayerType && pobj.planInfo.agentTaxpayerType != 'undefined'){
+                pobj.planInfo.taxpayerType = pobj.planInfo.agentTaxpayerType;
+            }
+            //详细地址
+            if (pobj.planInfo.addressTypeInput && pobj.planInfo.addressTypeInput != 'undefined'){
+                pobj.planInfo.residenceAddress = pobj.planInfo.addressTypeInput;
+            }           
+
+            if (pobj.planInfo.addressType && pobj.planInfo.addressType != 'undefined'){//地址类型
+                pobj.planInfo.addressTypeName = appconfig.pdict.addressTypeDict[pobj.planInfo.addressType];//地址类型名称
+            }
+            if (pobj.planInfo.TaxPayerType && pobj.planInfo.TaxPayerType != 'undefined'){
+                pobj.planInfo.TaxPayerName = appconfig.pdict.TaxpayerTypeDict[pobj.planInfo.TaxPayerType];//纳税人名称
+            }
+            if (pobj.planInfo.registeredType && pobj.planInfo.registeredType != 'undefined'){
+                pobj.planInfo.registeredName = appconfig.pdict.registeredTypeDict[pobj.planInfo.registeredType];//云上园区名称
+            }
+            if (pobj.planInfo.agentType && pobj.planInfo.agentType != 'undefined'){
+                pobj.planInfo.agentName = appconfig.pdict.agentTypeDict[pobj.planInfo.agentType];//代理记账主体名称
+                if (pobj.planInfo.serviceArea && pobj.planInfo.serviceArea != 'undefined'){
+                    if (pobj.planInfo.agentType == "company"){
+                        pobj.planInfo.serviceAreaName = appconfig.pdict.registeredAreaDict[pobj.planInfo.serviceArea];//注册地区
+                    }
+                    else{
+                        pobj.planInfo.serviceAreaName = appconfig.pdict.registeredParkDict[pobj.planInfo.serviceArea];//注册地区
+                    }
+                }
+
+            }
+            if (pobj.businessType == "companyCase"){
+                if (pobj.planInfo.companynature && pobj.planInfo.companynature != 'undefined'){
+                    pobj.planInfo.companyType = appconfig.pdict.companyNatureDict[pobj.planInfo.companynature];//公司类型的名称
+                }
+                //注册地区
+                if (pobj.planInfo.serviceArea && pobj.planInfo.serviceArea != 'undefined'){
+                    pobj.planInfo.serviceAreaName = appconfig.pdict.registeredAreaDict[pobj.planInfo.serviceArea];//注册地区
+                }
+            }
+            else if (pobj.businessType == "psCase"){
+                //注册地区
+                if (pobj.planInfo.serviceArea && pobj.planInfo.serviceArea != 'undefined'){
+                    pobj.planInfo.serviceAreaName = appconfig.pdict.registeredParkDict[pobj.planInfo.serviceArea];//注册地区
+                }
+            }
+
+            if (pobj.planInfo.engagedIndustry && pobj.planInfo.engagedIndustry != 'undefined'){
+                pobj.planInfo.engagedIndName = appconfig.pdict.engagedIndustryDict[pobj.planInfo.engagedIndustry];//从事行业名称
+            }
+            if (pobj.planInfo.sealSevType && pobj.planInfo.sealSevType != 'undefined'){
+                pobj.planInfo.sealSevName = appconfig.pdict.sealSevTypeDict[pobj.planInfo.sealSevType];//刻章类型名称名称
+                if (pobj.planInfo.serviceArea && pobj.planInfo.serviceArea != 'undefined'){
+                    if (pobj.planInfo.sealSevType == "company"){
+                        pobj.planInfo.serviceAreaName = appconfig.pdict.registeredAreaDict[pobj.planInfo.serviceArea];//注册地区
+                    }
+                    else{
+                        pobj.planInfo.serviceAreaName = appconfig.pdict.registeredParkDict[pobj.planInfo.serviceArea];//注册地区
+                    }
+                }
+            }
+            
+            
+            
             //修改方案的时候，需要把修改的方案传给商城
             var ttype  = pobj.businessType;
             pobj.businessType = appconfig.pdict.fdyDict[pobj.businessType];
@@ -228,6 +310,87 @@ class SchemeCtl extends CtlBase {
                 //pobj.currentStatus = appconfig.pdict.businessStatus[businessInfo.business_status];//商机状态即为方案状态
                 //pobj.statusReason = businessInfo.close_reason;//状态原因
             }
+
+            if (pobj.baseInfo.caseRemarks && pobj.baseInfo.caseRemarks != 'undefined'){
+                pobj.baseInfo.memoInfo = pobj.baseInfo.caseRemarks;//备注信息
+            }
+            if (pobj.baseInfo.cmpName && pobj.baseInfo.cmpName != 'undefined'){
+                pobj.baseInfo.companyName = pobj.baseInfo.cmpName;//公司名称
+            }
+            //是否刻章
+            if (pobj.baseInfo.cmpSealSevCase && pobj.baseInfo.cmpSealSevCase != 'undefined'){
+                pobj.baseInfo.isWhether = pobj.baseInfo.cmpSealSevCase;
+            }
+            if (pobj.baseInfo.psSealSevCase && pobj.baseInfo.psSealSevCase != 'undefined'){
+                pobj.baseInfo.isWhether = pobj.baseInfo.psSealSevCase
+            }
+            //纳税人类型
+            if (pobj.baseInfo.psTaxpayerType && pobj.baseInfo.psTaxpayerType != 'undefined'){
+                pobj.baseInfo.taxPayerType = pobj.baseInfo.psTaxpayerType;
+            }
+            if (pobj.baseInfo.cmpTaxPayerType && pobj.baseInfo.cmpTaxPayerType != 'undefined'){
+                pobj.baseInfo.taxPayerType = pobj.baseInfo.cmpTaxPayerType;
+            }
+            if (pobj.baseInfo.agentTaxpayerType && pobj.baseInfo.agentTaxpayerType != 'undefined'){
+                pobj.baseInfo.taxpayerType = pobj.baseInfo.agentTaxpayerType;
+            }
+            //详细地址
+            if (pobj.baseInfo.addressTypeInput && pobj.baseInfo.addressTypeInput != 'undefined'){
+                pobj.baseInfo.residenceAddress = pobj.baseInfo.addressTypeInput;
+            }           
+
+            if (pobj.baseInfo.addressType && pobj.baseInfo.addressType != 'undefined'){//地址类型
+                pobj.baseInfo.addressTypeName = appconfig.pdict.addressTypeDict[pobj.baseInfo.addressType];//地址类型名称
+            }
+            if (pobj.baseInfo.TaxPayerType && pobj.baseInfo.TaxPayerType != 'undefined'){
+                pobj.baseInfo.TaxPayerName = appconfig.pdict.TaxpayerTypeDict[pobj.baseInfo.TaxPayerType];//纳税人名称
+            }
+            if (pobj.baseInfo.registeredType && pobj.baseInfo.registeredType != 'undefined'){
+                pobj.baseInfo.registeredName = appconfig.pdict.registeredTypeDict[pobj.baseInfo.registeredType];//云上园区名称
+            }
+            if (pobj.baseInfo.agentType && pobj.baseInfo.agentType != 'undefined'){
+                pobj.baseInfo.agentName = appconfig.pdict.agentTypeDict[pobj.baseInfo.agentType];//代理记账主体名称
+                if (pobj.baseInfo.serviceArea && pobj.baseInfo.serviceArea != 'undefined'){
+                    if (pobj.baseInfo.agentType == "company"){
+                        pobj.baseInfo.serviceAreaName = appconfig.pdict.registeredAreaDict[pobj.baseInfo.serviceArea];//注册地区
+                    }
+                    else{
+                        pobj.baseInfo.serviceAreaName = appconfig.pdict.registeredParkDict[pobj.baseInfo.serviceArea];//注册地区
+                    }
+                }
+
+            }
+            if (pobj.businessType == "companyCase"){
+                if (pobj.baseInfo.companynature && pobj.baseInfo.companynature != 'undefined'){
+                    pobj.baseInfo.companyType = appconfig.pdict.companyNatureDict[pobj.baseInfo.companynature];//公司类型的名称
+                }
+                //注册地区
+                if (pobj.baseInfo.serviceArea && pobj.baseInfo.serviceArea != 'undefined'){
+                    pobj.baseInfo.serviceAreaName = baseInfo.pdict.registeredAreaDict[pobj.baseInfo.serviceArea];//注册地区
+                }
+            }
+            else if (pobj.businessType == "psCase"){
+                //注册地区
+                if (pobj.baseInfo.serviceArea && pobj.baseInfo.serviceArea != 'undefined'){
+                    pobj.baseInfo.serviceAreaName = appconfig.pdict.registeredParkDict[pobj.baseInfo.serviceArea];//注册地区
+                }
+            }
+
+            if (pobj.baseInfo.engagedIndustry && pobj.baseInfo.engagedIndustry != 'undefined'){
+                pobj.baseInfo.engagedIndName = appconfig.pdict.engagedIndustryDict[pobj.baseInfo.engagedIndustry];//从事行业名称
+            }
+            if (pobj.baseInfo.sealSevType && pobj.baseInfo.sealSevType != 'undefined'){
+                pobj.baseInfo.sealSevName = appconfig.pdict.sealSevTypeDict[pobj.baseInfo.sealSevType];//刻章类型名称名称
+                if (pobj.baseInfo.serviceArea && pobj.baseInfo.serviceArea != 'undefined'){
+                    if (pobj.baseInfo.sealSevType == "company"){
+                        pobj.baseInfo.serviceAreaName = appconfig.pdict.registeredAreaDict[pobj.baseInfo.serviceArea];//注册地区
+                    }
+                    else{
+                        pobj.baseInfo.serviceAreaName = appconfig.pdict.registeredParkDict[pobj.baseInfo.serviceArea];//注册地区
+                    }
+                }
+            }
+
             //调商城的接口，把商机详情返回给商城
             var btype =  pobj.businessType;
             pobj.businessType = appconfig.pdict.fdyDict[pobj.businessType];

ic-deliver/app/base/db/dao.base.js

@@ -150,11 +150,11 @@ class Dao {
     var aggsinfos = [];
     if (qobj.aggsinfo) {
       qobj.aggsinfo.sum.forEach(aggitem => {
-        var t1 = [this.db.fn('SUM', this.db.col(aggitem.field)), aggitem.field + "_" + "sum"];
+        var t1 = [this.db.fn('SUM', this.db.col(aggitem.field)), aggitem.field + "~" + "sum"];
         aggsinfos.push(t1);
       });
       qobj.aggsinfo.avg.forEach(aggitem => {
-        var t2 = [this.db.fn('AVG', this.db.col(aggitem.field)), aggitem.field + "_" + "avg"];
+        var t2 = [this.db.fn('AVG', this.db.col(aggitem.field)), aggitem.field + "~" + "avg"];
         aggsinfos.push(t2);
       });
     }

ic-deliver/app/base/db/metadata/app/platform.js

@@ -140,7 +140,7 @@ module.exports = {
                 "no": "不需要"
             },
             "addressTypeDict": {//经营地址类型
-                " practical ": "实际经营地址",
+                "practical": "实际经营地址",
                 "virtual": "虚拟地址"
             },
             "registeredTypeDict": {//个体户类型
@@ -157,7 +157,7 @@ module.exports = {
             },
             "agentTypeDict": {//代理记账主体类型
                 "company": "公司",
-                "individual ": "个体户" 
+                "individual": "个体户" 
             },
             "dyDict":{//产品对应关系
                 "/ic/gsreg/":"companyCase",