单位成本对比表调整物料不启动项目也能查询到
This commit is contained in:
parent
26f4432a6c
commit
290b081039
|
@ -1,7 +1,5 @@
|
||||||
package nc.bs.cm.meascostcontrast;
|
package nc.bs.cm.meascostcontrast;
|
||||||
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import nc.bd.framework.base.CMArrayUtil;
|
import nc.bd.framework.base.CMArrayUtil;
|
||||||
import nc.bd.framework.db.CMSqlBuilder;
|
import nc.bd.framework.db.CMSqlBuilder;
|
||||||
import nc.cmpub.business.util.CMUtil;
|
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.FactorAsoaVO;
|
||||||
import nc.vo.resa.factor.FactorVO;
|
import nc.vo.resa.factor.FactorVO;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 单位成本对比表-主查询的sql构造类
|
* 单位成本对比表-主查询的sql构造类
|
||||||
*
|
*
|
||||||
|
@ -143,9 +143,9 @@ public class MeasCostQuerySQLBuilder {
|
||||||
|
|
||||||
// todo
|
// todo
|
||||||
sql.append(",");
|
sql.append(",");
|
||||||
sql.append("nvl(cost_factor.project_code,'--') projectcode");
|
sql.append("nvl(cost_factor.project_code,'') projectcode");
|
||||||
sql.append(",");
|
sql.append(",");
|
||||||
sql.append("nvl(cost_factor.project_name,'--') projectname");
|
sql.append("nvl(cost_factor.project_name,'') projectname");
|
||||||
|
|
||||||
// 显示明细区分
|
// 显示明细区分
|
||||||
String[] showDetailDiff = MeasCostUtil.getShowDetailDiff(conditionMap);
|
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
|
// INNER JOIN bd_project bd_project ON cm_costobject.cprojectid = bd_project.pk_project
|
||||||
// Áª²éÏîÄ¿±í
|
// 联查项目表 不是所有的物料都启用项目,所以用leftjoin
|
||||||
// todo
|
// todo
|
||||||
sql.innerjoin(ProjectHeadVO.getDefaultTableName());
|
sql.append(" left join " +ProjectHeadVO.getDefaultTableName());
|
||||||
sql.append(" ");
|
sql.append(" ");
|
||||||
sql.append(ProjectHeadVO.getDefaultTableName());
|
sql.append(ProjectHeadVO.getDefaultTableName());
|
||||||
sql.on(ProjectHeadVO.getDefaultTableName(), "pk_project", "cm_costobject", "cprojectid");
|
sql.on(ProjectHeadVO.getDefaultTableName(), "pk_project", "cm_costobject", "cprojectid");
|
||||||
|
|
Loading…
Reference in New Issue