fix 批量班级

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java

@@ -70,6 +70,18 @@ public class ClassGradeController extends BaseController {
 
     private final RedisCache redisCache;
 
+    /**
+     * 查询班级列表
+     */
+    @ApiOperation("批量查询班级列表")
+    @PreAuthorize("@ss.hasPermi('grade:grade:list')")
+    @GetMapping("/listBatch")
+    public TableDataInfo<ClassGradeVo> listBatch(ClassGradeQueryBo bo) {
+        startPage();
+        List<ClassGradeVo> list = iClassGradeService.queryList(bo);
+        return getDataTable(list);
+    }
+
     /**
      * 查询班级列表
      */

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsPeriodVo.java

@@ -143,4 +143,12 @@ public class GoodsPeriodVo {
 	private Long interfacePushId;
 	@ApiModelProperty("官方信息推送状态 1是 0否")
 	private Long officialStatus;
+	@ApiModelProperty("业务层次ID")
+	private Long businessId;
+	@ApiModelProperty("教育名称")
+	private String educationName;
+	@ApiModelProperty("项目名称")
+	private String projectName;
+	@ApiModelProperty("业务层次名称")
+	private String businessName;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserConfirmInfoServiceImpl.java

@@ -1,7 +1,9 @@
 package com.zhongzheng.modules.user.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.user.bo.UserConfirmInfoAddBo;
 import com.zhongzheng.modules.user.bo.UserConfirmInfoEditBo;
@@ -78,6 +80,11 @@ public class UserConfirmInfoServiceImpl extends ServiceImpl<UserConfirmInfoMappe
     @Override
     public Boolean insertByAddBo(UserConfirmInfoAddBo bo) {
         UserConfirmInfo add = BeanUtil.toBean(bo, UserConfirmInfo.class);
+        UserConfirmInfoQueryBo queryBo = BeanUtil.toBean(bo, UserConfirmInfoQueryBo.class);
+        UserConfirmInfo info = queryByBo(queryBo);
+        if(Validator.isNotEmpty(info)){
+            throw new CustomException("你已确认过了");
+        }
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -114,6 +114,10 @@
         <result property="learningTimeStart" column="learning_time_start"/>
         <result property="interfacePushId" column="interface_push_id"/>
         <result property="officialStatus" column="official_status"/>
+        <result property="businessId" column="business_id"/>
+        <result property="educationName" column="education_name"/>
+        <result property="projectName" column="project_name"/>
+        <result property="businessName" column="business_name"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.goods.vo.GoodsPeriodStatusVo" id="GoodsPeriodStatusVo">
@@ -414,13 +418,18 @@
             cgu.official_status,
             cg.learning_time_start,
             cg.class_status,
-            cg.interface_push_id
+            cg.interface_push_id,
+            cb.business_name,
+            g.business_id
         FROM
             class_grade_user cgu
                 LEFT JOIN class_grade_goods cgg ON cgu.grade_id = cgg.grade_id
                 LEFT JOIN class_grade cg on cg.grade_id = cgu.grade_id
                 LEFT JOIN goods g on g.goods_id=cgg.goods_id
                 LEFT JOIN order_goods og on cgu.order_goods_id = og.order_goods_id
+                LEFT JOIN course_education_type cet ON g.education_type_id = cet.id
+                LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
+                LEFT JOIN course_business cb ON g.business_id = cb.id
 
         WHERE
             cgu.user_id =#{userId}