Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
df21b41e
Commit
df21b41e
authored
Dec 16, 2022
by
曹盼盼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
ac0b0a6f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
ProjectMapper.xml
...odule-ugp-api/src/main/resources/mapper/ProjectMapper.xml
+5
-4
ProjectServiceImpl.java
.../boot/module/ugp/biz/service/impl/ProjectServiceImpl.java
+2
-0
No files found.
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/ProjectMapper.xml
View file @
df21b41e
...
@@ -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>
...
...
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectServiceImpl.java
View file @
df21b41e
...
@@ -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
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment