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:31:36 +08:00
parent 71ba76f931
commit d9d5016a4b
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/ReviewWork.java
View File

@ -173,6 +173,9 @@ public class ReviewWork extends BaseEntity {
@ApiModelProperty(value = "评议时间")
private LocalDateTime reviewStartAt;
@ApiModelProperty(value = "确定评议")
private String reviewWork;
/**
* 截止时间
*/

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

@ -23,6 +23,9 @@ public class ReviewWorkInReportStateRequest {
@ApiModelProperty(value = "评议描述(评议部门描述,评议专题描述,评议对象职位)")
private String reviewDesc;
@ApiModelProperty(value = "确定评议")
private String reviewWork;
/**
* 提名上传时间
*/

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

@ -147,16 +147,16 @@ public class ReviewWorkService extends BaseService<ReviewWorkMapper, ReviewWork>
@Transactional
public ReviewWork stateInReportSave(ReviewWorkInReportStateRequest reviewWorkInReportStateRequest, User loginUser) {
ReviewWork reviewWork = BeanUtil.copyProperties(reviewWorkInReportStateRequest, ReviewWork.class);
reviewWork.setState(ReviewWork.STATE_IN_REPORT);
reviewWork.setStatus(0);
reviewWork.setState(ReviewWork.STATE_CHECK);
reviewWork.setStatus(1);
reviewWork.setCreatedId(loginUser.getId());
saveOrUpdate(reviewWork);
saveReviewWorkAttachment(reviewWork.getId(), reviewWorkInReportStateRequest.getInReportAttachmentName(),
reviewWorkInReportStateRequest.getInReportAttachmentPath(), loginUser, ReviewWork.STATE_IN_REPORT,
reviewWorkInReportStateRequest.getInReportAttachmentConferenceId(),
reviewWorkInReportStateRequest.getInReportAttachmentConferenceName());
saveReviewWorkAudit(reviewWork.getId(), reviewWorkInReportStateRequest.getInReportAudit1Ids(), loginUser, 1);
saveReviewWorkAudit(reviewWork.getId(), reviewWorkInReportStateRequest.getInReportAudit2Ids(), loginUser, 2);
// saveReviewWorkAudit(reviewWork.getId(), reviewWorkInReportStateRequest.getInReportAudit1Ids(), loginUser, 1);
// saveReviewWorkAudit(reviewWork.getId(), reviewWorkInReportStateRequest.getInReportAudit2Ids(), loginUser, 2);
return reviewWork;
}