he2802 2 年之前
父节点
当前提交
491115a143

+ 1 - 3
zhongzheng-common/src/main/java/com/zhongzheng/common/type/EncryptHandler.java

@@ -14,9 +14,7 @@ import java.sql.SQLException;
 
 @MappedJdbcTypes(JdbcType.VARCHAR)
 public class EncryptHandler  implements TypeHandler<String> {
-    /**
-     * 线上运行后勿修改,会影响已加密数据解密
-     */
+
     private static final byte[] KEYS = "base20230213zzkj".getBytes(StandardCharsets.UTF_8);
 
     public static final boolean ENCRYPT_STATUS = true; //是否开启字段加密

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsAttachedVo.java

@@ -88,4 +88,8 @@ public class GoodsAttachedVo {
 	private String externalLink;
 	@ApiModelProperty("是否外链商品:0否 1是")
 	private Integer externalLinkStatus;
+	/** 开启模拟考 1启动(考试类型才能启动) 0关闭 */
+	@Excel(name = "开启模拟考 1启动(考试类型才能启动) 0关闭")
+	@ApiModelProperty("开启模拟考 1启动(考试类型才能启动) 0关闭")
+	private Integer simulateStatus;
 }

+ 11 - 1
zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsAttachedMapper.xml

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="paperName" column="paper_name"/>
 		<result property="externalLink" column="external_link"/>
 		<result property="externalLinkStatus" column="external_link_status"/>
+		<result property="simulateStatus" column="simulate_status"/>
     </resultMap>
 
     <select id="getList" parameterType="com.zhongzheng.modules.goods.bo.GoodsAttachedQueryBo" resultMap="GoodsAttachedResultVo">
@@ -55,6 +56,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			WHEN ga.type = 3 THEN
 			e.do_type
 			END do_type,
+			CASE
+
+			WHEN ga.type = 1 THEN
+			-1
+			WHEN ga.type = 2 THEN
+			-1
+			WHEN ga.type = 3 THEN
+			e.simulate_status
+			END simulate_status,
 			CASE
 
 				WHEN ga.type = 1 THEN
@@ -357,7 +367,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		WHERE
 			ga.goods_id = #{goodsId} AND ga.type = 3
 	</select>
-	
+
 	<delete id="deleteByIdTenant" parameterType="map">
 		delete from goods_attached where goods_id = #{newGoodsId} and tenant_id = #{newTenantId}
 	</delete>