add 上传会议纪要

jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java

@@ -210,6 +210,18 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
         return Result.OK("上传资料成功!");
     }
 
+    /**
+     * 上传会议纪要
+     */
+    @AutoLog(value = "上传会议纪要")
+    @RequiresPermissions("committeeMeeting:uploadCouncil")
+    @ApiOperation(value = "上传会议纪要", notes = "上传会议纪要")
+    @PostMapping(value = "/uploadCouncilFile")
+    public Result<?> uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) {
+        payMeetingService.uploadFile(uploadFileVO, MeetingCommon.COMMITTEE_MEETING_INT);
+        return Result.OK("上传会议纪要成功!");
+    }
+
     /**
      * 发布提醒
      */

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<PayMeeting, IPayMeetingService> {
     @Resource
@@ -56,21 +51,11 @@ public class CouncilMeetingController extends JeroController<PayMeeting, IPayMee
     private ISysBaseAPI sysBaseAPI;
     @Resource
     private IPayMeetingHotelContactsService meetingHotelContactsService;
-    @Resource
-    private IPayWorkingGroupService payWorkingGroupService;
-    @Resource
-    private AuthenticationUtils authenticationUtils;
-    @Resource
-    private IOSSFileService iossFileService;
-    @Resource
-    private IPayCaseCommitteeService payCaseCommitteeService;
-    @Resource
-    private IPayContactsManagementService payContactsManagementService;
 
     /**
      * 分页列表查询
      */
-    @RequiresPermissions("committeeMeeting:search")
+    @RequiresPermissions("councilMeeting:search")
     @ApiOperation(value = "会议管理-分页列表查询", notes = "会议管理-分页列表查询")
     @GetMapping(value = "/page")
     public Result<?> queryPageList(PayMeeting payMeeting,
@@ -86,7 +71,7 @@ public class CouncilMeetingController extends JeroController<PayMeeting, IPayMee
     /**
      * 添加
      */
-    @RequiresPermissions("committeeMeeting:add")
+    @RequiresPermissions("councilMeeting:add")
     @AutoLog(value = "会议管理-添加")
     @ApiOperation(value = "会议管理-添加", notes = "会议管理-添加")
     @PostMapping(value = "/add")
@@ -103,7 +88,7 @@ public class CouncilMeetingController extends JeroController<PayMeeting, IPayMee
     /**
      * 编辑
      */
-    @RequiresPermissions("committeeMeeting:edit")
+    @RequiresPermissions("councilMeeting:edit")
     @AutoLog(value = "会议管理-编辑")
     @ApiOperation(value = "会议管理-编辑", notes = "会议管理-编辑")
     @PostMapping(value = "/edit")
@@ -126,7 +111,7 @@ public class CouncilMeetingController extends JeroController<PayMeeting, IPayMee
     /**
      * 通过id删除
      */
-    @RequiresPermissions("committeeMeeting:delete")
+    @RequiresPermissions("councilMeeting:delete")
     @AutoLog(value = "会议管理-通过id删除")
     @ApiOperation(value = "会议管理-通过id删除", notes = "会议管理-通过id删除")
     @GetMapping(value = "/delete")
@@ -139,7 +124,7 @@ public class CouncilMeetingController extends JeroController<PayMeeting, IPayMee
     /**
      * 批量删除
      */
-    @RequiresPermissions("committeeMeeting:batchDel")
+    @RequiresPermissions("councilMeeting:batchDel")
     @AutoLog(value = "会议管理-批量删除")
     @ApiOperation(value = "会议管理-批量删除", notes = "会议管理-批量删除")
     @GetMapping(value = "/deleteBatch")
@@ -187,7 +172,7 @@ public class CouncilMeetingController extends JeroController<PayMeeting, IPayMee
     /**
      * 导出excel
      */
-    @RequiresPermissions("committeeMeeting:export")
+    @RequiresPermissions("councilMeeting:export")
     @GetMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, PayMeeting payMeeting) {
         payMeeting.setMeetingType(MeetingCommon.COMMITTEE_MEETING_INT);
@@ -202,7 +187,7 @@ public class CouncilMeetingController extends JeroController<PayMeeting, IPayMee
      * 上传资料
      */
     @AutoLog(value = "上传资料")
-    @RequiresPermissions("committeeMeeting:upload")
+    @RequiresPermissions("councilMeeting:upload")
     @ApiOperation(value = "上传资料", notes = "上传资料")
     @PostMapping(value = "/uploadFile")
     public Result<?> uploadFile(@RequestBody UploadFileVO uploadFileVO) {
@@ -210,11 +195,23 @@ public class CouncilMeetingController extends JeroController<PayMeeting, IPayMee
         return Result.OK("上传资料成功!");
     }
 
+    /**
+     * 上传会议纪要
+     */
+    @AutoLog(value = "上传会议纪要")
+    @RequiresPermissions("committeeMeeting:uploadCouncil")
+    @ApiOperation(value = "上传会议纪要", notes = "上传会议纪要")
+    @PostMapping(value = "/uploadCouncilFile")
+    public Result<?> 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) {

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<PayMeetingSituation, IPayMeetingSituationService> {
     @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<PayMeeting
     /**
      * 添加参会人
      */
-    @RequiresPermissions("committeeMeetingSituation:add")
+    @RequiresPermissions("councilMeetingSituation:add")
     @AutoLog(value = "参会人员信息-添加参会人")
     @ApiOperation(value = "参会人员信息-添加参会人", notes = "参会人员信息-添加参会人")
     @PostMapping(value = "/add")
@@ -113,7 +101,7 @@ public class CouncilMeetingSituationController extends JeroController<PayMeeting
      * 编辑
      */
     @AutoLog(value = "参会人员信息-编辑")
-    @RequiresPermissions("committeeMeetingSituation:edit")
+    @RequiresPermissions("councilMeetingSituation:edit")
     @ApiOperation(value = "参会人员信息-编辑", notes = "参会人员信息-编辑")
     @PostMapping(value = "/edit")
     public Result<?> edit(@RequestBody PayMeetingSituationVO payMeetingSituationVO) {
@@ -124,7 +112,7 @@ public class CouncilMeetingSituationController extends JeroController<PayMeeting
     /**
      * 通过id删除
      */
-    @RequiresPermissions("committeeMeetingSituation:delete")
+    @RequiresPermissions("councilMeetingSituation:delete")
     @AutoLog(value = "参会人员信息-通过id删除")
     @ApiOperation(value = "参会人员信息-通过id删除", notes = "参会人员信息-通过id删除")
     @GetMapping(value = "/delete")
@@ -136,7 +124,7 @@ public class CouncilMeetingSituationController extends JeroController<PayMeeting
     /**
      * 批量删除
      */
-    @RequiresPermissions("committeeMeetingSituation:batchDel")
+    @RequiresPermissions("councilMeetingSituation:batchDel")
     @AutoLog(value = "参会人员信息-批量删除")
     @ApiOperation(value = "参会人员信息-批量删除", notes = "参会人员信息-批量删除")
     @GetMapping(value = "/deleteBatch")
@@ -179,7 +167,7 @@ public class CouncilMeetingSituationController extends JeroController<PayMeeting
     /**
      * 导出excel
      */
-    @RequiresPermissions("committeeMeetingSituation:export")
+    @RequiresPermissions("councilMeetingSituation:export")
     @GetMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, PayMeetingSituation payMeetingSituation) {
 
@@ -191,7 +179,7 @@ public class CouncilMeetingSituationController extends JeroController<PayMeeting
     /**
      * 审核付款凭证
      */
-    @RequiresPermissions("committeeMeetingSituation:auditCredentials")
+    @RequiresPermissions("councilMeetingSituation:auditCredentials")
     @AutoLog(value = "审核付款凭证")
     @ApiOperation(value = "审核付款凭证")
     @PostMapping(value = "/check")
@@ -204,7 +192,7 @@ public class CouncilMeetingSituationController extends JeroController<PayMeeting
      * 审核报名信息
      */
     @AutoLog(value = "审核报名信息")
-    @RequiresPermissions("committeeMeetingSituation:auditSignUp")
+    @RequiresPermissions("councilMeetingSituation:auditSignUp")
     @ApiOperation(value = "审核报名信息")
     @PostMapping(value = "/checkRegister")
     public Result<?> checkRegister(@RequestBody CheckVO checkVO) {

jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java

@@ -208,4 +208,16 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
         return Result.OK("上传资料成功!");
     }
 
+    /**
+     * 上传会议纪要
+     */
+    @AutoLog(value = "上传会议纪要")
+    @RequiresPermissions("committeeMeeting:uploadCouncil")
+    @ApiOperation(value = "上传会议纪要", notes = "上传会议纪要")
+    @PostMapping(value = "/uploadCouncilFile")
+    public Result<?> uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) {
+        payMeetingService.uploadFile(uploadFileVO, MeetingCommon.COMMITTEE_MEETING_INT);
+        return Result.OK("上传会议纪要成功!");
+    }
+
 }

jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java

@@ -207,4 +207,16 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
         return Result.OK("上传资料成功!");
     }
 
+    /**
+     * 上传会议纪要
+     */
+    @AutoLog(value = "上传会议纪要")
+    @RequiresPermissions("committeeMeeting:uploadCouncil")
+    @ApiOperation(value = "上传会议纪要", notes = "上传会议纪要")
+    @PostMapping(value = "/uploadCouncilFile")
+    public Result<?> uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) {
+        payMeetingService.uploadFile(uploadFileVO, MeetingCommon.COMMITTEE_MEETING_INT);
+        return Result.OK("上传会议纪要成功!");
+    }
+
 }

jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java

@@ -245,4 +245,16 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
         return Result.OK("上传资料成功!");
     }
 
+    /**
+     * 上传会议纪要
+     */
+    @AutoLog(value = "上传会议纪要")
+    @RequiresPermissions("committeeMeeting:uploadCouncil")
+    @ApiOperation(value = "上传会议纪要", notes = "上传会议纪要")
+    @PostMapping(value = "/uploadCouncilFile")
+    public Result<?> uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) {
+        payMeetingService.uploadFile(uploadFileVO, MeetingCommon.COMMITTEE_MEETING_INT);
+        return Result.OK("上传会议纪要成功!");
+    }
+
 }

jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java

@@ -230,6 +230,18 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
         return Result.OK("上传资料成功!");
     }
 
+    /**
+     * 上传会议纪要
+     */
+    @AutoLog(value = "上传会议纪要")
+    @RequiresPermissions("committeeMeeting:uploadCouncil")
+    @ApiOperation(value = "上传会议纪要", notes = "上传会议纪要")
+    @PostMapping(value = "/uploadCouncilFile")
+    public Result<?> uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) {
+        payMeetingService.uploadFile(uploadFileVO, MeetingCommon.COMMITTEE_MEETING_INT);
+        return Result.OK("上传资料成功!");
+    }
+
     /**
      * 发布提醒
      */

jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java

@@ -70,6 +70,11 @@ public interface IPayMeetingService extends IService<PayMeeting> {
 
     void uploadFileSendMsg(UploadFileVO uploadFileVO, Integer meetingCommon);
 
+	/**
+	 * 上传会议纪要
+	 */
+	void uploadFile(UploadFileVO uploadFileVO, Integer committeeMeetingInt);
+
 	/**
 	 *	根据会议类型查询导出类
 	 */
@@ -79,4 +84,6 @@ public interface IPayMeetingService extends IService<PayMeeting> {
 	 * 根据会议类型查询导出数据
 	 */
     List<Object> getExportList(HttpServletRequest request, IPage<PayMeeting> queryPageList);
+
+
 }

jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java

@@ -857,6 +857,24 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
         }
     }
 
+    @Override
+    public void uploadFile(UploadFileVO uploadFileVO, Integer committeeMeetingInt) {
+        String id = uploadFileVO.getId();
+        PayMeeting payMeeting = getOne(
+                new LambdaQueryWrapper<PayMeeting>()
+                        .eq(PayMeeting::getId, id)
+                        .eq(PayMeeting::getMeetingType, committeeMeetingInt)
+        );
+        if (Objects.isNull(payMeeting)) {
+            throw new JeroBootException("会议不存在");
+        }
+        String fileIds = uploadFileVO.getFileIds();
+        LambdaUpdateWrapper<PayMeeting> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(PayMeeting::getId, id);
+        wrapper.set(PayMeeting::getMeetingMinute, fileIds);
+        update(wrapper);
+    }
+
     @Override
     public Class<?> getaClass(Integer meetingType) {
         Class<?> classToExport = null;