Commit f57ef8b7 authored by yangyang's avatar yangyang

fix(检验检测开通):1.提交接口问题

parent 3d634912
...@@ -59,7 +59,7 @@ public class JyjcOpeningApplicationModel extends BaseModel { ...@@ -59,7 +59,7 @@ public class JyjcOpeningApplicationModel extends BaseModel {
private String remark; private String remark;
@ApiModelProperty (value = "申请时间") @ApiModelProperty (value = "申请时间")
private String applyTime; private Date applyTime;
@ApiModelProperty (value = "工作流执行角色") @ApiModelProperty (value = "工作流执行角色")
private String workflowRole; private String workflowRole;
......
...@@ -67,9 +67,9 @@ public class JyjcOpeningApplicationController extends BaseController { ...@@ -67,9 +67,9 @@ public class JyjcOpeningApplicationController extends BaseController {
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}/submit") @PutMapping(value = "/submit")
@ApiOperation(httpMethod = "PUT", value = "保存并提交", notes = "保存并提交") @ApiOperation(httpMethod = "PUT", value = "保存并提交", notes = "保存并提交")
public ResponseModel<JyjcOpeningApplicationModel> updateBySequenceNbrAndStartFlow(@RequestBody JyjcOpeningApplicationModel model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) { public ResponseModel<JyjcOpeningApplicationModel> updateBySequenceNbrAndStartFlow(@RequestBody JyjcOpeningApplicationModel model, @RequestParam(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr); model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(model,true)); return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(model,true));
} }
......
...@@ -104,6 +104,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp ...@@ -104,6 +104,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
} }
model.setStatus(FlowStatusEnum.SUBMITTED.getCode() + ""); model.setStatus(FlowStatusEnum.SUBMITTED.getCode() + "");
model.setStatusName(FlowStatusEnum.SUBMITTED.getName()); model.setStatusName(FlowStatusEnum.SUBMITTED.getName());
model.setApplyTime(new Date());
// model.setStatus(!ValidationUtil.isEmpty(dataObject) && !ValidationUtil.isEmpty(dataObject.get("status")) ? String.valueOf(dataObject.get("status")) : ""); // model.setStatus(!ValidationUtil.isEmpty(dataObject) && !ValidationUtil.isEmpty(dataObject.get("status")) ? String.valueOf(dataObject.get("status")) : "");
model.setWorkflowProstanceId(instanceId); model.setWorkflowProstanceId(instanceId);
} else { } else {
......
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