LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 理事会会议

Browse Source
This commit is contained in:
lijiarao
2021-12-13 14:54:22 +08:00
parent 8133ea0c4d
commit a4771c2cf2
6 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java
+9 -9
View File
@@ -62,7 +62,7 @@ public class CouncilMeetingController extends JeroController<PayMeeting, IPayMee
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
payMeeting.setMeetingType(MeetingCommon.COMMITTEE_MEETING_INT);
payMeeting.setMeetingType(MeetingCommon.COUNCIL_MEETING_INT);
IPage<PayMeeting> pageList = payMeetingService.queryPageList(payMeeting, pageNo, pageSize, req);
return Result.OK(pageList);
@@ -77,7 +77,7 @@ public class CouncilMeetingController extends JeroController<PayMeeting, IPayMee
@PostMapping(value = "/add")
public Result<?> add(@RequestBody PayMeetingVO payMeetingVO) {
String meetingType = payMeetingVO.getMeetingType();
if (!Objects.equals(meetingType, MeetingCommon.COMMITTEE_MEETING)) {
if (!Objects.equals(meetingType, MeetingCommon.COUNCIL_MEETING)) {
throw new RuntimeException();
}
ValidUtil.validate(payMeetingVO);
@@ -103,7 +103,7 @@ public class CouncilMeetingController extends JeroController<PayMeeting, IPayMee
private void extracted(String id) {
PayMeeting payMeeting = payMeetingService.getById(id);
Integer meetingType = payMeeting.getMeetingType();
if (!Objects.equals(meetingType, MeetingCommon.COMMITTEE_MEETING_INT)) {
if (!Objects.equals(meetingType, MeetingCommon.COUNCIL_MEETING_INT)) {
throw new RuntimeException();
}
}
@@ -144,7 +144,7 @@ public class CouncilMeetingController extends JeroController<PayMeeting, IPayMee
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id") String id) {
PayMeeting meeting = payMeetingService.queryById(id);
if (meeting == null || !Objects.equals(meeting.getMeetingType(), MeetingCommon.COMMITTEE_MEETING_INT)) {
if (meeting == null || !Objects.equals(meeting.getMeetingType(), MeetingCommon.COUNCIL_MEETING_INT)) {
return Result.error("未找到对应数据");
}
//查询会议负责人
@@ -175,11 +175,11 @@ public class CouncilMeetingController extends JeroController<PayMeeting, IPayMee
@RequiresPermissions("councilMeeting:export")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayMeeting payMeeting) {
payMeeting.setMeetingType(MeetingCommon.COMMITTEE_MEETING_INT);
payMeeting.setMeetingType(MeetingCommon.COUNCIL_MEETING_INT);
IPage<PayMeeting> queryPageList = payMeetingService.queryPageList(payMeeting, -1, -1, request);
List<Object> exportList = payMeetingService.getExportList(request,queryPageList);
Class<?> aClass = payMeetingService.getaClass(MeetingCommon.COMMITTEE_MEETING_INT);
Class<?> aClass = payMeetingService.getaClass(MeetingCommon.COUNCIL_MEETING_INT);
return super.exportListXls(exportList, aClass, "会议管理");
}
@@ -191,7 +191,7 @@ public class CouncilMeetingController extends JeroController<PayMeeting, IPayMee
@ApiOperation(value = "上传资料", notes = "上传资料")
@PostMapping(value = "/uploadFile")
public Result<?> uploadFile(@RequestBody UploadFileVO uploadFileVO) {
payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.COMMITTEE_MEETING_INT);
payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.COUNCIL_MEETING_INT);
return Result.OK("上传资料成功!");
}
@@ -199,11 +199,11 @@ public class CouncilMeetingController extends JeroController<PayMeeting, IPayMee
* 上传会议纪要
*/
@AutoLog(value = "上传会议纪要")
@RequiresPermissions("committeeMeeting:uploadCouncil")
@RequiresPermissions("councilMeeting:uploadCouncil")
@ApiOperation(value = "上传会议纪要", notes = "上传会议纪要")
@PostMapping(value = "/uploadCouncilFile")
public Result<?> uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) {
payMeetingService.uploadFile(uploadFileVO, MeetingCommon.COMMITTEE_MEETING_INT);
payMeetingService.uploadFile(uploadFileVO, MeetingCommon.COUNCIL_MEETING_INT);
return Result.OK("上传会议纪要成功!");
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java
+1 -1
View File
@@ -212,7 +212,7 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
* 上传会议纪要
*/
@AutoLog(value = "上传会议纪要")
@RequiresPermissions("committeeMeeting:uploadCouncil")
@RequiresPermissions("internalMeeting:uploadCouncil")
@ApiOperation(value = "上传会议纪要", notes = "上传会议纪要")
@PostMapping(value = "/uploadCouncilFile")
public Result<?> uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) {
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java
+1 -1
View File
@@ -211,7 +211,7 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
* 上传会议纪要
*/
@AutoLog(value = "上传会议纪要")
@RequiresPermissions("committeeMeeting:uploadCouncil")
@RequiresPermissions("otherMeeting:uploadCouncil")
@ApiOperation(value = "上传会议纪要", notes = "上传会议纪要")
@PostMapping(value = "/uploadCouncilFile")
public Result<?> uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) {
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java
+1 -1
View File
@@ -249,7 +249,7 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
* 上传会议纪要
*/
@AutoLog(value = "上传会议纪要")
@RequiresPermissions("committeeMeeting:uploadCouncil")
@RequiresPermissions("standardsMeeting:uploadCouncil")
@ApiOperation(value = "上传会议纪要", notes = "上传会议纪要")
@PostMapping(value = "/uploadCouncilFile")
public Result<?> uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) {
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java
+1 -1
View File
@@ -234,7 +234,7 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
* 上传会议纪要
*/
@AutoLog(value = "上传会议纪要")
@RequiresPermissions("committeeMeeting:uploadCouncil")
@RequiresPermissions("workGroupMeeting:uploadCouncil")
@ApiOperation(value = "上传会议纪要", notes = "上传会议纪要")
@PostMapping(value = "/uploadCouncilFile")
public Result<?> uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) {
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+15 -1
View File
@@ -27,6 +27,7 @@ import com.jero.company.service.IPayContactsManagementService;
import com.jero.data.entity.PayCaseCommittee;
import com.jero.data.entity.PayCaseCommitteeSubitem;
import com.jero.data.entity.PayCaseCouncil;
import com.jero.data.entity.PayCaseCouncilSubitem;
import com.jero.data.service.IPayCaseCommitteeService;
import com.jero.data.service.IPayCaseCommitteeSubitemService;
import com.jero.data.service.IPayCaseCouncilService;
@@ -515,7 +516,20 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
.setContactId(contactsId)
);
}
} else {
// 理事会会议查询人
} else if (Objects.equals(projectType, 3)) {
List<PayCaseCouncilSubitem> payCaseCouncilSubitems = payCaseCouncilSubitemService.listByIds(subitemIds);
for (PayCaseCouncilSubitem payCaseCouncilSubitem : payCaseCouncilSubitems) {
String councilSubitemId = payCaseCouncilSubitem.getId();
String contactsId = payCaseCouncilSubitem.getContactsId();
contactsIdList.add(contactsId);
meetingRemindRecordList.add(
new PayMeetingRemindRecord()
.setSubitemId(councilSubitemId)
.setContactId(contactsId)
);
}
}else {
throw new JeroBootException("项目类型不正确");
}
wrapper.in(PayContactsManagement::getId, contactsIdList);