xiangshan
/
rd-admin-java
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

两官评议里面的内部上报环节加一个确定评议的参数，一二级审批人员不需要

This commit is contained in:
lijiaqi 2022-09-29 09:55:48 +08:00
parent d9d5016a4b
commit 6a496a4bbe
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/ydool/boot/modules/rddb/entity/ReviewOfficer.java
View File

@ -123,6 +123,9 @@ public class ReviewOfficer extends BaseEntity {
@ApiModelProperty(value = "整改备注") @ApiModelProperty(value = "整改备注")
private String alterRemark; private String alterRemark;
@ApiModelProperty(value = "确认评议")
private String reviewOfficer;
/** /**
* 整改上传时间 * 整改上传时间
*/ */

3
src/main/java/com/ydool/boot/modules/rddb/entity/request/review_officer/state/ReviewOfficerInReportStateRequest.java
View File

@ -53,4 +53,7 @@ public class ReviewOfficerInReportStateRequest {
String inReportAttachmentConferenceId; String inReportAttachmentConferenceId;
@ApiModelProperty(value = "附件关联会议名称 英文逗号间隔") @ApiModelProperty(value = "附件关联会议名称 英文逗号间隔")
String inReportAttachmentConferenceName; String inReportAttachmentConferenceName;
@ApiModelProperty(value = "确认评议")
private String reviewOfficer;
} }

8
src/main/java/com/ydool/boot/modules/rddb/service/ReviewOfficerService.java
View File

@ -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;
} }