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

4.	第六流程整改报告 改成附件上传功能  添加跟踪复查(上传附件功能)
This commit is contained in:
lijiaqi 2022-10-08 15:39:00 +08:00
parent ade3098797
commit 9caf09e16c
58 changed files with 26 additions and 147 deletions

View File

@ -163,7 +163,6 @@ public class ReviewWorkService extends BaseService<ReviewWorkMapper, ReviewWork>
}
@Transactional
public ReviewWork stateInReportSave(ReviewWorkInReportStateRequest reviewWorkInReportStateRequest, User loginUser) {
ReviewWork reviewWork = BeanUtil.copyProperties(reviewWorkInReportStateRequest, ReviewWork.class);
@ -267,7 +266,7 @@ public class ReviewWorkService extends BaseService<ReviewWorkMapper, ReviewWork>
saveOrUpdate(reviewWork);
// saveReviewWorkCheck(reviewWork, workCheckRequest, loginUser);
List<CheckAttachment> attachment = reviewWorkAskStateRequest.getAttachment();
if (CollectionUtil.isNotEmpty(attachment)){
if (CollectionUtil.isNotEmpty(attachment)) {
saveReviewWorkAttachment(reviewWork.getId(),
attachment.stream().map(CheckAttachment::getCheckAttachmentName).collect(Collectors.toList()).toString(),
attachment.stream().map(CheckAttachment::getCheckAttachmentPath).collect(Collectors.toList()).toString(), loginUser, ReviewWork.STATE_ASK,
@ -278,8 +277,6 @@ public class ReviewWorkService extends BaseService<ReviewWorkMapper, ReviewWork>
}
@Transactional
public ReviewWork stateReport(ReviewWorkReportStateRequest reviewWorkReportStateRequest, User loginUser) {
ReviewWork reviewWork = getById(reviewWorkReportStateRequest.getId());
@ -314,39 +311,30 @@ public class ReviewWorkService extends BaseService<ReviewWorkMapper, ReviewWork>
List<CheckAttachment> attachment1 = workCheckRequest.getAttachment1();
List<CheckAttachment> attachment2 = workCheckRequest.getAttachment2();
if (CollectionUtil.isNotEmpty(attachment1)){
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_CHECK,
attachment1.stream().map(CheckAttachment::getCheckAttachmentConferenceId).collect(Collectors.toList()).toString(),
attachment1.stream().map(CheckAttachment::getCheckAttachmentConferenceName).collect(Collectors.toList()).toString(),"1");
attachment1.stream().map(CheckAttachment::getCheckAttachmentConferenceName).collect(Collectors.toList()).toString(), "1");
}
if (CollectionUtil.isNotEmpty(attachment2)){
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_CHECK,
attachment2.stream().map(CheckAttachment::getCheckAttachmentConferenceId).collect(Collectors.toList()).toString(),
attachment2.stream().map(CheckAttachment::getCheckAttachmentConferenceName).collect(Collectors.toList()).toString(),"2");
attachment2.stream().map(CheckAttachment::getCheckAttachmentConferenceName).collect(Collectors.toList()).toString(), "2");
}
// List<WorkCheck> reviewWorkChecks = workCheckRequest.getReviewWorkChecks();
// if (CollectionUtil.isNotEmpty(reviewWorkChecks)) {
// reviewWorkChecks.stream().forEach(workCheck -> {
// //新增附件组
// ReviewWorkCheck reviewWorkCheck =
// new ReviewWorkCheck().setReviewId(workCheckRequest.getReviewId()).setName(workCheck.getName());
// new ReviewWorkCheck().setReviewId(workCheckRequest.getReviewId()).setName(workCheck.getName
// ());
// reviewWorkCheckService.saveOrUpdate(reviewWorkCheck);
//
// //新增附件
@ -355,7 +343,8 @@ public class ReviewWorkService extends BaseService<ReviewWorkMapper, ReviewWork>
// List<ReviewWorkAttachment> reviewWorkAttachments = new ArrayList<ReviewWorkAttachment>();
// checkAttachments.stream().forEach(checkAttachment -> {
// ReviewWorkAttachment reviewAttachment = new ReviewWorkAttachment();
// reviewAttachment.setType(reviewWork.getState()).setConferenceId(checkAttachment.getCheckAttachmentConferenceId()).setWorkCheckId(reviewWorkCheck.getId())
// reviewAttachment.setType(reviewWork.getState()).setConferenceId(checkAttachment
// .getCheckAttachmentConferenceId()).setWorkCheckId(reviewWorkCheck.getId())
// .setConferenceName(checkAttachment.getCheckAttachmentConferenceName())
// .setReviewId(workCheckRequest.getReviewId())
// .setTitle(checkAttachment.getCheckAttachmentName())
@ -365,7 +354,8 @@ public class ReviewWorkService extends BaseService<ReviewWorkMapper, ReviewWork>
// reviewWorkAttachments.add(reviewAttachment);
//
//
// conferenceAttachmentService.associationMeeting(checkAttachment.getCheckAttachmentConferenceId(), checkAttachment.getCheckAttachmentPath(),
// conferenceAttachmentService.associationMeeting(checkAttachment
// .getCheckAttachmentConferenceId(), checkAttachment.getCheckAttachmentPath(),
// checkAttachment.getCheckAttachmentName(), "工作评议附件", loginUser.getId());
//
// });
@ -378,7 +368,9 @@ public class ReviewWorkService extends BaseService<ReviewWorkMapper, ReviewWork>
// List<ReviewWorkCheckUser> reviewWorkCheckUsers = new ArrayList<ReviewWorkCheckUser>();
// checkUsers.stream().forEach(checkUser -> {
// ReviewWorkCheckUser reviewWorkCheckUser =
// new ReviewWorkCheckUser().setReviewId(workCheckRequest.getReviewId()).setWorkCheckId(reviewWorkCheck.getId()).setDept(checkUser.getDept()).setUser(checkUser.getUser());
// new ReviewWorkCheckUser().setReviewId(workCheckRequest.getReviewId())
// .setWorkCheckId(reviewWorkCheck.getId()).setDept(checkUser.getDept()).setUser
// (checkUser.getUser());
// reviewWorkCheckUsers.add(reviewWorkCheckUser);
// });
// reviewWorkCheckUserService.saveBatch(reviewWorkCheckUsers);
@ -390,7 +382,6 @@ public class ReviewWorkService extends BaseService<ReviewWorkMapper, ReviewWork>
}
public Ret check(ReviewWorkCheckRequest reviewWorkCheckRequest, User loginUser) {
ReviewWork reviewWork = getById(reviewWorkCheckRequest.getReviewId());
Assert.notNull(reviewWork, "未找到该记录");
@ -421,6 +412,7 @@ public class ReviewWorkService extends BaseService<ReviewWorkMapper, ReviewWork>
if (ReviewWork.STATE_CHECK != reviewWork.getState())
throw new ResultException(Ret.fail("当前环节不能提交该信息"));
if (!loginUser.getId().equals(reviewWork.getCreatedId())) return Ret.fail("您不是创建人,不能操作");
// STATE_OPINION
reviewWork.setState(ReviewWork.STATE_ASK);
boolean flag = saveOrUpdate(reviewWork);
return !flag ? Ret.fail("操作失败") : Ret.ok().data(ReviewWorkWrapper.build().entityVO(reviewWork));
@ -448,20 +440,20 @@ public class ReviewWorkService extends BaseService<ReviewWorkMapper, ReviewWork>
List<CheckAttachment> attachment1 = reviewWorkOpinionStateRequest.getAttachment1();
List<CheckAttachment> attachment2 = reviewWorkOpinionStateRequest.getAttachment2();
if (CollectionUtil.isNotEmpty(attachment1)){
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");
attachment1.stream().map(CheckAttachment::getCheckAttachmentConferenceName).collect(Collectors.toList()).toString(), "1");
}
if (CollectionUtil.isNotEmpty(attachment2)){
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");
attachment2.stream().map(CheckAttachment::getCheckAttachmentConferenceName).collect(Collectors.toList()).toString(), "2");
}
// saveReviewWorkAttachment(reviewWork.getId(), reviewWorkOpinionStateRequest.getOpinionAttachmentName(),
@ -482,20 +474,20 @@ public class ReviewWorkService extends BaseService<ReviewWorkMapper, ReviewWork>
List<CheckAttachment> attachment1 = reviewWorkResultStateRequest.getAttachment1();
List<CheckAttachment> attachment2 = reviewWorkResultStateRequest.getAttachment2();
if (CollectionUtil.isNotEmpty(attachment1)){
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");
attachment1.stream().map(CheckAttachment::getCheckAttachmentConferenceName).collect(Collectors.toList()).toString(), "1");
}
if (CollectionUtil.isNotEmpty(attachment2)){
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");
attachment2.stream().map(CheckAttachment::getCheckAttachmentConferenceName).collect(Collectors.toList()).toString(), "2");
}
// saveReviewWorkAttachment(reviewWork.getId(), reviewWorkResultStateRequest.getResultAttachmentName(),
@ -704,11 +696,11 @@ public class ReviewWorkService extends BaseService<ReviewWorkMapper, ReviewWork>
*/
private void saveReviewWorkAttachment(String reviewId, String attachmentName, String attachmentPath,
User loginUser, Integer state, String conferenceId
, String conferenceName,String classify) {
, String conferenceName, String classify) {
reviewWorkAttachmentService.remove(new LambdaQueryWrapper<ReviewWorkAttachment>()
.eq(ReviewWorkAttachment::getReviewId, reviewId)
.eq(ReviewWorkAttachment::getType, state)
.eq(ReviewWorkAttachment::getClassify,classify));
.eq(ReviewWorkAttachment::getClassify, classify));
if (StrUtil.isNotBlank(attachmentName)) {
String[] nameArr = attachmentName.split(",");
String[] pathArr = attachmentPath.split(",");

View File

@ -1 +0,0 @@
@-webkit-keyframes resizeSensorVisibility{0%{top:0}}@keyframes resizeSensorVisibility{0%{top:0}}.annotationLayer{left:0;top:0;right:0;bottom:0}.annotationLayer,.annotationLayer section{position:absolute}.annotationLayer .linkAnnotation>a{position:absolute;font-size:1em;top:0;left:0;width:100%;height:100%;background:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7") 0 0 repeat}.annotationLayer .linkAnnotation>a:hover{opacity:.2;background:#ff0;box-shadow:0 .05333rem .26667rem #ff0}.annotationLayer .textAnnotation img{position:absolute;cursor:pointer}.annotationLayer .buttonWidgetAnnotation.checkBox input,.annotationLayer .buttonWidgetAnnotation.radioButton input,.annotationLayer .choiceWidgetAnnotation select,.annotationLayer .textWidgetAnnotation input,.annotationLayer .textWidgetAnnotation textarea{background-color:rgba(0,54,255,.13);border:.02667rem solid transparent;box-sizing:border-box;font-size:.24rem;height:100%;padding:0 .08rem;vertical-align:top;width:100%}.annotationLayer .textWidgetAnnotation textarea{font:message-box;font-size:.24rem;resize:none}.annotationLayer .buttonWidgetAnnotation.checkBox input[disabled],.annotationLayer .buttonWidgetAnnotation.radioButton input[disabled],.annotationLayer .choiceWidgetAnnotation select[disabled],.annotationLayer .textWidgetAnnotation input[disabled],.annotationLayer .textWidgetAnnotation textarea[disabled]{background:none;border:.02667rem solid transparent;cursor:not-allowed}.annotationLayer .buttonWidgetAnnotation.checkBox input:hover,.annotationLayer .buttonWidgetAnnotation.radioButton input:hover,.annotationLayer .choiceWidgetAnnotation select:hover,.annotationLayer .textWidgetAnnotation input:hover,.annotationLayer .textWidgetAnnotation textarea:hover{border:.02667rem solid #000}.annotationLayer .choiceWidgetAnnotation select:focus,.annotationLayer .textWidgetAnnotation input:focus,.annotationLayer .textWidgetAnnotation textarea:focus{background:none;border:.02667rem solid transparent}.annotationLayer .textWidgetAnnotation input.comb{font-family:monospace;padding-left:.05333rem;padding-right:0}.annotationLayer .textWidgetAnnotation input.comb:focus{width:115%}.annotationLayer .buttonWidgetAnnotation.checkBox input,.annotationLayer .buttonWidgetAnnotation.radioButton input{-webkit-appearance:none;-moz-appearance:none;appearance:none}.annotationLayer .popupWrapper{position:absolute;width:20em}.annotationLayer .popup{position:absolute;z-index:200;max-width:20em;background-color:#ff9;box-shadow:0 .05333rem .13333rem #333;border-radius:.05333rem;padding:.6em;margin-left:.13333rem;cursor:pointer;word-wrap:break-word}.annotationLayer .popup h1{font-size:1em;border-bottom:.02667rem solid #000;padding-bottom:.2em}.annotationLayer .popup p{padding-top:.2em}.annotationLayer .fileAttachmentAnnotation,.annotationLayer .highlightAnnotation,.annotationLayer .lineAnnotation svg line,.annotationLayer .squigglyAnnotation,.annotationLayer .strikeoutAnnotation,.annotationLayer .underlineAnnotation{cursor:pointer}

File diff suppressed because one or more lines are too long

View File

@ -1 +0,0 @@
.fileOverViewBox[data-v-51084a46]{background:#000;width:100%}.fileOverViewBox .fileOverViewContentBox[data-v-51084a46]{width:100%;margin:0 auto;background:#fff}.fileOverViewBox .fileOverViewContentBox .arrow[data-v-51084a46]{position:fixed;width:100%;height:1.6rem;z-index:100;box-shadow:0 .05333rem .05333rem rgba(0,0,0,.5);background:hsla(0,0%,100%,.9)}.fileOverViewBox .fileOverViewContentBox .arrow .turn[data-v-51084a46]{cursor:pointer}.fileOverViewBox .fileOverViewContentBox .arrow .turn[data-v-51084a46]:hover{color:#58a5fe}.fileOverViewBox .fileOverViewContentBox .arrow .pageBox[data-v-51084a46]{margin:0 .53333rem}.fileOverViewBox .fileOverViewContentBox[data-v-51084a46] .docViewBox{padding:.53333rem}.fileOverViewBox .fileOverViewContentBox[data-v-51084a46] .docViewBox p{margin:.21333rem 0;font-size:.42667rem!important}.fileOverViewBox .fileOverViewContentBox[data-v-51084a46] .docViewBox img{margin:.37333rem 0;overflow:hidden}.fileOverViewBox .fileOverViewContentBox[data-v-51084a46] .docViewBox li{margin:.21333rem 0;font-size:.42667rem!important}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long