Commit 0d080bd4 authored by liwei's avatar liwei

Merge remote-tracking branch 'origin/master'

parents 28cc683e c646f8cc
...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName; ...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data; import lombok.Data;
import org.junit.jupiter.params.shadow.com.univocity.parsers.annotations.Format;
import org.rcisoft.core.entity.CyIdIncreEntity; import org.rcisoft.core.entity.CyIdIncreEntity;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
...@@ -98,7 +99,7 @@ public class CmsActivity extends CyIdIncreEntity<CmsActivity> { ...@@ -98,7 +99,7 @@ public class CmsActivity extends CyIdIncreEntity<CmsActivity> {
* @column details * @column details
* @default * @default
*/ */
@Excel(name = "内容", orderNum = "11", width = 20) @Excel(name = "内容")
private String details; private String details;
/** /**
...@@ -223,6 +224,7 @@ public class CmsActivity extends CyIdIncreEntity<CmsActivity> { ...@@ -223,6 +224,7 @@ public class CmsActivity extends CyIdIncreEntity<CmsActivity> {
*/ */
@Excel(name = "开始时间") @Excel(name = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm") @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
private Date startTime; private Date startTime;
/** /**
...@@ -231,6 +233,7 @@ public class CmsActivity extends CyIdIncreEntity<CmsActivity> { ...@@ -231,6 +233,7 @@ public class CmsActivity extends CyIdIncreEntity<CmsActivity> {
*/ */
@Excel(name = "结束时间") @Excel(name = "结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm") @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
private Date endTime; private Date endTime;
/* /*
*//** *//**
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
<result column="is_need_member" jdbcType="INTEGER" property="isNeedMember"/> <result column="is_need_member" jdbcType="INTEGER" property="isNeedMember"/>
<result column="start_time" jdbcType="DATE" property="startTime"/> <result column="start_time" jdbcType="DATE" property="startTime"/>
<result column="end_time" jdbcType="DATE" property="endTime"/> <result column="end_time" jdbcType="DATE" property="endTime"/>
<result column="max_application_count" jdbcType="VARCHAR" property="maxApplicationCount"/>
</resultMap> </resultMap>
<!--<cache type="${corePackag!}.util.RedisCache"/>--> <!--<cache type="${corePackag!}.util.RedisCache"/>-->
...@@ -52,7 +53,9 @@ ...@@ -52,7 +53,9 @@
<if test="entity.createDate !=null and entity.createDate != '' "> <if test="entity.createDate !=null and entity.createDate != '' ">
and create_date = #{entity.createDate} and create_date = #{entity.createDate}
</if> </if>
<if test="entity.maxApplicationCount !=null and entity.maxApplicationCount != '' ">
and max_application_count = #{entity.maxApplicationCount}
</if>
<if test="entity.updateBy !=null and entity.updateBy != '' "> <if test="entity.updateBy !=null and entity.updateBy != '' ">
and update_by like concat('%',#{entity.updateBy},'%') and update_by like concat('%',#{entity.updateBy},'%')
</if> </if>
...@@ -69,7 +72,7 @@ ...@@ -69,7 +72,7 @@
and details like concat('%',#{entity.details},'%') and details like concat('%',#{entity.details},'%')
</if> </if>
<if test="entity.weight !=null and entity.weight != '' "> <if test="entity.weight !=null and entity.weight != '' ">
and weight like concat('%',#{entity.weight},'%') and weight = #{entity.weight}
</if> </if>
<if test="entity.applicationFee !=null and entity.applicationFee != '' "> <if test="entity.applicationFee !=null and entity.applicationFee != '' ">
...@@ -98,7 +101,6 @@ ...@@ -98,7 +101,6 @@
ca.del_flag, ca.del_flag,
ca.flag, ca.flag,
ca.title, ca.title,
ca.details,
ca.weight, ca.weight,
ca.picture_id, ca.picture_id,
applicationList.application_count, applicationList.application_count,
...@@ -110,6 +112,7 @@ ...@@ -110,6 +112,7 @@
ca.is_authentication, ca.is_authentication,
ca.start_time, ca.start_time,
ca.end_time, ca.end_time,
ca.max_application_count,
su.nick_name as nickName, su.nick_name as nickName,
oi.path oi.path
FROM cms_activity ca FROM cms_activity ca
...@@ -132,7 +135,7 @@ ...@@ -132,7 +135,7 @@
</if> </if>
<if test="entity.createBy !=null and entity.createBy != '' "> <if test="entity.createBy !=null and entity.createBy != '' ">
and create_by like concat('%',#{entity.createBy},'%') and ca.create_by like concat('%',#{entity.createBy},'%')
</if> </if>
<!-- <if test="entity.beginTime !=null "> <!-- <if test="entity.beginTime !=null ">
and ca.publish_date &gt;= #{entity.beginTime} and ca.publish_date &gt;= #{entity.beginTime}
...@@ -141,37 +144,43 @@ ...@@ -141,37 +144,43 @@
and ca.publish_date &lt;= #{entity.endTime} and ca.publish_date &lt;= #{entity.endTime}
</if>--> </if>-->
<if test="entity.updateBy !=null and entity.updateBy != '' "> <if test="entity.updateBy !=null and entity.updateBy != '' ">
and update_by like concat('%',#{entity.updateBy},'%') and ca.update_by like concat('%',#{entity.updateBy},'%')
</if> </if>
<if test="entity.title !=null and entity.title != '' "> <if test="entity.title !=null and entity.title != '' ">
and title like concat('%',#{entity.title},'%') and ca.title like concat('%',#{entity.title},'%')
</if> </if>
<if test="entity.applicationFee !=null and entity.applicationFee != '' "> <if test="entity.applicationFee !=null and entity.applicationFee != '' ">
and application_fee = #{entity.applicationFee} and ca.application_fee = #{entity.applicationFee}
</if>
<if test="entity.maxApplicationCount !=null and entity.maxApplicationCount != '' ">
and ca.max_application_count = #{entity.maxApplicationCount}
</if> </if>
<if test="entity.pictureId !=null and entity.pictureId != '' "> <if test="entity.pictureId !=null and entity.pictureId != '' ">
and picture_id = #{entity.pictureId} and ca.picture_id = #{entity.pictureId}
</if> </if>
<if test="entity.isApplication !=null and entity.isApplication != '' "> <if test="entity.isApplication !=null and entity.isApplication != '' ">
and is_application = #{entity.isApplication} and ca.is_application = #{entity.isApplication}
</if> </if>
<if test="entity.isAuthentication !=null and entity.isAuthentication != '' "> <if test="entity.isAuthentication !=null and entity.isAuthentication != '' ">
and is_authentication = #{entity.isAuthentication} and ca.is_authentication = #{entity.isAuthentication}
</if> </if>
<if test="entity.isNeedMember !=null and entity.isNeedMember != '' "> <if test="entity.isNeedMember !=null and entity.isNeedMember != '' ">
and is_need_member = #{entity.isNeedMember} and ca.is_need_member = #{entity.isNeedMember}
</if> </if>
<if test="entity.isRecommended !=null and entity.isRecommended != '' "> <if test="entity.isRecommended !=null and entity.isRecommended != '' ">
and is_recommended = #{entity.isRecommended} and ca.is_recommended = #{entity.isRecommended}
</if> </if>
<if test="entity.isTop !=null and entity.isTop != '' "> <if test="entity.isTop !=null and entity.isTop != '' ">
and is_top = #{entity.isTop} and ca.is_top = #{entity.isTop}
</if> </if>
<if test="entity.startTime !=null and entity.startTime != '' "> <if test="entity.startTime !=null and entity.startTime != '' ">
and start_time = #{entity.startTime} and ca.start_time = #{entity.startTime}
</if> </if>
<if test="entity.endTime !=null and entity.endTime != '' "> <if test="entity.endTime !=null and entity.endTime != '' ">
and end_time = #{entity.endTime} and ca.end_time = #{entity.endTime}
</if>
<if test="entity.weight !=null and entity.weight != '' ">
and ca.weight = #{entity.weight}
</if> </if>
ORDER BY ca.publish_date DESC ORDER BY ca.publish_date DESC
</select> </select>
......
...@@ -380,7 +380,7 @@ ...@@ -380,7 +380,7 @@
<select id="getUserPhone" resultType="org.rcisoft.business.memInfo.entity.MemInfo" <select id="getUserPhone" resultType="org.rcisoft.business.memInfo.entity.MemInfo"
parameterType="java.lang.Integer"> parameterType="java.lang.Integer">
select business_id,mem_real_name,mem_phone, mem_idcard select business_id,mem_real_name,mem_phone, mem_idcard
from sys_user from mem_info
where business_id = #{businessId} and del_flag = 0 where business_id = #{businessId} and del_flag = 0
</select> </select>
</mapper> </mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment