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

update

This commit is contained in:
lijiaqi 2022-11-08 17:50:37 +08:00
parent b7fdc7809b
commit c93bdab142
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,7 +260,6 @@ public class AppointService extends BaseService<AppointMapper, Appoint> {
} }
public Appoint statePerformSave(AppointPerformStateRequest appointPerformRequest, User loginUser) { public Appoint statePerformSave(AppointPerformStateRequest appointPerformRequest, User loginUser) {
Appoint appoint = getById(appointPerformRequest.getId()); Appoint appoint = getById(appointPerformRequest.getId());
Assert.notNull(appoint, "未找到该记录"); Assert.notNull(appoint, "未找到该记录");
@ -476,7 +475,7 @@ public class AppointService extends BaseService<AppointMapper, Appoint> {
, Integer state, String category, String conferenceId, String conferenceName) { , Integer state, String category, String conferenceId, String conferenceName) {
appointAttachmentService.remove(new LambdaQueryWrapper<AppointAttachment>() appointAttachmentService.remove(new LambdaQueryWrapper<AppointAttachment>()
.eq(AppointAttachment::getAppointId, appointId) .eq(AppointAttachment::getAppointId, appointId)
.eq(AppointAttachment::getType, state)); .eq(AppointAttachment::getType, state).eq(AppointAttachment::getCategory, category));
//todo zhouyuan //todo zhouyuan
if (StrUtil.isNotBlank(attachmentName)) { if (StrUtil.isNotBlank(attachmentName)) {
String[] nameArr = attachmentName.split(","); String[] nameArr = attachmentName.split(",");

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

@ -542,7 +542,7 @@ public class ReviewOfficerService extends BaseService<ReviewOfficerMapper, Revie
String conferenceName) { String conferenceName) {
reviewOfficerAttachmentService.remove(new LambdaQueryWrapper<ReviewOfficerAttachment>() reviewOfficerAttachmentService.remove(new LambdaQueryWrapper<ReviewOfficerAttachment>()
.eq(ReviewOfficerAttachment::getReviewId, reviewId) .eq(ReviewOfficerAttachment::getReviewId, reviewId)
.eq(ReviewOfficerAttachment::getType, state)); .eq(ReviewOfficerAttachment::getType, state).eq(ReviewOfficerAttachment::getCategory, category));
if (StrUtil.isNotBlank(attachmentName)) { if (StrUtil.isNotBlank(attachmentName)) {
String[] nameArr = attachmentName.split(","); String[] nameArr = attachmentName.split(",");
String[] pathArr = attachmentPath.split(","); String[] pathArr = attachmentPath.split(",");

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

@ -214,7 +214,7 @@ public class ReviewSubjectService extends BaseService<ReviewSubjectMapper, Revie
reviewSubjectCheckStateRequest.getCheckAttachmentPath(), loginUser, ReviewSubject.STATE_CHECK, "1", reviewSubjectCheckStateRequest.getCheckAttachmentPath(), loginUser, ReviewSubject.STATE_CHECK, "1",
reviewSubjectCheckStateRequest.getCheckAttachmentConferenceId(), reviewSubjectCheckStateRequest.getCheckAttachmentConferenceName()); reviewSubjectCheckStateRequest.getCheckAttachmentConferenceId(), reviewSubjectCheckStateRequest.getCheckAttachmentConferenceName());
saveReviewSubjectAttachment(reviewSubject.getId(), saveReviewSubjectAttachment(reviewSubject.getId(),
reviewSubjectCheckStateRequest.getMeetingPlanAttachmentConferenceName(), reviewSubjectCheckStateRequest.getMeetingPlanAttachmentName(),
reviewSubjectCheckStateRequest.getMeetingPlanAttachmentPath(), loginUser, ReviewSubject.STATE_CHECK, "2", reviewSubjectCheckStateRequest.getMeetingPlanAttachmentPath(), loginUser, ReviewSubject.STATE_CHECK, "2",
reviewSubjectCheckStateRequest.getMeetingPlanAttachmentConferenceId(), reviewSubjectCheckStateRequest.getMeetingPlanAttachmentConferenceName()); reviewSubjectCheckStateRequest.getMeetingPlanAttachmentConferenceId(), reviewSubjectCheckStateRequest.getMeetingPlanAttachmentConferenceName());
saveReviewSubjectAttachment(reviewSubject.getId(), saveReviewSubjectAttachment(reviewSubject.getId(),
@ -468,6 +468,7 @@ public class ReviewSubjectService extends BaseService<ReviewSubjectMapper, Revie
for (int i = 0; i < nameArr.length; i++) { for (int i = 0; i < nameArr.length; i++) {
ReviewSubjectAttachment reviewAttachment = new ReviewSubjectAttachment(); ReviewSubjectAttachment reviewAttachment = new ReviewSubjectAttachment();
reviewAttachment.setType(state) reviewAttachment.setType(state)
.setTitle(nameArr[i])
.setReviewId(reviewId) .setReviewId(reviewId)
.setAttachment(pathArr[i]) .setAttachment(pathArr[i])
.setCreatedId(loginUser.getId()) .setCreatedId(loginUser.getId())
@ -492,7 +493,7 @@ public class ReviewSubjectService extends BaseService<ReviewSubjectMapper, Revie
, String conferenceName) { , String conferenceName) {
reviewSubjectAttachmentService.remove(new LambdaQueryWrapper<ReviewSubjectAttachment>() reviewSubjectAttachmentService.remove(new LambdaQueryWrapper<ReviewSubjectAttachment>()
.eq(ReviewSubjectAttachment::getReviewId, reviewId) .eq(ReviewSubjectAttachment::getReviewId, reviewId)
.eq(ReviewSubjectAttachment::getType, state)); .eq(ReviewSubjectAttachment::getType, state).eq(ReviewSubjectAttachment::getCategory,category));
if (StrUtil.isNotBlank(attachmentName)) { if (StrUtil.isNotBlank(attachmentName)) {
String[] nameArr = attachmentName.split(","); String[] nameArr = attachmentName.split(",");
String[] pathArr = attachmentPath.split(","); String[] pathArr = attachmentPath.split(",");
@ -518,6 +519,7 @@ public class ReviewSubjectService extends BaseService<ReviewSubjectMapper, Revie
ReviewSubjectAttachment reviewAttachment = new ReviewSubjectAttachment(); ReviewSubjectAttachment reviewAttachment = new ReviewSubjectAttachment();
reviewAttachment.setType(state).setCategory(category) reviewAttachment.setType(state).setCategory(category)
.setReviewId(reviewId) .setReviewId(reviewId)
.setTitle(nameArr[i])
.setAttachment(pathArr[i]) .setAttachment(pathArr[i])
.setCreatedId(loginUser.getId()) .setCreatedId(loginUser.getId())
.setCreatedAt(LocalDateTime.now()); .setCreatedAt(LocalDateTime.now());

2
src/main/resources/application.properties
View File

@ -6,7 +6,7 @@
#local #local
db.user = root db.user = root
db.pass = Wang09211108 db.pass = zhujg@1985
db.url = jdbc:mysql://127.0.0.1:3306/ydool_rd?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8 db.url = jdbc:mysql://127.0.0.1:3306/ydool_rd?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8
db.driver = com.mysql.cj.jdbc.Driver db.driver = com.mysql.cj.jdbc.Driver