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
799e33c9
Commit
799e33c9
authored
May 08, 2023
by
lisong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加返回字段
parent
1afbcfcc
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
0 deletions
+19
-0
FileDto.java
...ava/com/yeejoin/amos/boot/module/ugp/api/dto/FileDto.java
+6
-0
InstallNoticeDto.java
...eejoin/amos/boot/module/ugp/api/dto/InstallNoticeDto.java
+4
-0
ProjectController.java
...mos/boot/module/ugp/biz/controller/ProjectController.java
+2
-0
InstallNoticeServiceImpl.java
...module/ugp/biz/service/impl/InstallNoticeServiceImpl.java
+3
-0
ProjectServiceImpl.java
.../boot/module/ugp/biz/service/impl/ProjectServiceImpl.java
+4
-0
No files found.
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/FileDto.java
View file @
799e33c9
...
...
@@ -24,6 +24,12 @@ public class FileDto {
private
String
insDep
;
private
String
insPerson
;
private
String
projectName
;
private
String
projectCode
;
private
String
install
;
private
String
design
;
// 前端定制组件格式 文件
Page
<
Map
<
String
,
Object
>>
mapPage
;
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/InstallNoticeDto.java
View file @
799e33c9
...
...
@@ -175,4 +175,8 @@ public class InstallNoticeDto extends BaseDto {
@ApiModelProperty
(
"审核意见"
)
private
String
auditOpinion
;
private
String
projectCode
;
private
String
install
;
private
String
design
;
}
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/ProjectController.java
View file @
799e33c9
...
...
@@ -11,7 +11,9 @@ import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import
com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil
;
import
com.yeejoin.amos.boot.module.ugp.api.Enum.TabLogoEnum
;
import
com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant
;
import
com.yeejoin.amos.boot.module.ugp.api.dto.FileDto
;
import
com.yeejoin.amos.boot.module.ugp.api.dto.InformationDto
;
import
com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeDto
;
import
com.yeejoin.amos.boot.module.ugp.api.dto.ProjectDto
;
import
com.yeejoin.amos.boot.module.ugp.api.entity.InstallNotice
;
import
com.yeejoin.amos.boot.module.ugp.api.entity.Project
;
...
...
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/InstallNoticeServiceImpl.java
View file @
799e33c9
...
...
@@ -227,6 +227,9 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta
if
(
ObjectUtils
.
isNotEmpty
(
one
))
{
BeanUtils
.
copyProperties
(
one
,
installNoticeDto
);
}
installNoticeDto
.
setProjectCode
(
projectDto
.
getCode
());
installNoticeDto
.
setDesign
(
projectDto
.
getDesignUnit
());
installNoticeDto
.
setInstall
(
projectDto
.
getInstallationUnit
());
installNoticeDto
.
setImplementDate
(
projectDto
.
getStartDate
());
installNoticeDto
.
setConstructionUnit
(
projectDto
.
getInstallationUnit
());
installNoticeDto
.
setUseUnitName
(
orgServiceImpl
.
getOrgUsr
().
getBizOrgName
());
...
...
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 @
799e33c9
...
...
@@ -740,6 +740,10 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
installSubForm
=
jsonObject
.
getJSONArray
(
"installSubForm"
);
designSubForm
=
jsonObject
.
getJSONArray
(
"designSubForm"
);
}
fileDto
.
setProjectName
(
detail
.
getName
());
fileDto
.
setProjectCode
(
detail
.
getCode
());
fileDto
.
setDesign
(
detail
.
getDesignUnit
());
fileDto
.
setInstall
(
detail
.
getInstallationUnit
());
fileDto
.
setInstallSubForm
(
installSubForm
);
fileDto
.
setDesignSubForm
(
designSubForm
);
fileDto
.
setStatus
(
detail
.
getStatus
());
...
...
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