diff --git a/db/增量SQL/update20211210.sql b/db/增量SQL/update20211210.sql index 6152fc63..8ccbba36 100644 --- a/db/增量SQL/update20211210.sql +++ b/db/增量SQL/update20211210.sql @@ -98,9 +98,12 @@ INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `descrip INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1480728688457760770', '1480727974285230081', '待签到', '6', '', 6.00, 1, 'LKGLZ', '2022-01-11 10:30:05', NULL, NULL); INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1480728741738004481', '1480727974285230081', '已签到', '7', '', 7.00, 1, 'LKGLZ', '2022-01-11 10:30:17', NULL, NULL); -- 2022-02-22 优化 合同的状态文字,草稿改成审核中,待存档改成双方盖章 -UPDATE `income_payments`.`sys_dict_item` SET `item_text` = '审核中', `update_time` = '2022-02-22 09:56:45' WHERE `id` = '1434774614361071617'; -UPDATE `income_payments`.`sys_dict_item` SET `item_text` = '双方盖章', `update_time` = '2022-02-22 09:56:32' WHERE `id` = '1434774669851713537'; -UPDATE `income_payments`.`sys_dict_item` SET `item_text` = '双方盖章', `update_time` = '2022-02-22 09:56:23' WHERE `id` = '1452889074170695681'; +UPDATE `sys_dict_item` SET `item_text` = '审核中', `update_time` = '2022-02-22 09:56:45' WHERE `id` = '1434774614361071617'; +UPDATE `sys_dict_item` SET `item_text` = '双方盖章', `update_time` = '2022-02-22 09:56:32' WHERE `id` = '1434774669851713537'; +UPDATE `sys_dict_item` SET `item_text` = '双方盖章', `update_time` = '2022-02-22 09:56:23' WHERE `id` = '1452889074170695681'; -- 2022-02-22 解决历史数据造成的bug: 会员账户在会员缴费的时候 没有memberId ,后续修改了代码,但需要单独处理历史数据 -UPDATE `pay_contacts_management` SET `member_id` = '1493753775364714497' WHERE `id` = '1493046320367828993'; \ No newline at end of file +UPDATE `pay_contacts_management` SET `member_id` = '1493753775364714497' WHERE `id` = '1493046320367828993'; +-- 2022-02-23 调整会议名称为100字符 +ALTER TABLE `pay_meeting` + MODIFY COLUMN `meeting_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '会议名称' AFTER `update_time`; \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 514fc1cf..dcf4356d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -35,6 +35,7 @@ import com.jero.data.service.IPayCaseCouncilSubitemService; import com.jero.meeting.common.MeetingCommon; import com.jero.meeting.common.MeetingSubitemCommon; import com.jero.meeting.entity.*; +import com.jero.meeting.mapper.PayMeetingContactsMapper; import com.jero.meeting.mapper.PayMeetingMapper; import com.jero.meeting.service.*; import com.jero.meeting.valid.group.CaseCommitteeMeeting; @@ -122,6 +123,8 @@ public class PayMeetingServiceImpl extends ServiceImpl meetingContactsList = payMeetingVO.getMeetingContactsList(); + addMeetingContactsList(meetingContactsList, payMeeting.getId()); //新增会员系统标协会议 if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { + String directorId = payMeeting.getDirectorId(); + LoginUser loginUser = sysBaseAPI.getUserById(directorId); + payMeeting.setDirectorName(loginUser.getRealname()); stableCrossTrainingService.add(payMeeting, hotelContactsList); List fileIdList = new ArrayList<>(); String meetingFiles = payMeeting.getMeetingFiles(); @@ -238,6 +245,9 @@ public class PayMeetingServiceImpl extends ServiceImpl meetingContactsList = payMeeting.getMeetingContactsList(); + addMeetingContactsList(meetingContactsList, payMeeting.getId()); } /** @@ -262,9 +272,13 @@ public class PayMeetingServiceImpl extends ServiceImpl meetingContactsList = payMeetingVO.getMeetingContactsList(); + addMeetingContactsList(meetingContactsList, payMeeting.getId()); //编辑标协会议 if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { + String directorId = payMeeting.getDirectorId(); + LoginUser loginUser = sysBaseAPI.getUserById(directorId); + payMeeting.setDirectorName(loginUser.getRealname()); stableCrossTrainingService.edit(payMeeting, hotelContactsList); List fileIdList = new ArrayList<>(); String meetingFiles = payMeeting.getMeetingFiles(); @@ -284,8 +298,8 @@ public class PayMeetingServiceImpl extends ServiceImpl meetingContactsList = payMeetingVO.getMeetingContactsList(); + private void addMeetingContactsList(List meetingContactsList, String meetingId) { + if (meetingContactsList == null) { return; } @@ -313,6 +327,7 @@ public class PayMeetingServiceImpl extends ServiceImpl