资料审核

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

@@ -39,6 +39,10 @@ public class UserProfileQueryBo extends BaseEntity {
 	/** 用户ID */
 	@ApiModelProperty("用户ID")
 	private Long userId;
+
+	/** 用户ID */
+	@ApiModelProperty("id")
+	private Long id;
 	/** 商品ID */
 	@ApiModelProperty("商品ID")
 	private Long goodsId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/UserProfileServiceImpl.java

@@ -32,8 +32,10 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
 
     @Override
     public UserProfileVo queryById(Long id){
-        UserProfile db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, UserProfileVo.class);
+        UserProfileQueryBo userProfileQueryBo = new UserProfileQueryBo();
+        userProfileQueryBo.setId(id);
+        UserProfileVo userProfileVo = baseMapper.selectUserProfile(userProfileQueryBo).get(0);
+        return userProfileVo;
     }
 
     @Override

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

@@ -338,6 +338,7 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
     public UserPlanVo listPlan(UserPlanEditBo bo) throws ParseException {
         UserPlanVo userPlanVo = new UserPlanVo();
         List<CalendarStudyVo> clCalendarStudyVos = findDates(bo.getStartTime(),bo.getEndTime());
+        Long secAll = 0L;
         for (Long aLong : bo.getGoodsId()) {
             //最近考试时间七天前到现在的天数，学习视频时长
             Date date1 = new Date(bo.getEndTime() * 1000L);
@@ -353,6 +354,7 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
             }
             //计算每天需要学习多少节课
             int Sec = (int) Math.ceil((double) allNum / dutyDays);
+            secAll+=Sec;
             for (CalendarStudyVo clCalendarStudyVo : clCalendarStudyVos) {
                 for (DayStudyVo dayStudyVo : clCalendarStudyVo.getDayStudyList()) {
                     if (Arrays.asList(bo.getStudyCount()).contains(dayStudyVo.getStudyDay())){
@@ -382,7 +384,7 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
             }
         }
         userPlanVo.setCalendarStudyVo(clCalendarStudyVos);
-        userPlanVo.setStudyCourseKnob(clCalendarStudyVos.get(0).getDayStudyList().get(0).getStudyCourseKnob());
+        userPlanVo.setStudyCourseKnob(secAll);
         return userPlanVo;
     }
 

zhongzheng-system/src/main/resources/mapper/modules/base/UserProfileMapper.xml

@@ -52,7 +52,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
+        <if test="id != null and id!='' ">
+            AND up.status =
 
+        </if>
         order by up.create_time desc
     </select>
 </mapper>