Commit df21b41e authored by 曹盼盼's avatar 曹盼盼

修改

parent ac0b0a6f
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
select select
pt.*, pt.*,
pg.context AS context pg.context AS context
from tz_ugp_project pt from tz_ugp_project pt
left join left join
tz_ugp_project_initiation_log pg tz_ugp_project_initiation_log pg
on pt.instance_id=pg.instance_id on pt.instance_id=pg.instance_id
<where> <where>
<if test="roleName == '建设单位'"> <if test="roleName == '建设单位'">
and pt.construction_unit_id = #{companyId} and pt.construction_unit_id = #{companyId}
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
and pt.`construction_Unit` like concat('%',#{project.constructionUnit},'%') and pt.`construction_Unit` like concat('%',#{project.constructionUnit},'%')
</if> </if>
</where> </where>
GROUP BY pg.instance_id
order by pt.rec_date desc order by pt.rec_date desc
</select> </select>
......
...@@ -358,6 +358,8 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project ...@@ -358,6 +358,8 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
} }
List<ProjectDto> projectDtoList = getPage(projects); List<ProjectDto> projectDtoList = getPage(projects);
page.setRecords(projectDtoList); page.setRecords(projectDtoList);
page.setTotal(projectDtoList.size());
return page; return page;
} }
......
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