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
935ce2f0
Commit
935ce2f0
authored
Dec 05, 2022
by
wanglong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加在监检员审核时不显示 监检机构的问题
parent
d7c911c5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
ProjectController.java
...mos/boot/module/ugp/biz/controller/ProjectController.java
+4
-2
ProjectInitiationServiceImpl.java
...le/ugp/biz/service/impl/ProjectInitiationServiceImpl.java
+1
-0
No files found.
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/ProjectController.java
View file @
935ce2f0
...
@@ -292,7 +292,7 @@ public class ProjectController extends BaseController {
...
@@ -292,7 +292,7 @@ public class ProjectController extends BaseController {
* @return
* @return
*/
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
,
needAuth
=
false
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
,
needAuth
=
false
)
@ApiOperation
(
httpMethod
=
"
GET
"
,
value
=
"项目审核"
,
notes
=
"项目审核"
)
@ApiOperation
(
httpMethod
=
"
Post
"
,
value
=
"项目审核"
,
notes
=
"项目审核"
)
@PostMapping
(
value
=
"/processProject"
)
@PostMapping
(
value
=
"/processProject"
)
public
ResponseModel
<
String
>
processProject
(
@RequestParam
(
"sequenceNbr"
)
String
sequenceNbr
,
String
option
,
@RequestBody
JSONObject
json
){
public
ResponseModel
<
String
>
processProject
(
@RequestParam
(
"sequenceNbr"
)
String
sequenceNbr
,
String
option
,
@RequestBody
JSONObject
json
){
Project
project
=
projectServiceImpl
.
getById
(
sequenceNbr
);
Project
project
=
projectServiceImpl
.
getById
(
sequenceNbr
);
...
@@ -301,11 +301,13 @@ public class ProjectController extends BaseController {
...
@@ -301,11 +301,13 @@ public class ProjectController extends BaseController {
String
insDepId
=
json
.
getString
(
XJConstant
.
INS_DEPID
);
String
insDepId
=
json
.
getString
(
XJConstant
.
INS_DEPID
);
String
insPerson
=
json
.
getString
(
XJConstant
.
INS_PRESON
);
String
insPerson
=
json
.
getString
(
XJConstant
.
INS_PRESON
);
if
(!
ValidationUtil
.
isEmpty
(
insPerson
)){
if
(!
ValidationUtil
.
isEmpty
(
insPerson
)){
Map
map
=
orgServiceImpl
.
getdetialInfo
(
insDepId
);
jsonObject
.
put
(
XJConstant
.
INS_PRESON
,
insPerson
);
jsonObject
.
put
(
XJConstant
.
INS_PRESON
,
insPerson
);
//添加监检科室的回显
jsonObject
.
put
(
XJConstant
.
INS_DEP
,
map
.
get
(
"name"
));
jsonObject
.
put
(
XJConstant
.
PROCESS_PROJECT_STATE
,
"监检员待审核"
);
jsonObject
.
put
(
XJConstant
.
PROCESS_PROJECT_STATE
,
"监检员待审核"
);
}
else
if
(!
ValidationUtil
.
isEmpty
(
insDepId
))
{
}
else
if
(!
ValidationUtil
.
isEmpty
(
insDepId
))
{
Map
map
=
orgServiceImpl
.
getdetialInfo
(
insDepId
);
Map
map
=
orgServiceImpl
.
getdetialInfo
(
insDepId
);
jsonObject
.
put
(
XJConstant
.
INS_DEPID
,
map
.
get
(
"sequenceNbr"
));
jsonObject
.
put
(
XJConstant
.
INS_DEPID
,
map
.
get
(
"sequenceNbr"
));
jsonObject
.
put
(
XJConstant
.
INS_DEP
,
map
.
get
(
"name"
));
jsonObject
.
put
(
XJConstant
.
INS_DEP
,
map
.
get
(
"name"
));
...
...
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectInitiationServiceImpl.java
View file @
935ce2f0
...
@@ -126,6 +126,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
...
@@ -126,6 +126,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
JSONObject
dataObject
=
JSON
.
parseObject
(
JSON
.
toJSONString
(
ajaxResult
.
get
(
"data"
)));
JSONObject
dataObject
=
JSON
.
parseObject
(
JSON
.
toJSONString
(
ajaxResult
.
get
(
"data"
)));
ProjectInitiation
projectInitiation
=
new
ProjectInitiation
();
ProjectInitiation
projectInitiation
=
new
ProjectInitiation
();
projectInitiation
.
setInstanceId
(
instanceId
);
projectInitiation
.
setInstanceId
(
instanceId
);
//将所要的数据存为context格式
projectInitiation
.
setContext
(
JSON
.
toJSONString
(
objectd
));
projectInitiation
.
setContext
(
JSON
.
toJSONString
(
objectd
));
projectInitiation
.
setTaskId
(
dataObject
.
getString
(
"id"
));
projectInitiation
.
setTaskId
(
dataObject
.
getString
(
"id"
));
projectInitiation
.
setTaskName
(
dataObject
.
getString
(
"name"
));
projectInitiation
.
setTaskName
(
dataObject
.
getString
(
"name"
));
...
...
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