Commit d167ebfb authored by 徐俊's avatar 徐俊

xujun

parent 528b1899
...@@ -34,6 +34,7 @@ public class ProjectKPIStatisticDTO extends BaseDTO { ...@@ -34,6 +34,7 @@ public class ProjectKPIStatisticDTO extends BaseDTO {
/** 自筹资金 */ /** 自筹资金 */
private BigDecimal yearSelf; private BigDecimal yearSelf;
private Integer totalRowSpan; //总合并行数 private Integer totalRowSpan; //总合并行数
private Integer outTarget; //一级指标(产出指标) private Integer outTarget; //一级指标(产出指标)
private Integer benefitTarget; //一级指标(效益指标) private Integer benefitTarget; //一级指标(效益指标)
......
...@@ -356,6 +356,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro ...@@ -356,6 +356,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
//if (dto.getProjState() >= 50) //if (dto.getProjState() >= 50)
LoadProjectKPIInfo(dto); LoadProjectKPIInfo(dto);
// 项目课颖设置表 // 项目课颖设置表
List<ComProjectSubDTO> projectSubList = comProjectSubService.getListByObjectId(dto.getId()); List<ComProjectSubDTO> projectSubList = comProjectSubService.getListByObjectId(dto.getId());
dto.setProjectSubList(projectSubList); dto.setProjectSubList(projectSubList);
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
</select> </select>
<select id="getById" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComProjectDTO"> <select id="getById" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComProjectDTO">
SELECT a.*,b.name knowledge_name, SELECT a.*,b.name knowledge_name,
ic.proj_id,ic.app_unit_name,ic.unit_type,ic.organization_code,ic.address, ic.proj_id,ic.app_unit_name,ic.unit_type,ic.organization_code,ic.address,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment