两官评议里面的内部上报环节加一个确定评议的参数,一二级审批人员不需要
This commit is contained in:
parent
d9d5016a4b
commit
6a496a4bbe
|
@ -123,6 +123,9 @@ public class ReviewOfficer extends BaseEntity {
|
||||||
@ApiModelProperty(value = "整改备注")
|
@ApiModelProperty(value = "整改备注")
|
||||||
private String alterRemark;
|
private String alterRemark;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "确认评议")
|
||||||
|
private String reviewOfficer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 整改上传时间
|
* 整改上传时间
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -53,4 +53,7 @@ public class ReviewOfficerInReportStateRequest {
|
||||||
String inReportAttachmentConferenceId;
|
String inReportAttachmentConferenceId;
|
||||||
@ApiModelProperty(value = "附件关联会议名称 英文逗号间隔")
|
@ApiModelProperty(value = "附件关联会议名称 英文逗号间隔")
|
||||||
String inReportAttachmentConferenceName;
|
String inReportAttachmentConferenceName;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "确认评议")
|
||||||
|
private String reviewOfficer;
|
||||||
}
|
}
|
||||||
|
|
|
@ -139,8 +139,8 @@ public class ReviewOfficerService extends BaseService<ReviewOfficerMapper, Revie
|
||||||
@Transactional
|
@Transactional
|
||||||
public ReviewOfficer stateInReportSave(ReviewOfficerInReportStateRequest reviewOfficerInReportStateRequest, User loginUser) {
|
public ReviewOfficer stateInReportSave(ReviewOfficerInReportStateRequest reviewOfficerInReportStateRequest, User loginUser) {
|
||||||
ReviewOfficer reviewOfficer = BeanUtil.copyProperties(reviewOfficerInReportStateRequest, ReviewOfficer.class);
|
ReviewOfficer reviewOfficer = BeanUtil.copyProperties(reviewOfficerInReportStateRequest, ReviewOfficer.class);
|
||||||
reviewOfficer.setState(ReviewOfficer.STATE_IN_REPORT);
|
reviewOfficer.setState(ReviewOfficer.STATE_CHECK);
|
||||||
reviewOfficer.setStatus(0);
|
reviewOfficer.setStatus(1);
|
||||||
reviewOfficer.setCreatedId(loginUser.getId());
|
reviewOfficer.setCreatedId(loginUser.getId());
|
||||||
saveOrUpdate(reviewOfficer);
|
saveOrUpdate(reviewOfficer);
|
||||||
saveReviewOfficerAttachment(reviewOfficer.getId(),
|
saveReviewOfficerAttachment(reviewOfficer.getId(),
|
||||||
|
@ -148,8 +148,8 @@ public class ReviewOfficerService extends BaseService<ReviewOfficerMapper, Revie
|
||||||
reviewOfficerInReportStateRequest.getInReportAttachmentPath(), loginUser,
|
reviewOfficerInReportStateRequest.getInReportAttachmentPath(), loginUser,
|
||||||
ReviewOfficer.STATE_IN_REPORT,reviewOfficerInReportStateRequest.getInReportAttachmentConferenceId(),
|
ReviewOfficer.STATE_IN_REPORT,reviewOfficerInReportStateRequest.getInReportAttachmentConferenceId(),
|
||||||
reviewOfficerInReportStateRequest.getInReportAttachmentConferenceName());
|
reviewOfficerInReportStateRequest.getInReportAttachmentConferenceName());
|
||||||
saveReviewOfficerAudit(reviewOfficer.getId(), reviewOfficerInReportStateRequest.getInReportAudit1Ids(), loginUser, 1);
|
// saveReviewOfficerAudit(reviewOfficer.getId(), reviewOfficerInReportStateRequest.getInReportAudit1Ids(), loginUser, 1);
|
||||||
saveReviewOfficerAudit(reviewOfficer.getId(), reviewOfficerInReportStateRequest.getInReportAudit2Ids(), loginUser, 2);
|
// saveReviewOfficerAudit(reviewOfficer.getId(), reviewOfficerInReportStateRequest.getInReportAudit2Ids(), loginUser, 2);
|
||||||
return reviewOfficer;
|
return reviewOfficer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue