add 发布会议
This commit is contained in:
@@ -0,0 +1,9 @@
|
|||||||
|
ALTER TABLE `pay_meeting`
|
||||||
|
ADD COLUMN `release` tinyint(1) NULL COMMENT '是否发布' AFTER `remind`;
|
||||||
|
|
||||||
|
INSERT INTO sys_dict (id, dict_name, dict_code, description, del_flag, create_by, create_time)
|
||||||
|
VALUES ('1476073127111663617', '发布状态', 'release', '', 0, 'LKGLZ', '2021-12-29 14:10:32');
|
||||||
|
INSERT INTO sys_dict_item (id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time)
|
||||||
|
VALUES ('1476073184066117633', '1476073127111663617', '未发布', '0', '', 1, 1, 'LKGLZ', '2021-12-29 14:10:45');
|
||||||
|
INSERT INTO sys_dict_item (id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time)
|
||||||
|
VALUES ('1476073211874353153', '1476073127111663617', '已发布', '1', '', 1, 1, 'LKGLZ', '2021-12-29 14:10:52');
|
||||||
+14
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.jero.common.api.vo.Result;
|
import com.jero.common.api.vo.Result;
|
||||||
import com.jero.common.aspect.annotation.AutoLog;
|
import com.jero.common.aspect.annotation.AutoLog;
|
||||||
|
import com.jero.common.enums.CompanyMessageEnums;
|
||||||
import com.jero.common.system.api.ISysBaseAPI;
|
import com.jero.common.system.api.ISysBaseAPI;
|
||||||
import com.jero.common.system.base.controller.JeroController;
|
import com.jero.common.system.base.controller.JeroController;
|
||||||
import com.jero.common.system.vo.LoginUser;
|
import com.jero.common.system.vo.LoginUser;
|
||||||
@@ -19,6 +20,7 @@ import com.jero.meeting.entity.PayMeetingHotelContacts;
|
|||||||
import com.jero.meeting.service.IPayMeetingHotelContactsService;
|
import com.jero.meeting.service.IPayMeetingHotelContactsService;
|
||||||
import com.jero.meeting.service.IPayMeetingService;
|
import com.jero.meeting.service.IPayMeetingService;
|
||||||
import com.jero.meeting.vo.PayMeetingVO;
|
import com.jero.meeting.vo.PayMeetingVO;
|
||||||
|
import com.jero.meeting.vo.PublishReminderVO;
|
||||||
import com.jero.meeting.vo.UploadFileVO;
|
import com.jero.meeting.vo.UploadFileVO;
|
||||||
import com.jero.modules.oss.service.IOSSFileService;
|
import com.jero.modules.oss.service.IOSSFileService;
|
||||||
import com.jero.modules.system.volid.group.UpdateGroup;
|
import com.jero.modules.system.volid.group.UpdateGroup;
|
||||||
@@ -280,4 +282,16 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
|
|||||||
return Result.OK("上传会议纪要成功!");
|
return Result.OK("上传会议纪要成功!");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 发布
|
||||||
|
*/
|
||||||
|
@AutoLog("发布")
|
||||||
|
@RequiresPermissions("standardsMeeting:release")
|
||||||
|
@ApiOperation(value = "发布")
|
||||||
|
@PostMapping(value = "/release")
|
||||||
|
public Result<?> release(@RequestBody PublishReminderVO publishReminderVO) {
|
||||||
|
payMeetingService.release(publishReminderVO);
|
||||||
|
return Result.OK();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -262,6 +262,11 @@ public class PayMeeting implements Serializable {
|
|||||||
@Dict(dicCode = "yn")
|
@Dict(dicCode = "yn")
|
||||||
private Integer remind;
|
private Integer remind;
|
||||||
|
|
||||||
|
/**发布状态*/
|
||||||
|
@ApiModelProperty(value = "发布状态")
|
||||||
|
@Dict(dicCode = "release")
|
||||||
|
private Integer release;
|
||||||
|
|
||||||
/**收款二维码*/
|
/**收款二维码*/
|
||||||
@ApiModelProperty(value = "收款二维码")
|
@ApiModelProperty(value = "收款二维码")
|
||||||
private String paymentQrCode;
|
private String paymentQrCode;
|
||||||
|
|||||||
+2
@@ -94,4 +94,6 @@ public interface IPayMeetingService extends IService<PayMeeting> {
|
|||||||
PayMeeting getMeetingBySituationId(String situationId);
|
PayMeeting getMeetingBySituationId(String situationId);
|
||||||
|
|
||||||
PayMeeting queryByIdAndTime(String id, Date now);
|
PayMeeting queryByIdAndTime(String id, Date now);
|
||||||
|
|
||||||
|
void release(PublishReminderVO publishReminderVO);
|
||||||
}
|
}
|
||||||
|
|||||||
+10
@@ -342,6 +342,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
|
|||||||
|
|
||||||
TbMemberProject memberProject = getTbMemberProject();
|
TbMemberProject memberProject = getTbMemberProject();
|
||||||
payMeeting.setStandardsId(memberProject.getId());
|
payMeeting.setStandardsId(memberProject.getId());
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case MeetingCommon.INTERNATIONAL_MEETING:
|
case MeetingCommon.INTERNATIONAL_MEETING:
|
||||||
ValidUtil.validate(payMeetingVO, InternationalMeeting.class);
|
ValidUtil.validate(payMeetingVO, InternationalMeeting.class);
|
||||||
@@ -389,6 +390,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
|
|||||||
ValidUtil.validate(hotelContacts, StandardMeeting.class);
|
ValidUtil.validate(hotelContacts, StandardMeeting.class);
|
||||||
}
|
}
|
||||||
BeanUtils.copyProperties(payMeetingVO, payMeeting);
|
BeanUtils.copyProperties(payMeetingVO, payMeeting);
|
||||||
|
payMeeting.setRelease(MeetingCommon.REMIND_0);
|
||||||
return payMeeting;
|
return payMeeting;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1016,4 +1018,12 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
|
|||||||
public PayMeeting queryByIdAndTime(String id, Date now) {
|
public PayMeeting queryByIdAndTime(String id, Date now) {
|
||||||
return baseMapper.queryByIdAndTime(id,now);
|
return baseMapper.queryByIdAndTime(id,now);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void release(PublishReminderVO publishReminderVO) {
|
||||||
|
List<String> meetingIds = publishReminderVO.getMeetingIds();
|
||||||
|
LambdaUpdateWrapper<PayMeeting> wrapper = new LambdaUpdateWrapper<>();
|
||||||
|
wrapper.in(PayMeeting::getId,meetingIds);
|
||||||
|
wrapper.set(PayMeeting::getRelease,MeetingCommon.REMIND_1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -267,6 +267,11 @@ public class PayMeetingVO implements Serializable {
|
|||||||
@ApiModelProperty(value = "是否提醒")
|
@ApiModelProperty(value = "是否提醒")
|
||||||
private Integer remind;
|
private Integer remind;
|
||||||
|
|
||||||
|
/**发布状态*/
|
||||||
|
@ApiModelProperty(value = "发布状态")
|
||||||
|
@Dict(dicCode = "release")
|
||||||
|
private Integer release;
|
||||||
|
|
||||||
/**收款二维码*/
|
/**收款二维码*/
|
||||||
@ApiModelProperty(value = "收款二维码")
|
@ApiModelProperty(value = "收款二维码")
|
||||||
private String paymentQrCode;
|
private String paymentQrCode;
|
||||||
|
|||||||
Reference in New Issue
Block a user