renqianlong 1 år sedan
förälder
incheckning
2d2b155e17

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -874,7 +874,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         for (ClassGradeStudentVo classGradeStudentVo : classGradeStudentVos) {
             Long secLong = 0L;
             Long studyLong = 0L;
-
+                
             SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();
             subjectStudyRecordQueryBo.setGoodsId(classGradeStudentVo.getGoodsId());
             subjectStudyRecordQueryBo.setUserId(classGradeStudentVo.getUserId());

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/CompanyOrderBusinessConfigGoodsVo.java

@@ -59,6 +59,8 @@ public class CompanyOrderBusinessConfigGoodsVo {
 	private Long businessId;
 	@ApiModelProperty("教育类型名称")
 	private String educationName;
+	@ApiModelProperty("教育类型id")
+	private Long educationTypeId;
 	@ApiModelProperty("项目名称")
 	private String projectName;
 	/** 配置名称 */

+ 2 - 0
zhongzheng-system/src/main/resources/mapper/modules/order/OrderBusinessConfigGoodsMapper.xml

@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="configName" column="config_name"/>
         <result property="mainImg" column="main_img"/>
         <result property="businessId" column="businessId"/>
+        <result property="educationTypeId" column="educationTypeId"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.goods.vo.GoodsConfigVo" id="GoodsResultVo">
@@ -212,6 +213,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         obc.main_img,
         any_value ( obc.config_name ) config_name,
         group_concat( bcg.goods_ids ) goods_ids,
+        cet.id AS educationTypeId,
         cet.education_name,
         cb.business_name,
         cb.id AS businessId,