From 290b0810391fa90fe7ce63d015717658a272b1b1 Mon Sep 17 00:00:00 2001 From: mzr <1562242162@qq.com> Date: Tue, 7 Jan 2025 11:08:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E6=88=90=E6=9C=AC=E5=AF=B9?= =?UTF-8?q?=E6=AF=94=E8=A1=A8=E8=B0=83=E6=95=B4=E7=89=A9=E6=96=99=E4=B8=8D?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=A1=B9=E7=9B=AE=E4=B9=9F=E8=83=BD=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cm/meascostcontrast/MeasCostQuerySQLBuilder.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cm/src/private/nc/bs/cm/meascostcontrast/MeasCostQuerySQLBuilder.java b/cm/src/private/nc/bs/cm/meascostcontrast/MeasCostQuerySQLBuilder.java index 095b9e2..63f40d7 100644 --- a/cm/src/private/nc/bs/cm/meascostcontrast/MeasCostQuerySQLBuilder.java +++ b/cm/src/private/nc/bs/cm/meascostcontrast/MeasCostQuerySQLBuilder.java @@ -1,7 +1,5 @@ package nc.bs.cm.meascostcontrast; -import java.util.Map; - import nc.bd.framework.base.CMArrayUtil; import nc.bd.framework.db.CMSqlBuilder; import nc.cmpub.business.util.CMUtil; @@ -29,6 +27,8 @@ import nc.vo.resa.costcenter.CostCenterVO; import nc.vo.resa.factor.FactorAsoaVO; import nc.vo.resa.factor.FactorVO; +import java.util.Map; + /** * 单位成本对比表-主查询的sql构造类 * @@ -143,9 +143,9 @@ public class MeasCostQuerySQLBuilder { // todo sql.append(","); - sql.append("nvl(cost_factor.project_code,'--') projectcode"); + sql.append("nvl(cost_factor.project_code,'') projectcode"); sql.append(","); - sql.append("nvl(cost_factor.project_name,'--') projectname"); + sql.append("nvl(cost_factor.project_name,'') projectname"); // 显示明细区分 String[] showDetailDiff = MeasCostUtil.getShowDetailDiff(conditionMap); @@ -1098,9 +1098,9 @@ public class MeasCostQuerySQLBuilder { } // INNER JOIN bd_project bd_project ON cm_costobject.cprojectid = bd_project.pk_project - // 联查项目表 + // 联查项目表 不是所有的物料都启用项目,所以用leftjoin // todo - sql.innerjoin(ProjectHeadVO.getDefaultTableName()); + sql.append(" left join " +ProjectHeadVO.getDefaultTableName()); sql.append(" "); sql.append(ProjectHeadVO.getDefaultTableName()); sql.on(ProjectHeadVO.getDefaultTableName(), "pk_project", "cm_costobject", "cprojectid");