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-09-29 14:24:27 +08:00
parent 400e270bb4
commit d87a7d3dd0
8 changed files with 131 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java
+18
View File
@@ -36,4 +36,22 @@ public class MeetingCommon {
* 已提醒
*/
public static final Integer REMIND_1 = 1;
/**
* 会议状态 全部
*/
public final static String MEETING_STATUS_1 = "1";
/**
* 会议状态 未开始
*/
public final static String MEETING_STATUS_2 = "2";
/**
* 会议状态 进行中
*/
public final static String MEETING_STATUS_3 = "3";
/**
* 会议状态 已结束
*/
public final static String MEETING_STATUS_4 = "4";
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+74 -18
View File
@@ -5,6 +5,7 @@ import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSONObject;
@@ -77,6 +78,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
private IOSSFileService iossFileService;
@Resource
private IPayCaseCommitteeService payCaseCommitteeService;
/**
* 分页列表查询
*/
@@ -94,11 +96,11 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
queryWrapper.not(
a -> a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime)
);
}else if (ObjectUtil.isNotEmpty(meetingStartTime)){
} else if (ObjectUtil.isNotEmpty(meetingStartTime)) {
queryWrapper.not(
a -> a.lt("end_time", meetingStartTime)
);
}else if (ObjectUtil.isNotEmpty(meetingEndTime)){
} else if (ObjectUtil.isNotEmpty(meetingEndTime)) {
queryWrapper.not(
a -> a.gt("start_time", meetingEndTime)
);
@@ -125,6 +127,60 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
return Result.OK(pageList);
}
/**
* 企业端-会议-分页列表查询参会人的会议
*/
@ApiOperation(value = "企业端-会议-分页列表查询参会人的会议")
@GetMapping(value = "/pageContract")
public Result<?> queryPageListContract(PayMeeting payMeeting,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
String meetingStartTime = req.getParameter("meetingStartTime");
String meetingEndTime = req.getParameter("meetingEndTime");
if (ObjectUtil.isNotEmpty(meetingStartTime) && ObjectUtil.isNotEmpty(meetingEndTime)) {
queryWrapper.not(
a -> a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime)
);
} else if (ObjectUtil.isNotEmpty(meetingStartTime)) {
queryWrapper.not(
a -> a.lt("end_time", meetingStartTime)
);
} else if (ObjectUtil.isNotEmpty(meetingEndTime)) {
queryWrapper.not(
a -> a.gt("start_time", meetingEndTime)
);
}
String meetingStatus = req.getParameter("meetingStatus");
String now = DateUtil.formatDate(new Date());
switch (meetingStatus) {
case MeetingCommon.MEETING_STATUS_2:
queryWrapper.gt("start_time", now);
break;
case MeetingCommon.MEETING_STATUS_3:
queryWrapper.ge("end_time", now);
queryWrapper.le("start_time", now);
break;
case MeetingCommon.MEETING_STATUS_4:
queryWrapper.le("end_time", now);
break;
}
Page<PayMeeting> page = new Page<>(pageNo, pageSize);
IPage<PayMeeting> pageList = payMeetingService.pageListContract(page, queryWrapper);
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getUsername());
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(payMeetingVO, payMeeting);
}
return Result.OK(pageList);
}
/**
* 列表查询
*/
@@ -241,7 +297,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
List<String> selectionList = Arrays.asList(selections.split(","));
pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
}
if (pageList.isEmpty()){
if (pageList.isEmpty()) {
throw new JeroBootException("没有数据");
}
String meetingType = pageList.get(0).getMeetingType().toString();
@@ -309,39 +365,39 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
switch (meetingType) {
case MeetingCommon.WORKING_GROUP_MEETING:
classToExport = WorkingGroupMeetingExcel.class;
break;
break;
case MeetingCommon.STANDARD_MEETING:
classToExport = StandardsMeetingExcel.class;
break;
case MeetingCommon.INTERNATIONAL_MEETING:
classToExport = InternationalMeetingExcel.class;
break;
break;
case MeetingCommon.OTHER_MEETING:
classToExport = OtherMeetingExcel.class;
break;
break;
case MeetingCommon.COMMITTEE_MEETING:
classToExport = CommitteeMeetingExcel.class;
break;
break;
}
return super.exportListXls(exportList, classToExport, "会议管理");
}
/**
* 上传资料
* 上传资料
*/
@AutoLog(value = "上传资料")
@RequiresPermissions("meeting:upload")
@ApiOperation(value="上传资料", notes="上传资料")
@ApiOperation(value = "上传资料", notes = "上传资料")
@PostMapping(value = "/uploadFile")
public Result<?> uploadFile(@RequestBody UploadFileVO uploadFileVO) {
String fileIds = uploadFileVO.getFileIds();
String id = uploadFileVO.getId();
LambdaUpdateWrapper<PayMeeting> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(PayMeeting::getId,id);
wrapper.set(PayMeeting::getMeetingData,fileIds);
wrapper.eq(PayMeeting::getId, id);
wrapper.set(PayMeeting::getMeetingData, fileIds);
payMeetingService.update(wrapper);
PayMeeting payMeeting = payMeetingService.getById(id);
if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))){
if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
List<String> idList = Arrays.asList(fileIds.split(","));
List<OSSFile> ossFiles = iossFileService.listByIds(idList);
for (OSSFile ossFile : ossFiles) {
@@ -350,21 +406,21 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
int length = fileUrl.length;
ossFile.setFileName(fileUrl[length - 1]);
}
AuthenticationUtils.post("/stablecrosstraining/stableCrossTraining/addStandardsFile",null,ossFiles);
AuthenticationUtils.post("/stablecrosstraining/stableCrossTraining/addStandardsFile", null, ossFiles);
StableCrossTraining stableCrossTraining = new StableCrossTraining();
stableCrossTraining.setId(id);
stableCrossTraining.setMeetingFiles(fileIds);
AuthenticationUtils.post("/stablecrosstraining/stableCrossTraining/updateStandardsFile",null,stableCrossTraining);
AuthenticationUtils.post("/stablecrosstraining/stableCrossTraining/updateStandardsFile", null, stableCrossTraining);
}
return Result.OK("上传资料成功!");
}
/**
* 发布提醒
* 发布提醒
*/
@AutoLog("发布提醒")
@RequiresPermissions("meeting:publish")
@ApiOperation(value="发布提醒", notes="发布提醒")
@ApiOperation(value = "发布提醒", notes = "发布提醒")
@PostMapping(value = "/publishReminder")
public Result<?> publishReminder(@RequestBody PublishReminderVO publishReminderVO) {
payMeetingService.publishReminder(publishReminderVO);
@@ -386,7 +442,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
public Result<?> addStandards(@RequestBody PayMeeting payMeeting, HttpServletRequest request) {
String publicKey = request.getParameter("publicKey");
String token = request.getParameter("token");
authenticationUtils.check(token,publicKey);
authenticationUtils.check(token, publicKey);
payMeetingService.addStandards(payMeeting);
return Result.OK("合并开票成功!");
@@ -400,7 +456,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
public Result<?> addStandardsFile(@RequestBody List<OSSFile> ossFileList, HttpServletRequest request) {
String publicKey = request.getParameter("publicKey");
String token = request.getParameter("token");
authenticationUtils.check(token,publicKey);
authenticationUtils.check(token, publicKey);
for (OSSFile ossFile : ossFileList) {
iossFileService.saveOrUpdate(ossFile);
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
+7
View File
@@ -249,4 +249,11 @@ public class PayMeeting implements Serializable {
/**通知正文*/
@ApiModelProperty(value = "通知正文")
private String notice;
/**
* 缴费方式
*/
@TableField(exist = false)
@Dict(dicCode = "meeting_pay_type")
private Integer payMode;
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
+7
View File
@@ -408,4 +408,11 @@ public class PayMeetingSituation implements Serializable {
@TableField(exist = false)
@ApiModelProperty(value = "收入合同编号")
private String contractNum;
/**
* 会议名称
*/
@TableField(exist = false)
@ApiModelProperty(value = "会议名称")
private String meetingName;
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java
+6 -1
View File
@@ -2,6 +2,10 @@ package com.jero.meeting.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import com.jero.meeting.entity.PayMeeting;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -9,9 +13,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 会议管理
* @Author: jero-boot
* @Date: 2021-09-02
* @Date: 2021-09-02
* @Version: V1.0
*/
public interface PayMeetingMapper extends BaseMapper<PayMeeting> {
IPage<PayMeeting> pageListContract(Page<PayMeeting> page, @Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper);
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
+8
View File
@@ -30,5 +30,13 @@
<result column="hotel_address" property="hotelAddress" />
<result column="hotel_contacts" property="hotelContacts" />
<result column="remark" property="remark" />
<result column="pay_mode" property="payMode"/>
</resultMap>
<select id="pageListContract" resultMap="PayMeetingResultMap">
select pm.*,pms.pay_mode
from pay_meeting pm
left join pay_meeting_situation pms on pm.id = pms.meeting_id
#{ew.customSqlSegment}
</select>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java
+4
View File
@@ -1,5 +1,8 @@
package com.jero.meeting.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.meeting.entity.PayMeeting;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.meeting.entity.PayMeetingSituation;
@@ -62,4 +65,5 @@ public interface IPayMeetingService extends IService<PayMeeting> {
void publishReminder(PublishReminderVO publishReminderVO);
IPage<PayMeeting> pageListContract(Page<PayMeeting> page, QueryWrapper<PayMeeting> queryWrapper);
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+7
View File
@@ -3,6 +3,8 @@ package com.jero.meeting.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.dto.SendMessageDTO;
import com.jero.common.enums.CompanyMessageEnums;
import com.jero.common.enums.ManagementMessageEnums;
@@ -450,4 +452,9 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
}
payMeetingRemindRecordService.addList(meetingIdList,subitemIdList);
}
@Override
public IPage<PayMeeting> pageListContract(Page<PayMeeting> page, QueryWrapper<PayMeeting> queryWrapper) {
return baseMapper.pageListContract(page,queryWrapper);
}
}