diff --git a/db/23年10月23日变更.sql b/db/23年10月23日变更.sql new file mode 100644 index 00000000..4992857c --- /dev/null +++ b/db/23年10月23日变更.sql @@ -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 '选择课题'; \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java index 51fa73f0..f3db9790 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java @@ -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; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 1e510d62..ed05143a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -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