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

关联会议先分开处理

This commit is contained in:
周源 2022-08-18 16:07:52 +08:00
parent 49a2bb8712
commit 9aa9b1eeae
11 changed files with 184 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/main/java/com/ydool/boot/modules/rddb/service/AppointService.java
View File

@ -103,7 +103,7 @@ public class AppointService extends BaseService<AppointMapper, Appoint> {
saveOrUpdate(appoint);
saveAppointAttachment(appoint.getId(), appointProposeRequest.getProposeAttachmentName(),
appointProposeRequest.getProposeAttachmentPath(), loginUser, Appoint.STATE_PROPOSE,
appointProposeRequest.getProposeAttachmentConferenceId(),appointProposeRequest.getProposeAttachmentConferenceName());
appointProposeRequest.getProposeAttachmentConferenceId(), appointProposeRequest.getProposeAttachmentConferenceName());
return appoint;
}
@ -361,29 +361,44 @@ public class AppointService extends BaseService<AppointMapper, Appoint> {
* @param state
*/
private void saveAppointAttachment(String appointId, String attachmentName, String attachmentPath, User loginUser
, Integer state,String conferenceId,String conferenceName) {
, Integer state, String conferenceId, String conferenceName) {
appointAttachmentService.remove(new LambdaQueryWrapper<AppointAttachment>()
.eq(AppointAttachment::getAppointId, appointId)
.eq(AppointAttachment::getType, state));
//todo zhouyuan
if (StrUtil.isNotBlank(attachmentName)) {
String[] nameArr = attachmentName.split(",");
String[] pathArr = attachmentPath.split(",");
String[] conferenceIdArr = conferenceId.split(",");
String[] conferenceNameArr = conferenceName.split(",");
for (int i = 0; i < nameArr.length; i++) {
AppointAttachment appointAttachment = new AppointAttachment();
appointAttachment.setType(state)
.setAppointId(appointId)
.setConferenceId(conferenceIdArr[i])
.setConferenceName(conferenceNameArr[i])
.setTitle(nameArr[i])
.setAttachment(pathArr[i])
.setCreatedId(loginUser.getId())
.setCreatedAt(LocalDateTime.now());
if (StrUtil.isNotBlank(conferenceIdArr[i])) {
conferenceAttachmentService.associationMeeting(conferenceIdArr[i], conferenceNameArr[i], nameArr[i], "任免督职附件", loginUser.getId());
if (StrUtil.isNotBlank(conferenceId)) {
String[] conferenceIdArr = conferenceId.split(",");
String[] conferenceNameArr = conferenceName.split(",");
for (int i = 0; i < nameArr.length; i++) {
AppointAttachment appointAttachment = new AppointAttachment();
appointAttachment.setType(state)
.setAppointId(appointId)
.setConferenceId(conferenceIdArr[i])
.setConferenceName(conferenceNameArr[i])
.setTitle(nameArr[i])
.setAttachment(pathArr[i])
.setCreatedId(loginUser.getId())
.setCreatedAt(LocalDateTime.now());
if (StrUtil.isNotBlank(conferenceIdArr[i])) {
conferenceAttachmentService.associationMeeting(conferenceIdArr[i], conferenceNameArr[i], nameArr[i], "任免督职附件", loginUser.getId());
}
appointAttachmentService.save(appointAttachment);
}
} else {
for (int i = 0; i < nameArr.length; i++) {
AppointAttachment appointAttachment = new AppointAttachment();
appointAttachment.setType(state)
.setAppointId(appointId)
.setTitle(nameArr[i])
.setAttachment(pathArr[i])
.setCreatedId(loginUser.getId())
.setCreatedAt(LocalDateTime.now());
appointAttachmentService.save(appointAttachment);
}
appointAttachmentService.save(appointAttachment);
}
}
}

29
src/main/java/com/ydool/boot/modules/rddb/service/ContactDbService.java
View File

@ -380,17 +380,26 @@ public class ContactDbService extends BaseService<ContactDbMapper, ContactDb> {
if (StrUtil.isNotBlank(attachmentName)) {
String[] nameArr = attachmentName.split(",");
String[] pathArr = attachmentPath.split(",");
String[] conferenceIdArr = conferenceId.split(",");
String[] conferenceNameArr = conferenceName.split(",");
for (int i = 0; i < nameArr.length; i++) {
ContactDbAttachment contactDbAttachment = new ContactDbAttachment();
contactDbAttachment.setType(type).setConferenceId(conferenceIdArr[i])
.setConferenceName(conferenceNameArr[i]).
setContactDbId(contactDbId).setTitle(nameArr[i]).setAttachment(pathArr[i]).setCreatedId(loginUser.getId()).setCreatedAt(LocalDateTime.now());
if (StrUtil.isNotBlank(conferenceIdArr[i])) {
conferenceAttachmentService.associationMeeting(conferenceIdArr[i], conferenceNameArr[i], nameArr[i], "常委会联系代表附件", loginUser.getId());
if(StrUtil.isNotBlank(conferenceId)){
String[] conferenceIdArr = conferenceId.split(",");
String[] conferenceNameArr = conferenceName.split(",");
for (int i = 0; i < nameArr.length; i++) {
ContactDbAttachment contactDbAttachment = new ContactDbAttachment();
contactDbAttachment.setType(type).setConferenceId(conferenceIdArr[i])
.setConferenceName(conferenceNameArr[i]).
setContactDbId(contactDbId).setTitle(nameArr[i]).setAttachment(pathArr[i]).setCreatedId(loginUser.getId()).setCreatedAt(LocalDateTime.now());
if (StrUtil.isNotBlank(conferenceIdArr[i])) {
conferenceAttachmentService.associationMeeting(conferenceIdArr[i], conferenceNameArr[i], nameArr[i], "常委会联系代表附件", loginUser.getId());
}
contactDbAttachmentService.save(contactDbAttachment);
}
}else{
for (int i = 0; i < nameArr.length; i++) {
ContactDbAttachment contactDbAttachment = new ContactDbAttachment();
contactDbAttachment.setType(type)
.setContactDbId(contactDbId).setTitle(nameArr[i]).setAttachment(pathArr[i]).setCreatedId(loginUser.getId()).setCreatedAt(LocalDateTime.now());
contactDbAttachmentService.save(contactDbAttachment);
}
contactDbAttachmentService.save(contactDbAttachment);
}
}
}

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

@ -433,22 +433,35 @@ public class ReviewOfficerService extends BaseService<ReviewOfficerMapper, Revie
if (StrUtil.isNotBlank(attachmentName)) {
String[] nameArr = attachmentName.split(",");
String[] pathArr = attachmentPath.split(",");
String[] conferenceIdArr = conferenceId.split(",");
String[] conferenceNameArr = conferenceName.split(",");
for (int i = 0; i < nameArr.length; i++) {
ReviewOfficerAttachment reviewAttachment = new ReviewOfficerAttachment();
reviewAttachment.setType(state)
.setReviewId(reviewId).setConferenceId(conferenceIdArr[i])
.setConferenceName(conferenceNameArr[i])
.setTitle(nameArr[i])
.setAttachment(pathArr[i])
.setCreatedId(loginUser.getId())
.setCreatedAt(LocalDateTime.now());
if (StrUtil.isNotBlank(conferenceIdArr[i])) {
conferenceAttachmentService.associationMeeting(conferenceIdArr[i], conferenceNameArr[i], nameArr[i], "两官评议附件", loginUser.getId());
if(StrUtil.isNotBlank(conferenceId)){
String[] conferenceIdArr = conferenceId.split(",");
String[] conferenceNameArr = conferenceName.split(",");
for (int i = 0; i < nameArr.length; i++) {
ReviewOfficerAttachment reviewAttachment = new ReviewOfficerAttachment();
reviewAttachment.setType(state)
.setReviewId(reviewId).setConferenceId(conferenceIdArr[i])
.setConferenceName(conferenceNameArr[i])
.setTitle(nameArr[i])
.setAttachment(pathArr[i])
.setCreatedId(loginUser.getId())
.setCreatedAt(LocalDateTime.now());
if (StrUtil.isNotBlank(conferenceIdArr[i])) {
conferenceAttachmentService.associationMeeting(conferenceIdArr[i], conferenceNameArr[i], nameArr[i], "两官评议附件", loginUser.getId());
}
reviewOfficerAttachmentService.save(reviewAttachment);
}
}else{
for (int i = 0; i < nameArr.length; i++) {
ReviewOfficerAttachment reviewAttachment = new ReviewOfficerAttachment();
reviewAttachment.setType(state)
.setTitle(nameArr[i])
.setAttachment(pathArr[i])
.setCreatedId(loginUser.getId())
.setCreatedAt(LocalDateTime.now());
reviewOfficerAttachmentService.save(reviewAttachment);
}
reviewOfficerAttachmentService.save(reviewAttachment);
}
}
}

40
src/main/java/com/ydool/boot/modules/rddb/service/ReviewSubjectService.java
View File

@ -434,21 +434,33 @@ public class ReviewSubjectService extends BaseService<ReviewSubjectMapper, Revie
if (StrUtil.isNotBlank(attachmentName)) {
String[] nameArr = attachmentName.split(",");
String[] pathArr = attachmentPath.split(",");
String[] conferenceIdArr = conferenceId.split(",");
String[] conferenceNameArr = conferenceName.split(",");
for (int i = 0; i < nameArr.length; i++) {
ReviewSubjectAttachment reviewAttachment = new ReviewSubjectAttachment();
reviewAttachment.setType(state)
.setReviewId(reviewId)
.setTitle(nameArr[i]).setConferenceId(conferenceIdArr[i])
.setConferenceName(conferenceNameArr[i])
.setAttachment(pathArr[i])
.setCreatedId(loginUser.getId())
.setCreatedAt(LocalDateTime.now());
if (StrUtil.isNotBlank(conferenceIdArr[i])) {
conferenceAttachmentService.associationMeeting(conferenceIdArr[i], conferenceNameArr[i], nameArr[i], "专题评议附件", loginUser.getId());
if(StrUtil.isNotBlank(conferenceId)){
String[] conferenceIdArr = conferenceId.split(",");
String[] conferenceNameArr = conferenceName.split(",");
for (int i = 0; i < nameArr.length; i++) {
ReviewSubjectAttachment reviewAttachment = new ReviewSubjectAttachment();
reviewAttachment.setType(state)
.setReviewId(reviewId)
.setTitle(nameArr[i]).setConferenceId(conferenceIdArr[i])
.setConferenceName(conferenceNameArr[i])
.setAttachment(pathArr[i])
.setCreatedId(loginUser.getId())
.setCreatedAt(LocalDateTime.now());
if (StrUtil.isNotBlank(conferenceIdArr[i])) {
conferenceAttachmentService.associationMeeting(conferenceIdArr[i], conferenceNameArr[i], nameArr[i], "专题评议附件", loginUser.getId());
}
reviewSubjectAttachmentService.save(reviewAttachment);
}
}else{
for (int i = 0; i < nameArr.length; i++) {
ReviewSubjectAttachment reviewAttachment = new ReviewSubjectAttachment();
reviewAttachment.setType(state)
.setReviewId(reviewId)
.setAttachment(pathArr[i])
.setCreatedId(loginUser.getId())
.setCreatedAt(LocalDateTime.now());
reviewSubjectAttachmentService.save(reviewAttachment);
}
reviewSubjectAttachmentService.save(reviewAttachment);
}
}
}

27
src/main/java/com/ydool/boot/modules/rddb/service/ReviewSuperviseService.java
View File

@ -289,17 +289,26 @@ public class ReviewSuperviseService extends BaseService<ReviewSuperviseMapper, R
if (StrUtil.isNotBlank(attachmentName)) {
String[] nameArr = attachmentName.split(",");
String[] pathArr = attachmentPath.split(",");
String[] conferenceIdArr = conferenceId.split(",");
String[] conferenceNameArr = conferenceName.split(",");
for (int i = 0; i < nameArr.length; i++) {
ReviewSuperviseAttachment reviewSuperviseAttachment = new ReviewSuperviseAttachment();
reviewSuperviseAttachment.setType(type).setConferenceId(conferenceIdArr[i])
.setConferenceName(conferenceNameArr[i]).setReviewSuperviseId(reviewSuperviseId).setTitle(nameArr[i]).setAttachment(pathArr[i]).setCreatedId(loginUser.getId()).setCreatedAt(LocalDateTime.now());
if (StrUtil.isNotBlank(conferenceIdArr[i])) {
conferenceAttachmentService.associationMeeting(conferenceIdArr[i], conferenceNameArr[i], nameArr[i], "审议督政附件", loginUser.getId());
if(StrUtil.isNotBlank(conferenceId)){
String[] conferenceIdArr = conferenceId.split(",");
String[] conferenceNameArr = conferenceName.split(",");
for (int i = 0; i < nameArr.length; i++) {
ReviewSuperviseAttachment reviewSuperviseAttachment = new ReviewSuperviseAttachment();
reviewSuperviseAttachment.setType(type).setConferenceId(conferenceIdArr[i])
.setConferenceName(conferenceNameArr[i]).setReviewSuperviseId(reviewSuperviseId).setTitle(nameArr[i]).setAttachment(pathArr[i]).setCreatedId(loginUser.getId()).setCreatedAt(LocalDateTime.now());
if (StrUtil.isNotBlank(conferenceIdArr[i])) {
conferenceAttachmentService.associationMeeting(conferenceIdArr[i], conferenceNameArr[i], nameArr[i], "审议督政附件", loginUser.getId());
}
reviewSuperviseAttachmentService.save(reviewSuperviseAttachment);
}
}else{
for (int i = 0; i < nameArr.length; i++) {
ReviewSuperviseAttachment reviewSuperviseAttachment = new ReviewSuperviseAttachment();
reviewSuperviseAttachment.setType(type).setReviewSuperviseId(reviewSuperviseId).setTitle(nameArr[i]).setAttachment(pathArr[i]).setCreatedId(loginUser.getId()).setCreatedAt(LocalDateTime.now());
reviewSuperviseAttachmentService.save(reviewSuperviseAttachment);
}
reviewSuperviseAttachmentService.save(reviewSuperviseAttachment);
}
}
}

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

@ -428,22 +428,36 @@ public class ReviewWorkService extends BaseService<ReviewWorkMapper, ReviewWork>
if (StrUtil.isNotBlank(attachmentName)) {
String[] nameArr = attachmentName.split(",");
String[] pathArr = attachmentPath.split(",");
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])
.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());
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])
.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)
.setReviewId(reviewId)
.setTitle(nameArr[i])
.setAttachment(pathArr[i])
.setCreatedId(loginUser.getId())
.setCreatedAt(LocalDateTime.now());
reviewWorkAttachmentService.save(reviewAttachment);
}
}
}
}

2
src/main/resources/views/dist/css/chunk-da4b17f6.0104e618.css → src/main/resources/views/dist/css/chunk-98841a6c.5731ba28.css vendored
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

30
src/main/resources/views/dist/js/52599c1fa0897a2ff383.worker.js vendored Executable file
View File

File diff suppressed because one or more lines are too long

2
src/main/resources/views/dist/js/app.ea2d6a53.js → src/main/resources/views/dist/js/app.7e03af18.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/main/resources/views/dist/js/chunk-da4b17f6.5a2ff7d1.js → src/main/resources/views/dist/js/chunk-98841a6c.9e922929.js vendored
View File

File diff suppressed because one or more lines are too long