fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -56,6 +56,7 @@ import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.domain.UserStudyRecordPhoto;
 import com.zhongzheng.modules.user.mapper.UserStudyRecordPhotoMapper;
 import com.zhongzheng.modules.user.service.IUserBankRecordService;
+import com.zhongzheng.modules.user.service.IUserService;
 import com.zhongzheng.modules.user.service.IUserStudyRecordPhotoService;
 import com.zhongzheng.modules.user.service.IUserStudyRecordService;
 import com.zhongzheng.modules.user.vo.*;
@@ -140,6 +141,8 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     @Autowired
     private ICourseEducationTypeService iCourseEducationTypeService;
 
+    @Autowired
+    private IUserService iUserService;
 
     @Value("${aliyun.oss.endpoint}")
     private String ALIYUN_OSS_ENDPOINT;
@@ -801,8 +804,8 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             subjectStudyRecordQueryBo.setGoodsId(classPeriodStudentVo.getGoodsId());
             subjectStudyRecordQueryBo.setUserId(classPeriodStudentVo.getUserId());
             subjectStudyRecordQueryBo.setGradeId(bo.getGradeId());
-
-            if (Validator.isNotEmpty(bo.getUserPhoto()) && bo.getUserPhoto() == 1) {
+            User user = iUserService.getOne(new LambdaQueryWrapper<User>().eq(User::getUserId, classPeriodStudentVo.getUserId()));
+            /*if (Validator.isNotEmpty(bo.getUserPhoto()) && bo.getUserPhoto() == 1) {
                 //解析身份证和一寸照
                 if (Validator.isNotEmpty(classPeriodStudentVo.getKeyValue())) {
                     JSONObject keyJSON = null;
@@ -833,6 +836,18 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                         e.printStackTrace();
                     }
                 }
+            }*/
+            if(Validator.isNotEmpty(user.getOneInchPhotos())){
+                classPeriodStudentVo.setOneInchPhotos(ALIYUN_OSS_ENDPOINT + "/" + user.getOneInchPhotos());
+                classPeriodStudentVo.setOneInchPhotosOss(user.getOneInchPhotos());
+            }
+            if(Validator.isNotEmpty(user.getIdCardImg1())){
+                classPeriodStudentVo.setIdCardImg1(ALIYUN_OSS_ENDPOINT + "/" + user.getIdCardImg1());
+                classPeriodStudentVo.setIdCardImg1Oss(user.getIdCardImg1());
+            }
+            if(Validator.isNotEmpty(user.getIdCardImg2())){
+                classPeriodStudentVo.setIdCardImg2(ALIYUN_OSS_ENDPOINT + "/" + user.getIdCardImg2());
+                classPeriodStudentVo.setIdCardImg2Oss(user.getIdCardImg2());
             }
             ClassPeriodStudentExportVo addItem = BeanUtil.toBean(classPeriodStudentVo, ClassPeriodStudentExportVo.class);
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodStudentExportVo.java

@@ -46,6 +46,8 @@ public class ClassPeriodStudentExportVo {
 	@Excel(name = "身份证人像照")
 	@ApiModelProperty("身份证人像照")
 	private String idCardImg1;
+	@ApiModelProperty("国徽")
+	private String idCardImg2;
 	/** 商品ID */
 	@Excel(name = "商品名称")
 	@ApiModelProperty("商品名称")