fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/vo/ExamNumberGoodsVo.java

@@ -54,4 +54,11 @@ public class ExamNumberGoodsVo {
 	@Excel(name = "1可选 0不可选")
 	@ApiModelProperty("1可选 0不可选")
 	private Integer goodsStatus;
+
+	private Long validityStartTime;
+
+	private Long validityEndTime;
+
+	@ApiModelProperty("状态 1有效 0无效")
+	private Integer status;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodStudentVo.java

@@ -178,11 +178,5 @@ public class ClassPeriodStudentVo {
 
 	private Long classEndTime;
 
-	private Long validityStartTime;
 
-	private Long validityEndTime;
-	@ApiModelProperty("1上架 0未上架")
-	private Integer goodsStatus;
-	@ApiModelProperty("状态 1有效 0无效")
-	private Integer goodsStatus1;
 }

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -107,6 +107,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="code" column="code"/>
         <result property="standPrice" column="stand_price"/>
         <result property="goodsStatus" column="goods_status"/>
+        <result property="validityStartTime" column="validity_start_time"/>
+        <result property="validityEndTime" column="validity_end_time"/>
+        <result property="goodsStatus" column="goods_status"/>
+        <result property="status" column="status"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.goods.bo.GoodsQueryBo" resultMap="GoodsResultVo">
@@ -249,6 +253,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         goods_id,
         goods_name,
+        validity_start_time,
+        validity_end_time,
+        goods_status,
+        status,
         CODE,
         stand_price,
         <if test="filtration != null and filtration == 1">
@@ -275,9 +283,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="goodsType != null and goodsType != ''">
             and g.goods_type = #{goodsType}
         </if>
-          <if test="goodsStatus != null and goodsStatus != ''">
+        <if test="goodsStatus != null and goodsStatus != ''">
             and g.goods_status = #{goodsStatus}
         </if>
+        <if test="searchKey != null and searchKey != ''">
+            and (g.goods_name like concat('%', #{searchKey}, '%') or g.code like concat('%', #{searchKey}, '%'))
+        </if>
         order by g.create_time desc
     </select>
 

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -83,10 +83,6 @@
         <result property="classStartTime" column="class_start_time"/>
         <result property="classEndTime" column="class_end_time"/>
 
-        <result property="validityStartTime" column="validity_start_time"/>
-        <result property="validityEndTime" column="validity_end_time"/>
-        <result property="goodsStatus" column="goods_status"/>
-        <result property="goodsStatus1" column="goods_status1"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassPeriodUserVo" id="ClassPeriodUserVo">
@@ -265,10 +261,6 @@
         g.study_start_time as study_start_time,
         g.study_end_time as study_end_time,
         g.goods_name,
-        g.validity_start_time,
-        g.validity_end_time,
-        g.goods_status,
-        g.status as goods_status1,
         g.code as goods_code,
         g.stand_price,
         cgu.period_status,