fix 模板编辑

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/ProfileTpEditBo.java

@@ -1,5 +1,7 @@
 package com.zhongzheng.modules.base.bo;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -53,6 +55,7 @@ public class ProfileTpEditBo {
     private String keyValue2;
     /** 商品id拼接，多个,拼接 */
     @ApiModelProperty("商品id拼接，多个,拼接")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String goodsIds;
 
 }

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

@@ -289,4 +289,6 @@ public class GoodsUserVo {
 	private Integer periodStatus;
 	@ApiModelProperty("订单商品ID")
 	private Long orderGoodsId;
+	@ApiModelProperty("资料审核状态  1通过 3不通过 2待审")
+	private Long profileStatus;
 }

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

@@ -5,6 +5,11 @@ 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.domain.UserBankRecord;
+import com.zhongzheng.modules.user.mapper.UserBankQuestionRecordMapper;
+import com.zhongzheng.modules.user.service.IUserBankRecordService;
+import com.zhongzheng.modules.user.vo.UserBankRecordVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -32,6 +37,9 @@ import java.util.stream.Collectors;
 @Service
 public class UserStudyRecordPhotoServiceImpl extends ServiceImpl<UserStudyRecordPhotoMapper, UserStudyRecordPhoto> implements IUserStudyRecordPhotoService {
 
+    @Autowired
+    private IUserBankRecordService iUserBankRecordService;
+
     @Override
     public UserStudyRecordPhotoVo queryById(Long id){
         UserStudyRecordPhoto db = this.baseMapper.selectById(id);
@@ -69,6 +77,10 @@ public class UserStudyRecordPhotoServiceImpl extends ServiceImpl<UserStudyRecord
 
     @Override
     public Boolean insertByAddBo(UserStudyRecordPhotoAddBo bo) {
+        UserBankRecordVo userBankRecord = iUserBankRecordService.queryById(bo.getRecordId());
+        if(Validator.isEmpty(userBankRecord)){
+            throw new CustomException("记录ID数据错误");
+        }
         if(Validator.isEmpty(bo.getRecordId())||Validator.isEmpty(bo.getPhoto())){
             throw new CustomException("拍照数据错误");
         }

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

@@ -170,6 +170,7 @@
         <result property="beforeName" column="before_name"/>
         <result property="courseNum" column="course_num"/>
         <result property="orderGoodsId" column="order_goods_id"/>
+        <result property="profileStatus" column="profile_status"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassGradeVo" id="ClassGradeVoResult">
@@ -447,7 +448,8 @@
         (case WHEN (SELECT COUNT(1) FROM exam_apply_goods eag LEFT JOIN exam_apply ea on eag.apply_id = ea.apply_id where eag.goods_id = g.goods_id and ea.`status` = 1 and unix_timestamp(now()) BETWEEN ea.apply_start_time and ea.apply_end_time) >0 then 1 ELSE 0 end) as apply_status,
         (case WHEN (SELECT COUNT(1) FROM exam_before_goods ebg LEFT JOIN exam_before eb on ebg.before_id = eb.before_id where ebg.goods_id = g.goods_id and eb.`status` = 1 and unix_timestamp(now()) BETWEEN eb.before_start_time and eb.before_end_time) >0 then 1 ELSE 0 end) as before_status,
         (SELECT ea.apply_name FROM exam_apply_goods eag LEFT JOIN exam_apply ea on eag.apply_id = ea.apply_id where eag.goods_id = g.goods_id and ea.`status` = 1 and unix_timestamp(now()) BETWEEN ea.apply_start_time and ea.apply_end_time) as apply_name,
-        (SELECT eb.before_name FROM exam_before_goods ebg LEFT JOIN exam_before eb on ebg.before_id = eb.before_id where ebg.goods_id = g.goods_id and eb.`status` = 1 and unix_timestamp(now()) BETWEEN eb.before_start_time and eb.before_end_time) as before_name
+        (SELECT eb.before_name FROM exam_before_goods ebg LEFT JOIN exam_before eb on ebg.before_id = eb.before_id where ebg.goods_id = g.goods_id and eb.`status` = 1 and unix_timestamp(now()) BETWEEN eb.before_start_time and eb.before_end_time) as before_name,
+        (SELECT `status` from user_profile where user_id = o.user_id and goods_id = g.goods_id and current_status = 1 and type_status = 1 limit 1 ) as profile_status
         FROM
         `order` o
         LEFT JOIN order_goods og ON og.order_sn = o.order_sn