he2802 3 éve
szülő
commit
c83ffd0c7c

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

@@ -61,4 +61,7 @@ public class ExamNumberGoodsVo {
 
 	@ApiModelProperty("状态 1有效 0无效")
 	private Integer status;
+
+	@ApiModelProperty("1可选 0不可选")
+	private Integer selectStatus;
 }

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

@@ -111,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="validityEndTime" column="validity_end_time"/>
         <result property="goodsStatus" column="goods_status"/>
         <result property="status" column="status"/>
+        <result property="selectStatus" column="select_status"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.goods.bo.GoodsQueryBo" resultMap="GoodsResultVo">
@@ -260,10 +261,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         CODE,
         stand_price,
         <if test="filtration != null and filtration == 1">
-            (case WHEN (SELECT COUNT(gs.goods_id) FROM goods gs where 1=1 and gs.make_goods_id = g.goods_id and gs.status =1 and gs.goods_type =4) >0 then 0 ELSE 1 end) as goods_status
+            (case WHEN (SELECT COUNT(gs.goods_id) FROM goods gs where 1=1 and gs.make_goods_id = g.goods_id and gs.status =1 and gs.goods_type =4) >0 then 0 ELSE 1 end) as select_status
         </if>
         <if test="filtration != null and filtration == 2">
-        (case WHEN (SELECT COUNT(gs.goods_id) FROM goods gs where 1=1 and gs.make_goods_id = g.goods_id and gs.status =1 and gs.goods_type =3) >0 then 0 ELSE 1 end) as goods_status
+        (case WHEN (SELECT COUNT(gs.goods_id) FROM goods gs where 1=1 and gs.make_goods_id = g.goods_id and gs.status =1 and gs.goods_type =3) >0 then 0 ELSE 1 end) as select_status
         </if>
         FROM
         goods g