diff --git a/intc-modules/intc-collect/src/main/java/com/intc/collect/domain/CommemorativeCoin.java b/intc-modules/intc-collect/src/main/java/com/intc/collect/domain/CommemorativeCoin.java
index 953e679..07415e3 100644
--- a/intc-modules/intc-collect/src/main/java/com/intc/collect/domain/CommemorativeCoin.java
+++ b/intc-modules/intc-collect/src/main/java/com/intc/collect/domain/CommemorativeCoin.java
@@ -67,6 +67,34 @@ public class CommemorativeCoin extends BaseEntity
@Excel(name = "系列")
private String series;
+ /** 系列 */
+ @NotNull(message="发行量")
+ @Excel(name = "发行量")
+ private String mintage;
+
+ /** 材质 */
+ private String composition;
+
+ /** 重量 */
+ @ApiModelProperty(value="重量")
+ @Excel(name = "重量")
+ private String weight;
+
+ /** 规格尺寸 */
+ @ApiModelProperty(value="规格尺寸")
+ @Excel(name = "规格尺寸")
+ private String dimension;
+
+ /** 厚度 */
+ @ApiModelProperty(value="厚度")
+ @Excel(name = "厚度")
+ private String thickness;
+
+ /** 币齿 */
+ @ApiModelProperty(value="币齿")
+ @Excel(name = "币齿")
+ private String coinTeeth;
+
/** 套装编号 */
private String setNumber;
@@ -103,6 +131,12 @@ public class CommemorativeCoin extends BaseEntity
.append("delFlag", getDelFlag())
.append("remark", getRemark())
.append("collectFileList", getCollectFileList())
+ .append("mintage", getMintage())
+ .append("composition", getComposition())
+ .append("weight", getWeight())
+ .append("dimension", getDimension())
+ .append("thickness", getThickness())
+ .append("coinTeeth", getCoinTeeth())
.toString();
}
}
diff --git a/intc-modules/intc-collect/src/main/java/com/intc/collect/domain/dto/CommemorativeCoinDto.java b/intc-modules/intc-collect/src/main/java/com/intc/collect/domain/dto/CommemorativeCoinDto.java
index 4328e24..ea47f3e 100644
--- a/intc-modules/intc-collect/src/main/java/com/intc/collect/domain/dto/CommemorativeCoinDto.java
+++ b/intc-modules/intc-collect/src/main/java/com/intc/collect/domain/dto/CommemorativeCoinDto.java
@@ -28,7 +28,7 @@ public class CommemorativeCoinDto implements Serializable
/** 简称 */
@ApiModelProperty(value="简称")
- private String shortName;
+ private String name;
/** 发行时间 */
@ApiModelProperty(value="发行时间")
@@ -51,4 +51,14 @@ public class CommemorativeCoinDto implements Serializable
@ApiModelProperty(value="形状")
private String shape;
+ /** 开始时间 */
+ @ApiModelProperty(value="开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
+
+ /** 结束时间 */
+ @ApiModelProperty(value="结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+
}
diff --git a/intc-modules/intc-collect/src/main/resources/mapper/collect/CommemorativeCoinMapper.xml b/intc-modules/intc-collect/src/main/resources/mapper/collect/CommemorativeCoinMapper.xml
index 4af37f9..0162de3 100644
--- a/intc-modules/intc-collect/src/main/resources/mapper/collect/CommemorativeCoinMapper.xml
+++ b/intc-modules/intc-collect/src/main/resources/mapper/collect/CommemorativeCoinMapper.xml
@@ -22,6 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
+
+
+
@@ -29,20 +35,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
- select a.id, a.type, a.full_name, a.short_name, a.face_value, a.issue_date,
+ select a.id, a.type, a.full_name, a.short_name, a.face_value, a.issue_date,a.mintage,a.composition,
a.issue_year, a.series, a.set_number, a.block_type, a.shape, a.create_by,
a.create_time, a.update_by, a.update_time, a.del_flag, a.remark,
+ a.weight, a.dimension, a.thickness, a.coin_teeth,
b.id as sub_id, b.collect_id as sub_collect_id, b.catelog as sub_catelog, b.file_name as sub_file_name,
b.name as sub_name, b.create_by as sub_create_by, b.create_time as sub_create_time, b.url as sub_url
from col_commemorative_coin a
@@ -56,12 +63,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.del_flag='0'
and a.type = #{type}
and a.full_name like '%'|| #{fullName}||'%'
- and a.short_name like '%'|| #{shortName}||'%'
+ and (a.short_name like '%'|| #{name}||'%' or a.full_name like '%'|| #{name}||'%')
and a.issue_date = #{issueDate}
- and a.issue_year = #{issueYear}
+ and a.issue_year like '%'|| #{issueYear}||'%'
and a.series = #{series}
and a.block_type = #{blockType}
and a.shape = #{shape}
+
+ and #{endTime}>=to_char(a.issue_date, 'yyyy-MM-dd')
+
+
+ and to_char(a.issue_date, 'yyyy-MM-dd')>=#{startTime}
+
order by a.issue_date desc
@@ -91,6 +104,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_time,
del_flag,
remark,
+ mintage,
+ composition,
+ weight,
+ dimension,
+ thickness,
+ coin_teeth,
#{id},
@@ -110,6 +129,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{updateTime},
#{delFlag},
#{remark},
+ #{mintage},
+ #{composition},
+ #{weight},
+ #{dimension},
+ #{thickness},
+ #{coinTeeth},
@@ -132,6 +157,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_time = #{updateTime},
del_flag = #{delFlag},
remark = #{remark},
+ mintage = #{mintage},
+ composition = #{composition},
+ weight = #{weight},
+ dimension = #{dimension},
+ thickness = #{thickness},
+ coin_teeth = #{coinTeeth},
where id = #{id}