Sfoglia il codice sorgente

提交:BUG处理

yangdamao 3 anni fa
parent
commit
a2d809c3a4

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserStudyRecordMapper.java

@@ -99,5 +99,5 @@ public interface UserStudyRecordMapper extends BaseMapper<UserStudyRecord> {
 
     List<CourseStatementVo> getCourseStatement(CourseStatementBo bo);
 
-    Long getPeriodIdByQuery(UserStudyRecord bo);
+    List<Long> getPeriodIdByQuery(UserStudyRecord bo);
 }

+ 3 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -432,14 +432,14 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                     if (ObjectUtils.isNotNull(business) && ObjectUtils.isNotNull(business.getPeriodType()) && business.getPeriodType() == 2){
                         //自动审核
                         //初审
-                        Long id = baseMapper.getPeriodIdByQuery(bo);
+                        List<Long> ids = baseMapper.getPeriodIdByQuery(bo);
                         UserPeriodEditBo editBo = new UserPeriodEditBo();
-                        editBo.setId(id);
+                        editBo.setIds(ids);
                         editBo.setStatus(1);
                         editBo.setGoodsId(bo.getGoodsId());
                         editBo.setGradeId(bo.getGradeId());
                         editBo.setUserId(bo.getUserId());
-                        iUserPeriodService.updateByEditBo(editBo);
+                        iUserPeriodService.editPeriodAll(editBo);
                         //复审
                         UserPeriodEditBo confirm = new UserPeriodEditBo();
                         confirm.setGoodsId(bo.getGoodsId());

+ 2 - 9
zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordMapper.xml

@@ -1425,15 +1425,8 @@
         LEFT JOIN user_period_status ups ON up.id = ups.period_id
         WHERE
         up.goods_id = #{goodsId}
-        AND up.course_id = #{courseId}
-        AND up.section_id = #{sectionId}
-        <if test="moduleId != null and moduleId !='' and moduleId != 0">
-            AND up.module_id = #{moduleId}
-        </if>
-        <if test="chapterId != null and chapterId !='' and chapterId != 0">
-            AND up.chapter_id = #{chapterId}
-        </if>
-        LIMIT 1
+        AND up.user_id = #{userId}
+        AND up.grade_id = #{gradeId}
     </select>
 
     <select id="userSectionLiveList" parameterType="com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo"