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

1. 第三流程自查报告改成（上传附件功能）添加会议方案（上传附件功能）打分结束后跳转到第四流程

This commit is contained in:
lijiaqi 2022-10-08 10:52:16 +08:00
parent dd462eeb22
commit 365ebf2d1a
12 changed files with 248 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,23 +160,23 @@ public class ApiReviewWorkController extends ApiBaseController {
render(ret);
}
// @ApiOperation("上传自查/调查报告环节")
// @PostMapping("state/check")
// @ResponseBody
// @DynamicResponseParameters(properties = {
// @DynamicParameter(name = "data", value = "评议", dataTypeClass = ReviewWorkDto.class)
// })
// public void stateCheckSave(@Validated ReviewWorkCheckStateRequest reviewWorkCheckStateRequest) {
// ReviewWork review = reviewWorkService.stateCheckSave(reviewWorkCheckStateRequest, getApiUser());
// render(Ret.ok().data(ReviewWorkWrapper.build().entityVO(review)));
// }
@ApiOperation("上传自查/调查报告环节")
@PostMapping("state/check")
@ResponseBody
@DynamicResponseParameters(properties = {
@DynamicParameter(name = "data", value = "评议", dataTypeClass = ReviewWorkDto.class)
})
public void stateCheckSave(@Validated ReviewWorkCheckStateRequest reviewWorkCheckStateRequest) {
ReviewWork review = reviewWorkService.stateCheckSave(reviewWorkCheckStateRequest, getApiUser());
render(Ret.ok().data(ReviewWorkWrapper.build().entityVO(review)));
}
@ApiOperation("上传自查/调查报告环节2")
@PostMapping("state/check2")
@ResponseBody
@DynamicResponseParameters(properties = {
@DynamicParameter(name = "data", value = "评议", dataTypeClass = ReviewWorkDto.class)
})
public void stateCheckSave2(@RequestBody @Validated WorkCheckRequest workCheckRequest) {
ReviewWork review = reviewWorkService.stateCheckSave(workCheckRequest, getApiUser());
render(Ret.ok().data(ReviewWorkWrapper.build().entityVO(review)));

4
src/main/java/com/ydool/boot/modules/rddb/entity/ReviewWorkAttachment.java
View File

@ -75,4 +75,8 @@ public class ReviewWorkAttachment extends BaseEntity {
@ApiModelProperty(value = "工作评议自查报告组id")
private String workCheckId;
@ApiModelProperty(value = "附件分类")
private String classify;
}

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

@ -12,8 +12,12 @@ public class ReviewWorkDto extends ReviewWork {
@ApiModelProperty(value = "评议附件")
List<ReviewWorkAttachment> inReportAttachmentList;
@ApiModelProperty(value = "自查/调查报告")
List<ReviewWorkCheckDto> checkAttachmentList;
// @ApiModelProperty(value = "自查/调查报告")
// List<ReviewWorkCheckDto> checkAttachmentList;
@ApiModelProperty(value = "自查报告")
List<ReviewWorkAttachment> checkAttachment1List;
@ApiModelProperty(value = "会议方案")
List<ReviewWorkAttachment> checkAttachment2List;
@ApiModelProperty(value = "评议意见附件")
List<ReviewWorkAttachment> opinionAttachmentList;
@ApiModelProperty(value = "整改结果附件")

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

@ -36,8 +36,14 @@ public class WorkCheckRequest {
@ApiModelProperty(value = "打分人员")
private List<String> checkUserIds;
@ApiModelProperty(value = "附件组")
List<WorkCheck> reviewWorkChecks;
// @ApiModelProperty(value = "附件组")
// List<WorkCheck> reviewWorkChecks;
@ApiModelProperty(value = "自查报告")
private List<CheckAttachment> attachment1;
@ApiModelProperty(value = "会议方案")
private List<CheckAttachment> attachment2;
/**
* 测评对象

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

@ -262,60 +262,88 @@ public class ReviewWorkService extends BaseService<ReviewWorkMapper, ReviewWork>
@Transactional
private void saveReviewWorkCheck(ReviewWork reviewWork, WorkCheckRequest workCheckRequest, User loginUser) {
//删除之前记录
reviewWorkCheckService.remove(new QueryWrapper<ReviewWorkCheck>().eq("review_id",
workCheckRequest.getReviewId()));
reviewWorkCheckUserService.remove(new QueryWrapper<ReviewWorkCheckUser>().eq("review_id",
workCheckRequest.getReviewId()));
// reviewWorkCheckService.remove(new QueryWrapper<ReviewWorkCheck>().eq("review_id",
// workCheckRequest.getReviewId()));
// reviewWorkCheckUserService.remove(new QueryWrapper<ReviewWorkCheckUser>().eq("review_id",
// workCheckRequest.getReviewId()));
reviewWorkAttachmentService.remove(new LambdaQueryWrapper<ReviewWorkAttachment>()
.eq(ReviewWorkAttachment::getReviewId, workCheckRequest.getReviewId())
.eq(ReviewWorkAttachment::getType, ReviewWork.STATE_CHECK));
List<WorkCheck> reviewWorkChecks = workCheckRequest.getReviewWorkChecks();
if (CollectionUtil.isNotEmpty(reviewWorkChecks)) {
reviewWorkChecks.stream().forEach(workCheck -> {
//新增附件组
ReviewWorkCheck reviewWorkCheck =
new ReviewWorkCheck().setReviewId(workCheckRequest.getReviewId()).setName(workCheck.getName());
reviewWorkCheckService.saveOrUpdate(reviewWorkCheck);
//新增附件
List<CheckAttachment> checkAttachments = workCheck.getCheckAttachments();
if (CollectionUtil.isNotEmpty(checkAttachments)) {
List<ReviewWorkAttachment> reviewWorkAttachments = new ArrayList<ReviewWorkAttachment>();
checkAttachments.stream().forEach(checkAttachment -> {
ReviewWorkAttachment reviewAttachment = new ReviewWorkAttachment();
reviewAttachment.setType(reviewWork.getState()).setConferenceId(checkAttachment.getCheckAttachmentConferenceId()).setWorkCheckId(reviewWorkCheck.getId())
.setConferenceName(checkAttachment.getCheckAttachmentConferenceName())
.setReviewId(workCheckRequest.getReviewId())
.setTitle(checkAttachment.getCheckAttachmentName())
.setAttachment(checkAttachment.getCheckAttachmentPath())
.setCreatedId(loginUser.getId())
.setCreatedAt(LocalDateTime.now());
reviewWorkAttachments.add(reviewAttachment);
conferenceAttachmentService.associationMeeting(checkAttachment.getCheckAttachmentConferenceId(), checkAttachment.getCheckAttachmentPath(),
checkAttachment.getCheckAttachmentName(), "工作评议附件", loginUser.getId());
});
reviewWorkAttachmentService.saveBatch(reviewWorkAttachments);
}
//新增用户
List<CheckUser> checkUsers = workCheck.getCheckUsers();
if (CollectionUtil.isNotEmpty(checkUsers)) {
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());
reviewWorkCheckUsers.add(reviewWorkCheckUser);
});
reviewWorkCheckUserService.saveBatch(reviewWorkCheckUsers);
}
});
List<CheckAttachment> attachment1 = workCheckRequest.getAttachment1();
List<CheckAttachment> attachment2 = workCheckRequest.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_CHECK,
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_CHECK,
attachment2.stream().map(CheckAttachment::getCheckAttachmentConferenceId).collect(Collectors.toList()).toString(),
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());
// reviewWorkCheckService.saveOrUpdate(reviewWorkCheck);
//
// //新增附件
// List<CheckAttachment> checkAttachments = workCheck.getCheckAttachments();
// if (CollectionUtil.isNotEmpty(checkAttachments)) {
// List<ReviewWorkAttachment> reviewWorkAttachments = new ArrayList<ReviewWorkAttachment>();
// checkAttachments.stream().forEach(checkAttachment -> {
// ReviewWorkAttachment reviewAttachment = new ReviewWorkAttachment();
// reviewAttachment.setType(reviewWork.getState()).setConferenceId(checkAttachment.getCheckAttachmentConferenceId()).setWorkCheckId(reviewWorkCheck.getId())
// .setConferenceName(checkAttachment.getCheckAttachmentConferenceName())
// .setReviewId(workCheckRequest.getReviewId())
// .setTitle(checkAttachment.getCheckAttachmentName())
// .setAttachment(checkAttachment.getCheckAttachmentPath())
// .setCreatedId(loginUser.getId())
// .setCreatedAt(LocalDateTime.now());
// reviewWorkAttachments.add(reviewAttachment);
//
//
// conferenceAttachmentService.associationMeeting(checkAttachment.getCheckAttachmentConferenceId(), checkAttachment.getCheckAttachmentPath(),
// checkAttachment.getCheckAttachmentName(), "工作评议附件", loginUser.getId());
//
// });
// reviewWorkAttachmentService.saveBatch(reviewWorkAttachments);
// }
//
// //新增用户
// List<CheckUser> checkUsers = workCheck.getCheckUsers();
// if (CollectionUtil.isNotEmpty(checkUsers)) {
// 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());
// reviewWorkCheckUsers.add(reviewWorkCheckUser);
// });
// reviewWorkCheckUserService.saveBatch(reviewWorkCheckUsers);
// }
// });
// }
}
@ -350,7 +378,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("您不是创建人,不能操作");
reviewWork.setState(ReviewWork.STATE_OPINION);
reviewWork.setState(ReviewWork.STATE_ASK);
boolean flag = saveOrUpdate(reviewWork);
return !flag ? Ret.fail("操作失败") : Ret.ok().data(ReviewWorkWrapper.build().entityVO(reviewWork));
}
@ -576,4 +604,56 @@ public class ReviewWorkService extends BaseService<ReviewWorkMapper, ReviewWork>
}
}
/**
* @param reviewId
* @param attachmentName
* @param attachmentPath
* @param loginUser
* @param state
*/
private void saveReviewWorkAttachment(String reviewId, String attachmentName, String attachmentPath,
User loginUser, Integer state, String conferenceId
, String conferenceName,String classify) {
reviewWorkAttachmentService.remove(new LambdaQueryWrapper<ReviewWorkAttachment>()
.eq(ReviewWorkAttachment::getReviewId, reviewId)
.eq(ReviewWorkAttachment::getType, state));
if (StrUtil.isNotBlank(attachmentName)) {
String[] nameArr = attachmentName.split(",");
String[] pathArr = attachmentPath.split(",");
if (StrUtil.isNotBlank(conferenceId)) {
String[] conferenceIdArr = conferenceId.split(",");
String[] conferenceNameArr = conferenceName.split(",");
for (int i = 0; i < nameArr.length; i++) {
ReviewWorkAttachment reviewAttachment = new ReviewWorkAttachment();
reviewAttachment.setType(state).setConferenceId(conferenceIdArr[i])
.setClassify(classify)
.setConferenceName(conferenceNameArr[i])
.setReviewId(reviewId)
.setTitle(nameArr[i])
.setAttachment(pathArr[i])
.setCreatedId(loginUser.getId())
.setCreatedAt(LocalDateTime.now());
reviewWorkAttachmentService.save(reviewAttachment);
if (StrUtil.isNotBlank(conferenceIdArr[i])) {
conferenceAttachmentService.associationMeeting(conferenceIdArr[i], conferenceNameArr[i],
nameArr[i], "工作评议附件", loginUser.getId());
}
}
} else {
for (int i = 0; i < nameArr.length; i++) {
ReviewWorkAttachment reviewAttachment = new ReviewWorkAttachment();
reviewAttachment.setType(state)
.setClassify(classify)
.setReviewId(reviewId)
.setTitle(nameArr[i])
.setAttachment(pathArr[i])
.setCreatedId(loginUser.getId())
.setCreatedAt(LocalDateTime.now());
reviewWorkAttachmentService.save(reviewAttachment);
}
}
}
}
}

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

@ -62,72 +62,96 @@ public class ReviewWorkWrapper extends BaseWrapper<ReviewWork, ReviewWorkDto> {
});
}
//查询自查/调查报告组
List<ReviewWorkCheck> reviewWorkChecks =
reviewWorkCheckService.list(new LambdaQueryWrapper<ReviewWorkCheck>().eq(ReviewWorkCheck::getReviewId,
reviewWork.getId()));
List<ReviewWorkCheckDto> reviewWorkCheckDtos = new ArrayList<ReviewWorkCheckDto>();
if (CollectionUtil.isNotEmpty(reviewWorkChecks)) {
// List<ReviewWorkCheck> reviewWorkChecks =
// reviewWorkCheckService.list(new LambdaQueryWrapper<ReviewWorkCheck>().eq(ReviewWorkCheck::getReviewId,
// reviewWork.getId()));
// List<ReviewWorkCheckDto> reviewWorkCheckDtos = new ArrayList<ReviewWorkCheckDto>();
//
// if (CollectionUtil.isNotEmpty(reviewWorkChecks)) {
//
//
// reviewWorkChecks.stream().forEach(reviewWorkCheck -> {
// //组ID
// String workCheckId = reviewWorkCheck.getId();
//
// //获取关联附件
// List<ReviewWorkAttachment> checkAttachmentList =
// reviewWorkAttachmentService.list(new LambdaQueryWrapper<ReviewWorkAttachment>()
// .eq(ReviewWorkAttachment::getReviewId, reviewWork.getId())
// .eq(ReviewWorkAttachment::getType, ReviewWork.STATE_CHECK)
// .eq(ReviewWorkAttachment::getWorkCheckId, workCheckId)
// .orderByDesc(ReviewWorkAttachment::getCreatedAt));
// //获取附件关联会议名称
// if (CollectionUtil.isNotEmpty(checkAttachmentList)) {
// checkAttachmentList.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<ReviewWorkCheckUser> reviewWorkCheckUsers =
// reviewWorkCheckUserService.list(new LambdaQueryWrapper<ReviewWorkCheckUser>()
// .eq(ReviewWorkCheckUser::getWorkCheckId, workCheckId)
// .eq(ReviewWorkCheckUser::getReviewId, reviewWork.getId())
// );
// ReviewWorkCheckDto reviewWorkCheckDto = BeanUtil.copyProperties(reviewWorkCheck, ReviewWorkCheckDto.class);
// reviewWorkCheckDto.setReviewWorkAttachments(checkAttachmentList);
// reviewWorkCheckDto.setReviewWorkUsers(reviewWorkCheckUsers);
// reviewWorkCheckDtos.add(reviewWorkCheckDto);
//
// });
//
// }
reviewWorkChecks.stream().forEach(reviewWorkCheck -> {
//组ID
String workCheckId = reviewWorkCheck.getId();
//获取关联附件
List<ReviewWorkAttachment> checkAttachmentList =
reviewWorkAttachmentService.list(new LambdaQueryWrapper<ReviewWorkAttachment>()
.eq(ReviewWorkAttachment::getReviewId, reviewWork.getId())
.eq(ReviewWorkAttachment::getType, ReviewWork.STATE_CHECK)
.eq(ReviewWorkAttachment::getWorkCheckId, workCheckId)
.orderByDesc(ReviewWorkAttachment::getCreatedAt));
//获取附件关联会议名称
if (CollectionUtil.isNotEmpty(checkAttachmentList)) {
checkAttachmentList.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> checkAttachment1List = reviewWorkAttachmentService.list(new
LambdaQueryWrapper<ReviewWorkAttachment>()
.eq(ReviewWorkAttachment::getReviewId, reviewWork.getId())
.eq(ReviewWorkAttachment::getType, ReviewWork.STATE_CHECK)
.eq(ReviewWorkAttachment::getClassify,"1")
.orderByDesc(ReviewWorkAttachment::getCreatedAt));
//获取关联会议名称
if (CollectionUtil.isNotEmpty(checkAttachment1List)) {
checkAttachment1List.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> checkAttachment2List = reviewWorkAttachmentService.list(new
LambdaQueryWrapper<ReviewWorkAttachment>()
.eq(ReviewWorkAttachment::getReviewId, reviewWork.getId())
.eq(ReviewWorkAttachment::getType, ReviewWork.STATE_CHECK)
.eq(ReviewWorkAttachment::getClassify,"1")
.orderByDesc(ReviewWorkAttachment::getCreatedAt));
//获取关联会议名称
if (CollectionUtil.isNotEmpty(checkAttachment2List)) {
checkAttachment2List.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<ReviewWorkCheckUser> reviewWorkCheckUsers =
reviewWorkCheckUserService.list(new LambdaQueryWrapper<ReviewWorkCheckUser>()
.eq(ReviewWorkCheckUser::getWorkCheckId, workCheckId)
.eq(ReviewWorkCheckUser::getReviewId, reviewWork.getId())
);
ReviewWorkCheckDto reviewWorkCheckDto = BeanUtil.copyProperties(reviewWorkCheck, ReviewWorkCheckDto.class);
reviewWorkCheckDto.setReviewWorkAttachments(checkAttachmentList);
reviewWorkCheckDto.setReviewWorkUsers(reviewWorkCheckUsers);
reviewWorkCheckDtos.add(reviewWorkCheckDto);
});
}
// List<ReviewWorkAttachment> checkAttachmentList = reviewWorkAttachmentService.list(new
// LambdaQueryWrapper<ReviewWorkAttachment>()
// .eq(ReviewWorkAttachment::getReviewId, reviewWork.getId())
// .eq(ReviewWorkAttachment::getType, ReviewWork.STATE_CHECK)
// .orderByDesc(ReviewWorkAttachment::getCreatedAt));
// //获取关联会议名称
// if (CollectionUtil.isNotEmpty(checkAttachmentList)) {
// checkAttachmentList.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> reportAttachmentList =
reviewWorkAttachmentService.list(new LambdaQueryWrapper<ReviewWorkAttachment>()
.eq(ReviewWorkAttachment::getReviewId, reviewWork.getId())
@ -197,8 +221,9 @@ public class ReviewWorkWrapper extends BaseWrapper<ReviewWork, ReviewWorkDto> {
.orderByAsc(ReviewWorkUser::getSortNo));
ReviewWorkDto.setInReportAttachmentList(inReportAttachmentList);
// ReviewWorkDto.setCheckAttachmentList(checkAttachmentList);
ReviewWorkDto.setCheckAttachmentList(reviewWorkCheckDtos);
ReviewWorkDto.setCheckAttachment1List(checkAttachment1List);
ReviewWorkDto.setCheckAttachment2List(checkAttachment2List);
// ReviewWorkDto.setCheckAttachmentList(reviewWorkCheckDtos);
ReviewWorkDto.setOpinionAttachmentList(opinionAttachmentList);
ReviewWorkDto.setResultAttachmentList(resultAttachmentList);
ReviewWorkDto.setReportAttachmentList(reportAttachmentList);

1
src/main/resources/views/dist/css/chunk-44c5918e.3290d9c1.css vendored
View File

File diff suppressed because one or more lines are too long

1
src/main/resources/views/dist/css/chunk-4d39f26d.e3edf059.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
src/main/resources/views/dist/index.html vendored
View File

File diff suppressed because one or more lines are too long

2
src/main/resources/views/dist/js/app.8a5e34fe.js → src/main/resources/views/dist/js/app.66372066.js vendored
View File

File diff suppressed because one or more lines are too long

1
src/main/resources/views/dist/js/chunk-44c5918e.a7c493d0.js vendored
View File

File diff suppressed because one or more lines are too long

1
src/main/resources/views/dist/js/chunk-4d39f26d.cccdcb7b.js vendored Normal file
View File

File diff suppressed because one or more lines are too long