diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java index c30355cb..e0fca3d2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java @@ -210,6 +210,18 @@ public class CommitteeMeetingController extends JeroController uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) { + payMeetingService.uploadFile(uploadFileVO, MeetingCommon.COMMITTEE_MEETING_INT); + return Result.OK("上传会议纪要成功!"); + } + /** * 发布提醒 */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java index 8878e588..e1780416 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java @@ -8,11 +8,8 @@ import com.jero.common.enums.CompanyMessageEnums; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.AuthenticationUtils; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; -import com.jero.company.service.IPayContactsManagementService; -import com.jero.data.service.IPayCaseCommitteeService; import com.jero.meeting.common.MeetingCommon; import com.jero.meeting.entity.PayMeeting; import com.jero.meeting.entity.PayMeetingHotelContacts; @@ -21,9 +18,7 @@ import com.jero.meeting.service.IPayMeetingService; import com.jero.meeting.vo.PayMeetingVO; import com.jero.meeting.vo.PublishReminderVO; import com.jero.meeting.vo.UploadFileVO; -import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.volid.group.UpdateGroup; -import com.jero.project.service.IPayWorkingGroupService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -45,9 +40,9 @@ import java.util.Objects; * @date: 2021-09-02 * @version: V1.0 */ -@Api(tags = "会议管理-分标委会议") +@Api(tags = "会议管理-理事会会议") @RestController -@RequestMapping("/meeting/committeeMeeting") +@RequestMapping("/meeting/councilMeeting") @Slf4j public class CouncilMeetingController extends JeroController { @Resource @@ -56,21 +51,11 @@ public class CouncilMeetingController extends JeroController queryPageList(PayMeeting payMeeting, @@ -86,7 +71,7 @@ public class CouncilMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { @@ -210,11 +195,23 @@ public class CouncilMeetingController extends JeroController uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) { + payMeetingService.uploadFile(uploadFileVO, MeetingCommon.COMMITTEE_MEETING_INT); + return Result.OK("上传会议纪要成功!"); + } + /** * 发布提醒 */ @AutoLog(value = "发布提醒", operateType = 2) - @RequiresPermissions("committeeMeeting:publish") + @RequiresPermissions("councilMeeting:publish") @ApiOperation(value = "发布提醒", notes = "发布提醒") @PostMapping(value = "/publishReminder") public Result publishReminder(@RequestBody PublishReminderVO publishReminderVO) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java index 28b071c6..4fda332f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java @@ -8,15 +8,11 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.DictPoint; import com.jero.common.exception.JeroBootException; -import com.jero.common.service.RolePermissionService; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.ValidUtil; -import com.jero.company.service.IPayCompanyManagementService; -import com.jero.company.service.IPayContactsManagementService; import com.jero.meeting.common.MeetingCommon; import com.jero.meeting.entity.PayMeetingSituation; -import com.jero.meeting.service.IPayMeetingService; import com.jero.meeting.service.IPayMeetingSituationService; import com.jero.meeting.vo.CheckVO; import com.jero.meeting.vo.MergePayBillVO; @@ -43,28 +39,20 @@ import java.util.Objects; * @date: 2021-09-02 * @version: V1.0 */ -@Api(tags = "参会人员信息-分标委会议") +@Api(tags = "参会人员信息-理事会会议") @RestController -@RequestMapping("/meeting/committeeMeetingSituation") +@RequestMapping("/meeting/councilMeetingSituation") @Slf4j public class CouncilMeetingSituationController extends JeroController { @Resource private IPayMeetingSituationService payMeetingSituationService; - @Resource - private IPayContactsManagementService contactsManagementService; - @Resource - private IPayCompanyManagementService companyManagementService; - @Resource - private IPayMeetingService meetingService; - @Resource - private RolePermissionService rolePermissionService; - private final Integer MEETING_TYPE = MeetingCommon.COMMITTEE_MEETING_INT; + private final Integer MEETING_TYPE = MeetingCommon.COUNCIL_MEETING_INT; /** * 分页列表查询 */ @CompanyNameTranslate - @RequiresPermissions("committeeMeetingSituation:search") + @RequiresPermissions("councilMeetingSituation:search") @ApiOperation(value = "参会人员信息-分页列表查询", notes = "参会人员信息-分页列表查询") @GetMapping(value = "/page") public Result queryPageList(PayMeetingSituation payMeetingSituation, @@ -99,7 +87,7 @@ public class CouncilMeetingSituationController extends JeroController edit(@RequestBody PayMeetingSituationVO payMeetingSituationVO) { @@ -124,7 +112,7 @@ public class CouncilMeetingSituationController extends JeroController checkRegister(@RequestBody CheckVO checkVO) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java index f7d96be8..4096e0cc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java @@ -208,4 +208,16 @@ public class InternalMeetingController extends JeroController uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) { + payMeetingService.uploadFile(uploadFileVO, MeetingCommon.COMMITTEE_MEETING_INT); + return Result.OK("上传会议纪要成功!"); + } + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java index 57d58c84..ab61cfe7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java @@ -207,4 +207,16 @@ public class OtherMeetingController extends JeroController uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) { + payMeetingService.uploadFile(uploadFileVO, MeetingCommon.COMMITTEE_MEETING_INT); + return Result.OK("上传会议纪要成功!"); + } + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java index 6892b1c4..0346be7f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java @@ -245,4 +245,16 @@ public class StandardsMeetingController extends JeroController uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) { + payMeetingService.uploadFile(uploadFileVO, MeetingCommon.COMMITTEE_MEETING_INT); + return Result.OK("上传会议纪要成功!"); + } + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java index 179b54f8..faec0c51 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java @@ -230,6 +230,18 @@ public class WorkGroupMeetingController extends JeroController uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) { + payMeetingService.uploadFile(uploadFileVO, MeetingCommon.COMMITTEE_MEETING_INT); + return Result.OK("上传资料成功!"); + } + /** * 发布提醒 */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java index 5b64e4fc..67647936 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java @@ -70,6 +70,11 @@ public interface IPayMeetingService extends IService { void uploadFileSendMsg(UploadFileVO uploadFileVO, Integer meetingCommon); + /** + * 上传会议纪要 + */ + void uploadFile(UploadFileVO uploadFileVO, Integer committeeMeetingInt); + /** * 根据会议类型查询导出类 */ @@ -79,4 +84,6 @@ public interface IPayMeetingService extends IService { * 根据会议类型查询导出数据 */ List getExportList(HttpServletRequest request, IPage queryPageList); + + } 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 06b901ff..8154eac3 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 @@ -857,6 +857,24 @@ public class PayMeetingServiceImpl extends ServiceImpl() + .eq(PayMeeting::getId, id) + .eq(PayMeeting::getMeetingType, committeeMeetingInt) + ); + if (Objects.isNull(payMeeting)) { + throw new JeroBootException("会议不存在"); + } + String fileIds = uploadFileVO.getFileIds(); + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(PayMeeting::getId, id); + wrapper.set(PayMeeting::getMeetingMinute, fileIds); + update(wrapper); + } + @Override public Class getaClass(Integer meetingType) { Class classToExport = null;