Commit ce1850d0 authored by yangyang's avatar yangyang

fix(检验业务开通):更新按钮权限 & 数据权限

parent c364e077
...@@ -48,10 +48,12 @@ public class JyjcOpeningApplicationModel extends BaseModel { ...@@ -48,10 +48,12 @@ public class JyjcOpeningApplicationModel extends BaseModel {
private String resultType; private String resultType;
@ApiModelProperty (value = "有效期至") @ApiModelProperty (value = "有效期至")
private String expiryDate; @JsonFormat(pattern = "yyyy-MM-dd")
private Date expiryDate;
@ApiModelProperty (value = "受理日期(接收日期)") @ApiModelProperty (value = "受理日期(接收日期)")
private String acceptDate; @JsonFormat(pattern = "yyyy-MM-dd")
private Date acceptDate;
@ApiModelProperty (value = "状态") @ApiModelProperty (value = "状态")
private String status; private String status;
......
...@@ -95,6 +95,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp ...@@ -95,6 +95,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
private TzsUserInfoMapper userInfoMapper; private TzsUserInfoMapper userInfoMapper;
@Autowired @Autowired
private WorkflowHelper workflowHelper;
@Autowired
private WorkflowFeignClient workflowFeignClient; private WorkflowFeignClient workflowFeignClient;
@Transactional(rollbackFor = {Exception.class, BaseException.class}) @Transactional(rollbackFor = {Exception.class, BaseException.class})
...@@ -329,8 +331,6 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp ...@@ -329,8 +331,6 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
return ((Map) ajaxResult.get("data")).get("id").toString(); return ((Map) ajaxResult.get("data")).get("id").toString();
} }
@Autowired
private WorkflowHelper workflowHelper;
/** /**
* 接收/驳回通知检验单 * 接收/驳回通知检验单
...@@ -375,6 +375,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp ...@@ -375,6 +375,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
if ("流程结束".equals(taskName)) { if ("流程结束".equals(taskName)) {
status = FlowStatusEnum.TO_BE_FINISHED.getCode() + ""; status = FlowStatusEnum.TO_BE_FINISHED.getCode() + "";
} else { } else {
// 如果是回退, 则业务状态改为未提交
status = "1".equals(op) ? FlowStatusEnum.TO_BE_SUBMITTED.getCode() + "" : FlowStatusEnum.SUBMITTED.getCode() + ""; status = "1".equals(op) ? FlowStatusEnum.TO_BE_SUBMITTED.getCode() + "" : FlowStatusEnum.SUBMITTED.getCode() + "";
} }
String role = (String) nextNodeInfo.get("role"); String role = (String) nextNodeInfo.get("role");
......
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