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
2023-10-23 14:29:03 +08:00
parent 2af1b1714c
commit afa8070b5d
5 changed files with 71 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/23年10月23日变更.sql
+7
View File
@@ -0,0 +1,7 @@
alter table pay_meeting
add is_wasic tinyint null comment '是否WASIC',
add link_topics varchar(50) null comment '关联课题',
add meeting_costs_two_topic decimal(12, 2) null comment '会议费用（2个课题）',
add meeting_costs_three_topic decimal(12, 2) null comment '会议费用（3个及以上）';
alter table pay_meeting_situation
add choice_topic varchar(50) null comment '选择课题';
jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
+21
View File
@@ -11,10 +11,13 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jero.common.util.PasswordUtil;
import com.jero.meeting.valid.group.InternationalMeeting;
import com.jero.meeting.valid.group.InternationalMeetingWasic;
import com.jero.meeting.valid.group.StandardMeeting;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.validator.constraints.Range;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import com.jero.common.aspect.annotation.Dict;
@@ -23,6 +26,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.DecimalMax;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
@@ -204,6 +208,11 @@ public class PayMeeting implements Serializable {
@Size(max = 50, message = "参展商邀请码最多为50个字符")
private java.lang.String exhibitorInvitationCode;
/**是否WASIC*/
@Excel(name = "是否WASIC", width = 15, dicCode = "yn")
@ApiModelProperty(value = "是否WASIC")
private Integer isWasic;
/**会议费用*/
@Excel(name = "会议费用", width = 15)
@ApiModelProperty(value = "会议费用")
@@ -216,6 +225,18 @@ public class PayMeeting implements Serializable {
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal meetingCostsVip;
/**会议费用（2个课题）*/
@Excel(name = "会议费用（2个课题）", width = 15)
@ApiModelProperty(value = "会议费用（2个课题）")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal meetingCostsTwoTopic;
/**会议费用（3个及以上）*/
@Excel(name = "会议费用（3个及以上）", width = 15)
@ApiModelProperty(value = "会议费用（3个及以上）")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal meetingCostsThreeTopic;
/**会议负责人id*/
@ApiModelProperty(value = "会议负责人id")
private String directorId;
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+10 -4
View File
@@ -40,10 +40,7 @@ import com.jero.meeting.mapper.PayMeetingContactsMapper;
import com.jero.meeting.mapper.PayMeetingGuestsFileMapper;
import com.jero.meeting.mapper.PayMeetingMapper;
import com.jero.meeting.service.*;
import com.jero.meeting.valid.group.CaseCommitteeMeeting;
import com.jero.meeting.valid.group.CouncilMeeting;
import com.jero.meeting.valid.group.InternationalMeeting;
import com.jero.meeting.valid.group.WorkingGroupMeeting;
import com.jero.meeting.valid.group.*;
import com.jero.meeting.vo.PayMeetingVO;
import com.jero.meeting.vo.PublishReminderVO;
import com.jero.meeting.vo.UploadFileVO;
@@ -52,6 +49,7 @@ import com.jero.member.entity.TbMemberProject;
import com.jero.member.service.ITbMemberProjectService;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import com.jero.project.common.PayProjectCommon;
import com.jero.project.entity.PayWorkingGroup;
import com.jero.project.entity.PayWorkingGroupSubItemContacts;
import com.jero.project.service.IPayWorkingGroupService;
@@ -62,6 +60,7 @@ import com.jero.standards.xuanguan.stablecrosstraining.service.IStableCrossTrain
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.util.CollectionUtils;
import org.hibernate.type.YesNoType;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.BeanUtils;
import org.springframework.core.env.Environment;
@@ -80,6 +79,8 @@ import javax.servlet.http.HttpServletRequest;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import static com.jero.project.common.PayProjectCommon.NO;
/**
* @Description: 会议管理
* @Author: jero-boot
@@ -534,6 +535,11 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
throw new JeroBootException("邀请码不能重复");
}
}
//判断金额
Integer isWasic = payMeetingVO.getIsWasic();
if (PayProjectCommon.YES.equals(isWasic)){
ValidUtil.validate(payMeetingVO, InternationalMeetingWasic.class);
}
break;
case MeetingCommon.COMMITTEE_MEETING:
ValidUtil.validate(payMeetingVO, CaseCommitteeMeeting.class);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/valid/group/InternationalMeetingWasic.java
+9
View File
@@ -0,0 +1,9 @@
package com.jero.meeting.valid.group;
/**
* 国际研讨会
* @author liJiaRao
* @date 2021-09-03 11:22
*/
public @interface InternationalMeetingWasic {
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
+24
View File
@@ -15,6 +15,7 @@ import com.jero.modules.system.volid.group.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Range;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecgframework.poi.excel.annotation.ExcelCollection;
import org.springframework.format.annotation.DateTimeFormat;
@@ -203,6 +204,13 @@ public class PayMeetingVO implements Serializable {
@Size(max = 50, message = "参展商邀请码最多为50个字符",groups = InternationalMeeting.class)
private java.lang.String exhibitorInvitationCode;
/**是否WASIC*/
@Excel(name = "是否WASIC", width = 15, dicCode = "yn")
@ApiModelProperty(value = "是否WASIC")
@NotNull(message = "是否WASIC不能为空",groups = InternationalMeeting.class)
@Range(min = 1, max = 2,message = "是否WASIC格式不正确",groups = InternationalMeeting.class)
private Integer isWasic;
/**会议费用*/
@Excel(name = "会议费用", width = 15)
@ApiModelProperty(value = "会议费用")
@@ -219,6 +227,22 @@ public class PayMeetingVO implements Serializable {
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal meetingCostsVip;
/**会议费用（2个课题）*/
@Excel(name = "会议费用（2个课题）", width = 15)
@ApiModelProperty(value = "会议费用（2个课题）")
@NotNull(message = "会议费用（2个课题）不能为空",groups = InternationalMeetingWasic.class)
@DecimalMax(value = "9999999999.99",message = "会议费用（2个课题）格式错误",groups = InternationalMeetingWasic.class)
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal meetingCostsTwoTopic;
/**会议费用（3个及以上）*/
@Excel(name = "会议费用（3个及以上）", width = 15)
@ApiModelProperty(value = "会议费用（3个及以上）")
@NotNull(message = "会议费用（3个及以上）不能为空",groups = InternationalMeetingWasic.class)
@DecimalMax(value = "9999999999.99",message = "会议费用（3个及以上）格式错误",groups = InternationalMeetingWasic.class)
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal meetingCostsThreeTopic;
/**会议负责人id*/
@ApiModelProperty(value = "会议负责人id")
@NotBlank(message = "会议负责人不能为空")