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
476d3454
Commit
476d3454
authored
Aug 03, 2023
by
曹盼盼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
746485ef
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
ProjectResourceMapper.xml
...p-api/src/main/resources/mapper/ProjectResourceMapper.xml
+1
-1
ProjectResourceController.java
.../module/ugp/biz/controller/ProjectResourceController.java
+1
-1
VerifyServiceImpl.java
...s/boot/module/ugp/biz/service/impl/VerifyServiceImpl.java
+2
-1
No files found.
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/ProjectResourceMapper.xml
View file @
476d3454
...
@@ -115,7 +115,7 @@
...
@@ -115,7 +115,7 @@
SELECT * FROM tz_ugp_project
SELECT * FROM tz_ugp_project
<where>
<where>
is_delete = 0
is_delete = 0
and status
<![CDATA[<>]]>
'流程结束!'
and status
<![CDATA[<>]]>
'
竣工
流程结束!'
<if
test=
"roleName == '建设单位'"
>
<if
test=
"roleName == '建设单位'"
>
and construction_unit_id = #{companyId}
and construction_unit_id = #{companyId}
</if>
</if>
...
...
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/ProjectResourceController.java
View file @
476d3454
...
@@ -303,7 +303,7 @@ public class ProjectResourceController extends BaseController {
...
@@ -303,7 +303,7 @@ public class ProjectResourceController extends BaseController {
@ApiOperation
(
httpMethod
=
"get"
,
value
=
"根据当前登录人获取登录人参与的项目列表"
,
notes
=
"根据当前登录人获取登录人参与的项目列表"
)
@ApiOperation
(
httpMethod
=
"get"
,
value
=
"根据当前登录人获取登录人参与的项目列表"
,
notes
=
"根据当前登录人获取登录人参与的项目列表"
)
public
ResponseModel
<
List
<
Project
>>
selectByUserId
(){
public
ResponseModel
<
List
<
Project
>>
selectByUserId
(){
List
<
Project
>
projectList
=
projectResourceServiceImpl
.
getProjectList
();
List
<
Project
>
projectList
=
projectResourceServiceImpl
.
getProjectList
();
projectList
=
projectList
.
stream
().
filter
(
r
->
"竣工流程结束!"
.
equals
(
r
.
getStatus
())).
collect
(
Collectors
.
toList
());
projectList
=
projectList
.
stream
().
filter
(
r
->
!
"竣工流程结束!"
.
equals
(
r
.
getStatus
())).
collect
(
Collectors
.
toList
());
return
ResponseHelper
.
buildResponse
(
projectList
);
return
ResponseHelper
.
buildResponse
(
projectList
);
}
}
}
}
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 @
476d3454
...
@@ -379,7 +379,8 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
...
@@ -379,7 +379,8 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
//从图片中获取管材编号materialId
//从图片中获取管材编号materialId
//管材编号(暂时写死)
//管材编号(暂时写死)
String
url
=
photo
;
String
url
=
photo
;
String
materialCode
=
getMaterialCodeByOcr
(
url
);
//String materialCode = getMaterialCodeByOcr(url);
String
materialCode
=
"GB/T911-1999"
;
verify
.
setStage
(
StageEnum
.
焊前管材质量
.
getStage
());
verify
.
setStage
(
StageEnum
.
焊前管材质量
.
getStage
());
/**校验*/
/**校验*/
Boolean
flag
=
false
;
Boolean
flag
=
false
;
...
...
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