fix 学时照片

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

@@ -57,6 +57,7 @@ import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.domain.UserPlan;
 import com.zhongzheng.modules.user.domain.UserStudyRecordPhoto;
 import com.zhongzheng.modules.user.mapper.UserMapper;
+import com.zhongzheng.modules.user.mapper.UserStudyRecordPhotoMapper;
 import com.zhongzheng.modules.user.service.IUserStudyRecordPhotoService;
 import com.zhongzheng.modules.user.service.IUserStudyRecordService;
 import com.zhongzheng.modules.user.vo.SubjectStudyRecordVo;
@@ -124,7 +125,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     private RedisCache redisCache;
 
     @Autowired
-    private UserMapper userMapper;
+    private UserStudyRecordPhotoMapper userStudyRecordPhotoMapper;
 
     @Autowired
     private IStudyCountLogService iStudyCountLogService;
@@ -1000,7 +1001,11 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 //查找开始学习时间
                 classPeriodStudentVo.setStartTime(baseMapper.selectStart(classPeriodStudentVo.getUserId(), classPeriodStudentVo.getGoodsId(), classPeriodStudentVo.getGradeId()).get(0));
             }
-
+            //取学时所有拍照最新的一张
+            String recentPhoto = userStudyRecordPhotoMapper.selectGradeRecentOnePhoto(classPeriodStudentVo.getUserId(),classPeriodStudentVo.getGradeId());
+            if(Validator.isNotEmpty(recentPhoto)){
+                classPeriodStudentVo.setIdCardImg1(recentPhoto);
+            }
             if (Validator.isNotEmpty(bo.getUserPhoto()) && bo.getUserPhoto() == 1) {
                 //解析身份证和一寸照
                 if (Validator.isNotEmpty(classPeriodStudentVo.getKeyValue())) {
@@ -1013,12 +1018,12 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                             String recent_photos = recent_photos_jsondata.getString("value");
                             classPeriodStudentVo.setOneInchPhotos(recent_photos);
                         }
-                        if (keyJSON.containsKey("idcard_face_photo")) {
+                       /* if (keyJSON.containsKey("idcard_face_photo")) {
                             String idcard_face_photo_data = keyJSON.getString("idcard_face_photo");
                             JSONObject idcard_face_photo_jsondata = JSON.parseObject(idcard_face_photo_data);
                             String idcard_face_photo = idcard_face_photo_jsondata.getString("value");
                             classPeriodStudentVo.setIdCardImg1(idcard_face_photo);
-                        }
+                        }*/
                         classPeriodStudentVo.setKeyValue(null);
                     } catch (Exception e) {
                         e.printStackTrace();

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserStudyRecordPhotoMapper.java

@@ -14,4 +14,6 @@ import java.util.List;
  */
 public interface UserStudyRecordPhotoMapper extends BaseMapper<UserStudyRecordPhoto> {
     List<String> selectGradePhoto(@Param("userId") Long userId,@Param("gradeId") Long gradeId);
+
+    String selectGradeRecentOnePhoto(@Param("userId") Long userId,@Param("gradeId") Long gradeId);
 }

zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordPhotoMapper.xml

@@ -28,4 +28,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND up.grade_id = #{gradeId}
           AND rp.photo IS NOT NULL
     </select>
+
+    <select id="selectGradeRecentOnePhoto" parameterType="map" resultType="string">
+        SELECT
+            rp.photo
+        FROM
+            user_period up
+                LEFT JOIN user_period_status ups ON up.id = ups.period_id
+                LEFT JOIN user_study_record_photo rp ON ups.id = rp.period_id
+        WHERE
+            up.grade_id = #{gradeId}
+          AND up.user_id = #{userId}
+          AND rp.photo IS NOT NULL
+        ORDER BY
+            rp.id DESC
+            LIMIT 1
+    </select>
 </mapper>