Commit c6b4fb47 authored by suhuiguang's avatar suhuiguang

1.修改驳回时到使用单位节点时可编辑设置属性pageType

parent dc9171f7
...@@ -112,9 +112,9 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg ...@@ -112,9 +112,9 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public JgChangeRegistrationName save2(String submitType, JSONObject requestParam) { public List<JgChangeRegistrationName> save2(String submitType, JSONObject requestParam) {
Map<String, JSONObject> jgRegistrationInfoMap = (Map<String, JSONObject>) JSONObject.parseObject(JSONObject.toJSONString(requestParam), Map.class); Map<String, JSONObject> jgRegistrationInfoMap = (Map<String, JSONObject>) JSONObject.parseObject(JSONObject.toJSONString(requestParam), Map.class);
return this.save(submitType, jgRegistrationInfoMap); return Collections.singletonList(this.save(submitType, jgRegistrationInfoMap));
} }
...@@ -385,10 +385,27 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg ...@@ -385,10 +385,27 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
TaskMessageDto taskMessageDto = new TaskMessageDto(); TaskMessageDto taskMessageDto = new TaskMessageDto();
BeanUtil.copyProperties(jgChangeRegistrationName, taskMessageDto); BeanUtil.copyProperties(jgChangeRegistrationName, taskMessageDto);
modelDto.setModel(taskMessageDto); modelDto.setModel(taskMessageDto);
modelDto.setPageType(this.getPageTypeForReject(operate, jgChangeRegistrationName.getAuditStatus()));
// 再插入新代办、数据待定 // 再插入新代办、数据待定
commonService.buildTaskModel(Collections.singletonList(modelDto)); commonService.buildTaskModel(Collections.singletonList(modelDto));
} }
private String getPageTypeForReject(String operate, String auditStatus) {
// 驳回
if("1".equals(operate)){
// 且驳回到的节点为使用单位提交 则可编辑
if(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getPass().equals(auditStatus) ||
WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getReject().equals(auditStatus) ||
WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getRollBack().equals(auditStatus)
){
// urlInfo.json 文件的 pageType
return "edit";
}
return "look";
}
return "look";
}
public ProcessTaskDTO submit(String operate, JgChangeRegistrationName jgChangeRegistrationName) { public ProcessTaskDTO submit(String operate, JgChangeRegistrationName jgChangeRegistrationName) {
//组装信息 //组装信息
......
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