Commit 935ce2f0 authored by wanglong's avatar wanglong

添加在监检员审核时不显示 监检机构的问题

parent d7c911c5
...@@ -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"));
......
...@@ -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"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment