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

3. 第五流程添加表态发言（上传附件功能） 测评得分（输入框自己输入内容） 

4.	第六流程整改报告 改成附件上传功能  添加跟踪复查（上传附件功能）
This commit is contained in:
lijiaqi 2022-10-08 13:38:53 +08:00
parent 7ba152031b
commit ade3098797
7 changed files with 133 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/ydool/boot/api/controller/ApiReviewWorkController.java
View File

@ -273,7 +273,7 @@ public class ApiReviewWorkController extends ApiBaseController {
@DynamicResponseParameters(properties = {
@DynamicParameter(name = "data", value = "评议", dataTypeClass = ReviewWorkDto.class)
})
public void stateOpinionSave(@Validated ReviewWorkOpinionStateRequest reviewWorkOpinionStateRequest) {
public void stateOpinionSave(@Validated @RequestBody ReviewWorkOpinionStateRequest reviewWorkOpinionStateRequest) {
ReviewWork review = reviewWorkService.stateOpinionSave(reviewWorkOpinionStateRequest, getApiUser());
render(Ret.ok().data(ReviewWorkWrapper.build().entityVO(review)));
}
@ -284,7 +284,7 @@ public class ApiReviewWorkController extends ApiBaseController {
@DynamicResponseParameters(properties = {
@DynamicParameter(name = "data", value = "评议", dataTypeClass = ReviewWorkDto.class)
})
public void stateResultSave(@Validated ReviewWorkResultStateRequest reviewWorkResultStateRequest) {
public void stateResultSave(@Validated @RequestBody ReviewWorkResultStateRequest reviewWorkResultStateRequest) {
ReviewWork review = reviewWorkService.stateResultSave(reviewWorkResultStateRequest, getApiUser());
render(Ret.ok().data(ReviewWorkWrapper.build().entityVO(review)));
}

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

@ -203,6 +203,9 @@ public class ReviewWork extends BaseEntity {
@ApiModelProperty(value = "评议时间")
private String reviewWorkInReportAt;
@ApiModelProperty(value = "测评得分")
private String workOpinionScore;
public ReviewWork() {
//默认公开分数
this.checkScoreState=1;

7
src/main/java/com/ydool/boot/modules/rddb/entity/dto/ReviewWorkDto.java
View File

@ -22,8 +22,13 @@ public class ReviewWorkDto extends ReviewWork {
List<ReviewWorkAttachment> askAttachmentList;
@ApiModelProperty(value = "评议意见附件")
List<ReviewWorkAttachment> opinionAttachmentList;
@ApiModelProperty(value = "整改结果附件")
@ApiModelProperty(value = "表态发言")
List<ReviewWorkAttachment> opinionAttachment2List;
@ApiModelProperty(value = "整改报告")
List<ReviewWorkAttachment> resultAttachmentList;
@ApiModelProperty(value = "跟踪复查")
List<ReviewWorkAttachment> resultAttachment2List;
@ApiModelProperty(value = "评议方案附件")
List<ReviewWorkAttachment> reportAttachmentList;

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

@ -6,6 +6,7 @@ import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import java.util.List;
@Data
@ -32,13 +33,22 @@ public class ReviewWorkOpinionStateRequest {
@ApiModelProperty(value = "评议意见上传时间")
private LocalDateTime opinionUploadAt;
@ApiModelProperty(value = "附件名 英文逗号间隔")
String opinionAttachmentName;
@ApiModelProperty(value = "附件路径 英文逗号间隔")
String opinionAttachmentPath;
@ApiModelProperty(value = "附件关联会议id 英文逗号间隔")
String opinionAttachmentConferenceId;
@ApiModelProperty(value = "附件关联会议名称 英文逗号间隔")
String opinionAttachmentConferenceName;
// @ApiModelProperty(value = "附件名 英文逗号间隔")
// String opinionAttachmentName;
// @ApiModelProperty(value = "附件路径 英文逗号间隔")
// String opinionAttachmentPath;
// @ApiModelProperty(value = "附件关联会议id 英文逗号间隔")
// String opinionAttachmentConferenceId;
// @ApiModelProperty(value = "附件关联会议名称 英文逗号间隔")
// String opinionAttachmentConferenceName;
@ApiModelProperty(value = "评议报告")
private List<CheckAttachment> attachment1;
@ApiModelProperty(value = "表态发言")
private List<CheckAttachment> attachment2;
@ApiModelProperty(value = "测评得分")
private String workOpinionScore;
}

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

@ -6,6 +6,7 @@ import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import java.util.List;
@Data
@ -40,15 +41,21 @@ public class ReviewWorkResultStateRequest {
)
@ApiModelProperty(value = "整改结束时间")
private LocalDateTime alterEndAt;
//
// @ApiModelProperty(value = "附件名 英文逗号间隔")
// String resultAttachmentName;
// @ApiModelProperty(value = "附件路径 英文逗号间隔")
// String resultAttachmentPath;
// @ApiModelProperty(value = "附件关联会议id 英文逗号间隔")
// String resultAttachmentConferenceId;
// @ApiModelProperty(value = "附件关联会议名称 英文逗号间隔")
// String resultAttachmentConferenceName;
@ApiModelProperty(value = "附件名 英文逗号间隔")
String resultAttachmentName;
@ApiModelProperty(value = "附件路径 英文逗号间隔")
String resultAttachmentPath;
@ApiModelProperty(value = "附件关联会议id 英文逗号间隔")
String resultAttachmentConferenceId;
@ApiModelProperty(value = "附件关联会议名称 英文逗号间隔")
String resultAttachmentConferenceName;
@ApiModelProperty(value = "整改报告")
private List<CheckAttachment> attachment1;
@ApiModelProperty(value = "跟踪复查")
private List<CheckAttachment> attachment2;

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

@ -446,10 +446,28 @@ public class ReviewWorkService extends BaseService<ReviewWorkMapper, ReviewWork>
reviewWork.setState(ReviewWork.STATE_RESULT);
saveOrUpdate(reviewWork);
saveReviewWorkAttachment(reviewWork.getId(), reviewWorkOpinionStateRequest.getOpinionAttachmentName(),
reviewWorkOpinionStateRequest.getOpinionAttachmentPath(), loginUser, ReviewWork.STATE_OPINION,
reviewWorkOpinionStateRequest.getOpinionAttachmentConferenceId(),
reviewWorkOpinionStateRequest.getOpinionAttachmentConferenceName());
List<CheckAttachment> attachment1 = reviewWorkOpinionStateRequest.getAttachment1();
List<CheckAttachment> attachment2 = reviewWorkOpinionStateRequest.getAttachment2();
if (CollectionUtil.isNotEmpty(attachment1)){
saveReviewWorkAttachment(reviewWork.getId(),
attachment1.stream().map(CheckAttachment::getCheckAttachmentName).collect(Collectors.toList()).toString(),
attachment1.stream().map(CheckAttachment::getCheckAttachmentPath).collect(Collectors.toList()).toString(), loginUser, ReviewWork.STATE_OPINION,
attachment1.stream().map(CheckAttachment::getCheckAttachmentConferenceId).collect(Collectors.toList()).toString(),
attachment1.stream().map(CheckAttachment::getCheckAttachmentConferenceName).collect(Collectors.toList()).toString(),"1");
}
if (CollectionUtil.isNotEmpty(attachment2)){
saveReviewWorkAttachment(reviewWork.getId(),
attachment2.stream().map(CheckAttachment::getCheckAttachmentName).collect(Collectors.toList()).toString(),
attachment2.stream().map(CheckAttachment::getCheckAttachmentPath).collect(Collectors.toList()).toString(), loginUser, ReviewWork.STATE_OPINION,
attachment2.stream().map(CheckAttachment::getCheckAttachmentConferenceId).collect(Collectors.toList()).toString(),
attachment2.stream().map(CheckAttachment::getCheckAttachmentConferenceName).collect(Collectors.toList()).toString(),"2");
}
// saveReviewWorkAttachment(reviewWork.getId(), reviewWorkOpinionStateRequest.getOpinionAttachmentName(),
// reviewWorkOpinionStateRequest.getOpinionAttachmentPath(), loginUser, ReviewWork.STATE_OPINION,
// reviewWorkOpinionStateRequest.getOpinionAttachmentConferenceId(),
// reviewWorkOpinionStateRequest.getOpinionAttachmentConferenceName());
return reviewWork;
}
@ -462,10 +480,28 @@ public class ReviewWorkService extends BaseService<ReviewWorkMapper, ReviewWork>
reviewWork.setState(ReviewWork.STATE_PUBLIC);
saveOrUpdate(reviewWork);
saveReviewWorkAttachment(reviewWork.getId(), reviewWorkResultStateRequest.getResultAttachmentName(),
reviewWorkResultStateRequest.getResultAttachmentPath(), loginUser, ReviewWork.STATE_RESULT,
reviewWorkResultStateRequest.getResultAttachmentConferenceId(),
reviewWorkResultStateRequest.getResultAttachmentConferenceName());
List<CheckAttachment> attachment1 = reviewWorkResultStateRequest.getAttachment1();
List<CheckAttachment> attachment2 = reviewWorkResultStateRequest.getAttachment2();
if (CollectionUtil.isNotEmpty(attachment1)){
saveReviewWorkAttachment(reviewWork.getId(),
attachment1.stream().map(CheckAttachment::getCheckAttachmentName).collect(Collectors.toList()).toString(),
attachment1.stream().map(CheckAttachment::getCheckAttachmentPath).collect(Collectors.toList()).toString(), loginUser, ReviewWork.STATE_RESULT,
attachment1.stream().map(CheckAttachment::getCheckAttachmentConferenceId).collect(Collectors.toList()).toString(),
attachment1.stream().map(CheckAttachment::getCheckAttachmentConferenceName).collect(Collectors.toList()).toString(),"1");
}
if (CollectionUtil.isNotEmpty(attachment2)){
saveReviewWorkAttachment(reviewWork.getId(),
attachment2.stream().map(CheckAttachment::getCheckAttachmentName).collect(Collectors.toList()).toString(),
attachment2.stream().map(CheckAttachment::getCheckAttachmentPath).collect(Collectors.toList()).toString(), loginUser, ReviewWork.STATE_RESULT,
attachment2.stream().map(CheckAttachment::getCheckAttachmentConferenceId).collect(Collectors.toList()).toString(),
attachment2.stream().map(CheckAttachment::getCheckAttachmentConferenceName).collect(Collectors.toList()).toString(),"2");
}
// saveReviewWorkAttachment(reviewWork.getId(), reviewWorkResultStateRequest.getResultAttachmentName(),
// reviewWorkResultStateRequest.getResultAttachmentPath(), loginUser, ReviewWork.STATE_RESULT,
// reviewWorkResultStateRequest.getResultAttachmentConferenceId(),
// reviewWorkResultStateRequest.getResultAttachmentConferenceName());
return reviewWork;
}

45
src/main/java/com/ydool/boot/modules/rddb/wrapper/ReviewWorkWrapper.java
View File

@ -195,6 +195,7 @@ public class ReviewWorkWrapper extends BaseWrapper<ReviewWork, ReviewWorkDto> {
reviewWorkAttachmentService.list(new LambdaQueryWrapper<ReviewWorkAttachment>()
.eq(ReviewWorkAttachment::getReviewId, reviewWork.getId())
.eq(ReviewWorkAttachment::getType, ReviewWork.STATE_OPINION)
.eq(ReviewWorkAttachment::getClassify,"1")
.orderByDesc(ReviewWorkAttachment::getCreatedAt));
//获取关联会议名称
if (CollectionUtil.isNotEmpty(opinionAttachmentList)) {
@ -209,10 +210,32 @@ public class ReviewWorkWrapper extends BaseWrapper<ReviewWork, ReviewWorkDto> {
}
});
}
List<ReviewWorkAttachment> opinionAttachment2List =
reviewWorkAttachmentService.list(new LambdaQueryWrapper<ReviewWorkAttachment>()
.eq(ReviewWorkAttachment::getReviewId, reviewWork.getId())
.eq(ReviewWorkAttachment::getType, ReviewWork.STATE_OPINION)
.eq(ReviewWorkAttachment::getClassify,"2")
.orderByDesc(ReviewWorkAttachment::getCreatedAt));
//获取关联会议名称
if (CollectionUtil.isNotEmpty(opinionAttachment2List)) {
opinionAttachment2List.stream().forEach(i -> {
if (StrUtil.isNotBlank(i.getConferenceId())) {
Conference conference = conferenceMapper.selectById(i.getConferenceId());
String conferenceName = "";
if (conference != null) {
conferenceName = conference.getTitle();
}
i.setConferenceName(conferenceName);
}
});
}
List<ReviewWorkAttachment> resultAttachmentList =
reviewWorkAttachmentService.list(new LambdaQueryWrapper<ReviewWorkAttachment>()
.eq(ReviewWorkAttachment::getReviewId, reviewWork.getId())
.eq(ReviewWorkAttachment::getType, ReviewWork.STATE_RESULT)
.eq(ReviewWorkAttachment::getClassify,"1")
.orderByDesc(ReviewWorkAttachment::getCreatedAt));
//获取关联会议名称
if (CollectionUtil.isNotEmpty(resultAttachmentList)) {
@ -228,6 +251,26 @@ public class ReviewWorkWrapper extends BaseWrapper<ReviewWork, ReviewWorkDto> {
});
}
List<ReviewWorkAttachment> resultAttachment2List =
reviewWorkAttachmentService.list(new LambdaQueryWrapper<ReviewWorkAttachment>()
.eq(ReviewWorkAttachment::getReviewId, reviewWork.getId())
.eq(ReviewWorkAttachment::getType, ReviewWork.STATE_RESULT)
.eq(ReviewWorkAttachment::getClassify,"2")
.orderByDesc(ReviewWorkAttachment::getCreatedAt));
//获取关联会议名称
if (CollectionUtil.isNotEmpty(resultAttachment2List)) {
resultAttachment2List.stream().forEach(i -> {
if (StrUtil.isNotBlank(i.getConferenceId())) {
Conference conference = conferenceMapper.selectById(i.getConferenceId());
String conferenceName = "";
if (conference != null) {
conferenceName = conference.getTitle();
}
i.setConferenceName(conferenceName);
}
});
}
List<ReviewWorkAudit> inReportAudit1List = reviewWorkAuditService.list(new LambdaQueryWrapper<ReviewWorkAudit>()
.eq(ReviewWorkAudit::getReviewId, reviewWork.getId())
.eq(ReviewWorkAudit::getLevel, 1)
@ -246,7 +289,9 @@ public class ReviewWorkWrapper extends BaseWrapper<ReviewWork, ReviewWorkDto> {
ReviewWorkDto.setAskAttachmentList(askAttachmentList);
// ReviewWorkDto.setCheckAttachmentList(reviewWorkCheckDtos);
ReviewWorkDto.setOpinionAttachmentList(opinionAttachmentList);
ReviewWorkDto.setOpinionAttachment2List(opinionAttachment2List);
ReviewWorkDto.setResultAttachmentList(resultAttachmentList);
ReviewWorkDto.setResultAttachment2List(resultAttachment2List);
ReviewWorkDto.setReportAttachmentList(reportAttachmentList);
ReviewWorkDto.setInReportAudit1List(inReportAudit1List);