java/Robotaxi.git

			@@ -1,9 +1,10 @@
			package com.xiaopeng.api.model.operation;

			import com.baomidou.mybatisplus.annotation.IdType;
			import com.baomidou.mybatisplus.annotation.TableField;
			import com.baomidou.mybatisplus.annotation.TableId;
			import com.baomidou.mybatisplus.annotation.TableName;
			import com.fasterxml.jackson.annotation.JsonFormat;
			import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
			import com.xiaopeng.common.core.web.domain.BaseModel;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			@@ -13,8 +14,6 @@

			import javax.validation.constraints.Max;
			import javax.validation.constraints.Min;
			import java.math.BigDecimal;
			import java.time.LocalDateTime;
			import java.util.List;

			/**
			@@ -63,8 +62,8 @@
			@ApiModelProperty(value = "miniProgram临近生效分钟数")
			private Integer miniProgramBeforeEffective;
			@ApiModelProperty(value = "屏蔽时间段,时间字符串,开始和结束用,分割拼接成一个字符串，如果只有结束时间还是需要保持逗号,如:[',2007-05-03 05:00:00']")
			@TableField(typeHandler = JacksonTypeHandler.class)
			private List<String> blockTime;


			@ApiModelProperty(value = "miniProgram临近到期toast")
			private Integer toastBeforeExpiry;

			@@ -32,6 +32,9 @@
			@ApiModelProperty(value = "活动名称")
			private String acticityName;

			@ApiModelProperty(value = "活动类型如新人活动、媒体邀约活动、日常提频等")
			private Integer activityType;

			@ApiModelProperty(value = "开始时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private LocalDateTime startTime;

			@@ -7,12 +7,12 @@
			select a.*
			from xp_acticity as a
			where a.is_deleted = 0
			<if test="query.acticity_name != null ">
			a.acticity_name >= #{acticityName}
			</if>
			<if test="query.status != null">
			and a.status = #{query.status}
			</if>
			<!-- <if test="query.acticity_name != null ">-->
			<!-- a.acticity_name >= #{acticityName}-->
			<!-- </if>-->
			<!-- <if test="query.status != null">-->
			<!-- and a.status = #{query.status}-->
			<!-- </if>-->
			<!-- <if test="query.activity_type != null">-->
			<!-- and a.activity_type = #{query.activityType}-->
			<!-- </if>-->

	xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActivityNotice.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-api/src/main/java/com/xiaopeng/api/query/operation/XpActivityPageListQuery.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-operation-boot/src/main/resources/mapper/operation/XpActicityMapper.xml	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史