Pārlūkot izejas kodu

fix 营销数据

he2802 3 gadi atpakaļ
vecāks
revīzija
010a7a0a5a

+ 3 - 0
zhongzheng-admin/src/main/resources/application.yml

@@ -61,6 +61,9 @@ logging:
 
 # Spring配置
 spring:
+  mvc:
+    async:
+      request-timeout: 30000
   main:
     allow-bean-definition-overriding: true
   # 资源信息

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsQueryBo.java

@@ -145,4 +145,7 @@ GoodsQueryBo extends BaseEntity {
 
 	@ApiModelProperty("被补考的商品")
 	private Long makeGoodsId;
+
+	@ApiModelProperty("获取节数量 1")
+	private Long sectionNum;
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsVo.java

@@ -238,4 +238,6 @@ public class GoodsVo {
 	@ApiModelProperty("课程数量")
 	private Long courseNum;
 
+	@ApiModelProperty("节数量")
+	private Long sectionNum;
 }

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

@@ -96,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="makeGoodsName" column="make_goods_name"/>
         <result property="makeGoodsCode" column="make_goods_code"/>
         <result property="courseNum" column="course_num"/>
+        <result property="sectionNum" column="section_num"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo" id="ExamNumberGoodsVoResult">
@@ -120,6 +121,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ot.type AS template_type,
         (SELECT gs.goods_name FROM goods gs where 1=1 and g.make_goods_id = gs.goods_id) as make_goods_name,
         (SELECT gs.code FROM goods gs where 1=1 and g.make_goods_id = gs.goods_id) as make_goods_code
+        <if test="sectionNum ==1">
+        ,(SELECT COUNT(m.id)+(SELECT COUNT(n.id) FROM course_chapter_section n LEFT JOIN course_module_chapter p on n.chapter_id = p.chapter_id LEFT JOIN course_menu m on m.menu_id = p.module_id LEFT JOIN goods_course gc on gc.course_id = m.course_id  where gc.goods_id =  485 and m.type in(1))+(SELECT COUNT(n.id) FROM course_chapter_section n  LEFT JOIN course_menu m on m.menu_id = n.chapter_id LEFT JOIN goods_course gc on gc.course_id = m.course_id where gc.goods_id =  485 and m.type in(2)) FROM course_menu m LEFT JOIN goods_course gc on gc.course_id = m.course_id  where gc.goods_id =  485  and m.type in(3)) as section_num
+        </if>
         <if test="goodsType ==1">
         , (SELECT count(*) FROM goods_course where goods_id =g.goods_id ) as course_num
         </if>
@@ -132,9 +136,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN school s ON s.id = g.school_id
         LEFT JOIN major m ON g.major_id = m.id
         LEFT JOIN order_input_template ot ON cb.template_status = ot.id
-
-
-
         WHERE
         1 = 1
         <if test="status != null and status.size()!=0 ">