update 来款企业端,会员单位成员可以下载所有标协会议文件
This commit is contained in:
+16
@@ -17,6 +17,10 @@ import com.jero.common.system.api.ISysBaseAPI;
|
|||||||
import com.jero.common.system.query.QueryGenerator;
|
import com.jero.common.system.query.QueryGenerator;
|
||||||
import com.jero.common.system.vo.LoginUser;
|
import com.jero.common.system.vo.LoginUser;
|
||||||
import com.jero.common.util.*;
|
import com.jero.common.util.*;
|
||||||
|
import com.jero.company.common.PayContactsManagementCommon;
|
||||||
|
import com.jero.company.entity.PayCompanyManagement;
|
||||||
|
import com.jero.company.entity.PayContactsManagement;
|
||||||
|
import com.jero.company.service.IPayCompanyManagementService;
|
||||||
import com.jero.company.service.IPayContactsManagementService;
|
import com.jero.company.service.IPayContactsManagementService;
|
||||||
import com.jero.data.entity.PayCaseCommittee;
|
import com.jero.data.entity.PayCaseCommittee;
|
||||||
import com.jero.data.entity.PayCaseCommitteeSubitem;
|
import com.jero.data.entity.PayCaseCommitteeSubitem;
|
||||||
@@ -84,6 +88,8 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
|
|||||||
@Resource
|
@Resource
|
||||||
private IPayContactsManagementService payContactsManagementService;
|
private IPayContactsManagementService payContactsManagementService;
|
||||||
@Resource
|
@Resource
|
||||||
|
private IPayCompanyManagementService payCompanyManagementService;
|
||||||
|
@Resource
|
||||||
private IPayMeetingSituationService payMeetingSituationService;
|
private IPayMeetingSituationService payMeetingSituationService;
|
||||||
@Resource
|
@Resource
|
||||||
private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
|
private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
|
||||||
@@ -513,6 +519,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
|
|||||||
}
|
}
|
||||||
Integer meetingType = payMeeting.getMeetingType();
|
Integer meetingType = payMeeting.getMeetingType();
|
||||||
//如果是分标委会议或理事会会议,判断是否为成员
|
//如果是分标委会议或理事会会议,判断是否为成员
|
||||||
|
//如果是标协会议,判断公司是否是会员单位
|
||||||
boolean isSubItem = false;
|
boolean isSubItem = false;
|
||||||
if (meetingType.equals(MeetingCommon.COMMITTEE_MEETING_INT)) {
|
if (meetingType.equals(MeetingCommon.COMMITTEE_MEETING_INT)) {
|
||||||
LambdaQueryWrapper<PayCaseCommitteeSubitem> wrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<PayCaseCommitteeSubitem> wrapper = new LambdaQueryWrapper<>();
|
||||||
@@ -531,7 +538,16 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
|
|||||||
if (count > 0) {
|
if (count > 0) {
|
||||||
isSubItem = true;
|
isSubItem = true;
|
||||||
}
|
}
|
||||||
|
} else if (meetingType.equals(MeetingCommon.STANDARD_MEETING_INT)) {
|
||||||
|
PayContactsManagement contactsManagement = payContactsManagementService.getById(sysUserId);
|
||||||
|
String companyId = contactsManagement.getCompanyId();
|
||||||
|
PayCompanyManagement companyManagement = payCompanyManagementService.getById(companyId);
|
||||||
|
String memberId = companyManagement.getMemberId();
|
||||||
|
if (StringUtils.isNotBlank(memberId)) {
|
||||||
|
isSubItem = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
String meetingMinute = payMeeting.getMeetingMinute();
|
String meetingMinute = payMeeting.getMeetingMinute();
|
||||||
String meetingData = payMeeting.getMeetingData();
|
String meetingData = payMeeting.getMeetingData();
|
||||||
List<String> fileList = new ArrayList<>();
|
List<String> fileList = new ArrayList<>();
|
||||||
|
|||||||
Reference in New Issue
Block a user