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
25087161
Commit
25087161
authored
Nov 29, 2022
by
曹盼盼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改弹窗
parent
08d3fbd3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
OpenDto.java
...ava/com/yeejoin/amos/boot/module/ugp/api/dto/OpenDto.java
+1
-1
VerifyServiceImpl.java
...s/boot/module/ugp/biz/service/impl/VerifyServiceImpl.java
+2
-5
No files found.
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/OpenDto.java
View file @
25087161
...
...
@@ -15,6 +15,6 @@ public class OpenDto {
private
String
accord
;
//符合性
private
String
valid
;
//有效性
private
String
result
;
//结果
private
String
detailId
;
//跳转id
或者管材编码
private
String
detailId
;
//跳转id
}
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/VerifyServiceImpl.java
View file @
25087161
...
...
@@ -118,8 +118,6 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
* stage 阶段
* page 分页
*/
public
Page
<
SmartListDto
>
commonality
(
String
stage
,
Page
<
SmartListDto
>
page
,
SmartListDto
smartListDto
){
Page
<
Verify
>
objectPage
=
new
Page
<>(
);
objectPage
.
setCurrent
(
page
.
getCurrent
());
...
...
@@ -818,13 +816,12 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
}
}
if
(
StageEnum
.
焊前管材质量
.
getStage
().
equals
(
verify
.
getStage
()))
{
// 改为管材编号materialId
String
materialCode
=
object
.
getString
(
"materialId"
);
String
materialCode
=
object
.
getString
(
"materialId"
);
//管材编号
if
(!
ValidationUtil
.
isEmpty
(
materialCode
))
{
openDto
.
setDetailId
(
materialCode
);
//管材的编号
Material
material
=
materialService
.
getMaterial
(
materialCode
);
if
(!
ValidationUtil
.
isEmpty
(
material
))
{
Long
sequenceNbr1
=
material
.
getSequenceNbr
(
);
//管材id
openDto
.
setDetailId
(
String
.
valueOf
(
sequenceNbr1
));
if
(!
ValidationUtil
.
isEmpty
(
sequenceNbr1
))
{
String
image
=
this
.
getImage
(
sequenceNbr1
);
if
(!
ValidationUtil
.
isEmpty
(
image
))
{
...
...
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