merge

zhongzheng-admin/src/main/java/com/zhongzheng/controller/goods/GoodsCourseController.java

@@ -49,10 +49,24 @@ public class GoodsCourseController extends BaseController {
      */
     @ApiOperation("查询商品课程关系列表")
     @PreAuthorize("@ss.hasPermi('system:course:list')")
+    @GetMapping("/getList")
+    public TableDataInfo<CourseVo> getList(GoodsCourseQueryBo bo) {
+        startPage();
+        List<CourseVo> list = iGoodsCourseService.selectList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询商品课程关系列表
+     */
+    @ApiOperation("ID查询商品课程关系列表")
+    @PreAuthorize("@ss.hasPermi('system:course:list')")
     @GetMapping("/list/{id}")
-    public TableDataInfo<CourseVo> list(@PathVariable Long id) {
+    public TableDataInfo<CourseVo> list(@PathVariable("id" ) Long id) {
         startPage();
-        List<CourseVo> list = iGoodsCourseService.selectList(id);
+        GoodsCourseQueryBo courseQueryBo = new GoodsCourseQueryBo();
+        courseQueryBo.setGoodsId(id);
+        List<CourseVo> list = iGoodsCourseService.selectList(courseQueryBo);
         return getDataTable(list);
     }
 

zhongzheng-api/src/main/java/com/zhongzheng/controller/goods/GoodsCourseController.java

@@ -10,6 +10,7 @@ import com.zhongzheng.modules.course.bo.CourseQueryBo;
 import com.zhongzheng.modules.course.vo.CourseSectionVo;
 import com.zhongzheng.modules.course.vo.CourseVo;
 import com.zhongzheng.modules.goods.bo.GoodsCourseAddBo;
+import com.zhongzheng.modules.goods.bo.GoodsCourseQueryBo;
 import com.zhongzheng.modules.goods.service.IGoodsCourseService;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
@@ -37,6 +38,7 @@ public class GoodsCourseController extends BaseController {
 
     private final IGoodsCourseService iGoodsCourseService;
 
+
     /**
      * 查询商品课程关系列表
      */
@@ -44,12 +46,11 @@ public class GoodsCourseController extends BaseController {
     @GetMapping("/list/{id}")
     public TableDataInfo<CourseVo> list(@PathVariable Long id) {
         startPage();
-        List<CourseVo> list = iGoodsCourseService.selectList(id);
+        GoodsCourseQueryBo courseQueryBo = new GoodsCourseQueryBo();
+        courseQueryBo.setGoodsId(id);
+        List<CourseVo> list = iGoodsCourseService.selectList(courseQueryBo);
         return getDataTable(list);
     }
 
 
-
-
-
 }

zhongzheng-common/src/main/java/com/zhongzheng/common/core/controller/BaseController.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.common.core.controller;
 
+
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpStatus;

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityRecommendGoodsMapper.java

@@ -1,8 +1,12 @@
 package com.zhongzheng.modules.activity.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhongzheng.modules.activity.bo.ActivityRecommendGoodsEditBo;
 import com.zhongzheng.modules.activity.domain.ActivityRecommendGoods;
+import com.zhongzheng.modules.activity.vo.ActivityRecommendGoodsVo;
+import com.zhongzheng.modules.goods.vo.GoodsVo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 推荐板块商品Mapper接口
@@ -13,4 +17,7 @@ import com.zhongzheng.modules.activity.domain.ActivityRecommendGoods;
 public interface ActivityRecommendGoodsMapper extends BaseMapper<ActivityRecommendGoods> {
 
 
+    Page<GoodsVo> getGoodsListByPage(Page<Object> objectPage,@Param("recommendId") Long recommendId);
+
+    Page<ActivityRecommendGoodsVo> getRecommendGoodsListByPage(Page<Object> objectPage,@Param("recommendId") Long recommendId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityRecommendGoodsService.java

@@ -1,11 +1,13 @@
 package com.zhongzheng.modules.activity.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.modules.activity.bo.ActivityRecommendGoodsAddBo;
 import com.zhongzheng.modules.activity.bo.ActivityRecommendGoodsEditBo;
 import com.zhongzheng.modules.activity.bo.ActivityRecommendGoodsQueryBo;
 import com.zhongzheng.modules.activity.domain.ActivityRecommendGoods;
 import com.zhongzheng.modules.activity.vo.ActivityRecommendGoodsVo;
+import com.zhongzheng.modules.goods.vo.GoodsVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -51,4 +53,8 @@ public interface IActivityRecommendGoodsService extends IService<ActivityRecomme
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    Page<GoodsVo> getGoodsListByPage(Page<Object> objectPage, Long recommendId);
+
+	Page<ActivityRecommendGoodsVo> getRecommendGoodsListByPage(Page<Object> objectPage, Long recommendId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityRecommendGoodsServiceImpl.java

@@ -13,6 +13,7 @@ import com.zhongzheng.modules.activity.mapper.ActivityRecommendGoodsMapper;
 import com.zhongzheng.modules.activity.service.IActivityRecommendGoodsService;
 import com.zhongzheng.modules.activity.vo.ActivityRecommendGoodsVo;
 import com.zhongzheng.modules.course.domain.CourseChapterSection;
+import com.zhongzheng.modules.goods.vo.GoodsVo;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -102,4 +103,14 @@ public class ActivityRecommendGoodsServiceImpl extends ServiceImpl<ActivityRecom
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public com.baomidou.mybatisplus.extension.plugins.pagination.Page<GoodsVo> getGoodsListByPage(com.baomidou.mybatisplus.extension.plugins.pagination.Page<Object> objectPage, Long recommendId) {
+        return baseMapper.getGoodsListByPage(objectPage,recommendId);
+    }
+
+    @Override
+    public com.baomidou.mybatisplus.extension.plugins.pagination.Page<ActivityRecommendGoodsVo> getRecommendGoodsListByPage(com.baomidou.mybatisplus.extension.plugins.pagination.Page<Object> objectPage, Long recommendId) {
+        return baseMapper.getRecommendGoodsListByPage(objectPage,recommendId);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityRecommendServiceImpl.java

@@ -21,6 +21,7 @@ import com.zhongzheng.modules.activity.vo.ActivityRecommendGoodsVo;
 import com.zhongzheng.modules.activity.vo.ActivityRecommendVo;
 import com.zhongzheng.modules.goods.domain.Goods;
 import com.zhongzheng.modules.goods.service.IGoodsService;
+import com.zhongzheng.modules.goods.vo.GoodsVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -169,33 +170,13 @@ public class ActivityRecommendServiceImpl extends ServiceImpl<ActivityRecommendM
     @Override
     public TableDataInfo<ActivityRecommendGoodsVo> getGoodsList(ActivityRecommendGoodsQueryBo bo) {
         TableDataInfo<ActivityRecommendGoodsVo> result = new TableDataInfo<>();
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<ActivityRecommendGoods> page = iActivityRecommendGoodsService.page(new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(bo.getPageNum(), bo.getPageSize()),
-                new LambdaQueryWrapper<ActivityRecommendGoods>()
-                        .eq(ActivityRecommendGoods::getRecommendId, bo.getRecommendId())
-                        .orderByAsc(ActivityRecommendGoods::getSort));
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<ActivityRecommendGoodsVo> page =
+                iActivityRecommendGoodsService.getRecommendGoodsListByPage(new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(bo.getPageNum(), bo.getPageSize()),bo.getRecommendId());
         if (CollectionUtils.isEmpty(page.getRecords())){
             return result;
         }
-        List<ActivityRecommendGoods> list = page.getRecords();
-        List<ActivityRecommendGoodsVo> listVos = new ArrayList<>();
-        for (ActivityRecommendGoods item : list) {
-            Goods goods = iGoodsService.getOne(new LambdaQueryWrapper<Goods>()
-                    .eq(Goods::getGoodsId, item.getGoodsId())
-                    .eq(Goods::getGoodsStatus, 1));
-            if (ObjectUtils.isNotNull(goods)){
-                ActivityRecommendGoodsVo vo = new ActivityRecommendGoodsVo();
-                BeanUtil.copyProperties(item, vo);
-                vo.setGoodsName(goods.getGoodsName());
-                vo.setGoodsType(goods.getGoodsType());
-                vo.setCoverUrl(goods.getCoverUrl());
-                vo.setYear(goods.getYear());
-                vo.setStandPrice(goods.getStandPrice());
-                vo.setLinePrice(goods.getLinePrice());
-                listVos.add(vo);
-            }
-        }
         result.setTotal(page.getTotal());
-        result.setRows(listVos);
+        result.setRows(page.getRecords());
         result.setCode(200);
         return result;
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionServiceImpl.java

@@ -1054,6 +1054,10 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                 bo.setPublishStatus(1);
                                 bo.setBusinessList(businessList);
                                 bo.setCreateTime(nowTime);
+                                answerQuestion = content.replace("正确答案：", "");
+                                if (Validator.isEmpty(answerQuestion)) {
+                                    throw new CustomException("正确答案错误");
+                                }
                                 if(type==1){
                                     list1.add(bo);
                                 }
@@ -1229,10 +1233,6 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                         if(nowPart!=7){
                             strContent = "";
                         }
-                        answerQuestion = content.replace("正确答案：", "");
-                        if (Validator.isEmpty(answerQuestion)) {
-                            throw new CustomException("正确答案错误");
-                        }
                         nowPart = 7;
                         if (isOption) {
                             //选择题
@@ -1259,15 +1259,15 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                     }
                     else if (content.startsWith("解题思路")||(nowPart==8&&!isLineStart(content))) {
                         nowPart = 8;
-                        analysisContent = analysisContent +   content +"<br />";
+                        analysisContent = analysisContent + "<br />"+  content +"<br />";
                     }
                     else if (content.startsWith("考查考点")||(nowPart==9&&!isLineStart(content))) {
                         nowPart = 9;
-                        analysisContent = analysisContent +   content +"<br />";
+                        analysisContent = analysisContent + "<br />"+  content +"<br />";
                     }
                     else if (content.startsWith("老师解答")||(nowPart==10&&!isLineStart(content))) {
                         nowPart = 10;
-                        analysisContent = analysisContent +   content +"<br />";
+                        analysisContent = analysisContent +  "<br />"+  content +"<br />";
                     }
                 }
                 //遍历正文
@@ -1432,6 +1432,9 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                 bo.setPublishStatus(1);
                                 bo.setBusinessList(businessList);
                                 bo.setCreateTime(nowTime);
+                                if (Validator.isEmpty(answerQuestion)) {
+                                    throw new CustomException("正确答案错误");
+                                }
                                 if(type==1){
                                     list1.add(bo);
                                 }
@@ -1608,9 +1611,6 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                             strContent = "";
                         }
                         answerQuestion = content.replace("正确答案：", "");
-                        if (Validator.isEmpty(answerQuestion)) {
-                            throw new CustomException("正确答案错误");
-                        }
                         nowPart = 7;
                         if (isOption) {
                             //选择题
@@ -1637,15 +1637,15 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                     }
                     else if (content.startsWith("解题思路")||(nowPart==8&&!isLineStart(content))) {
                         nowPart = 8;
-                        analysisContent = analysisContent +   content +"<br />";
+                        analysisContent = analysisContent + "<br />"+  content +"<br />";
                     }
                     else if (content.startsWith("考查考点")||(nowPart==9&&!isLineStart(content))) {
                         nowPart = 9;
-                        analysisContent = analysisContent +   content +"<br />";
+                        analysisContent = analysisContent + "<br />"+  content +"<br />";
                     }
                     else if (content.startsWith("老师解答")||(nowPart==10&&!isLineStart(content))) {
                         nowPart = 10;
-                        analysisContent = analysisContent +   content +"<br />";
+                        analysisContent = analysisContent + "<br />"+  content +"<br />";
                     }
                 }
                 //遍历正文

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamRecommendGoodsQueryBo.java

@@ -28,4 +28,5 @@ public class ExamRecommendGoodsQueryBo implements Serializable {
     @ApiModelProperty("1小程序 2PC网站")
     private Integer platform;
 
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamApplyServiceImpl.java

@@ -15,6 +15,7 @@ import com.zhongzheng.modules.activity.domain.ActivityRecommend;
 import com.zhongzheng.modules.activity.domain.ActivityRecommendGoods;
 import com.zhongzheng.modules.activity.service.IActivityRecommendGoodsService;
 import com.zhongzheng.modules.activity.service.IActivityRecommendService;
+import com.zhongzheng.modules.activity.vo.ActivityRecommendGoodsVo;
 import com.zhongzheng.modules.bank.domain.Exam;
 import com.zhongzheng.modules.bank.domain.QuestionBusiness;
 import com.zhongzheng.modules.bank.service.IExamService;
@@ -346,23 +347,15 @@ public class ExamApplyServiceImpl extends ServiceImpl<ExamApplyMapper, ExamApply
             return tableDataInfo;
         }
         ActivityRecommend activityRecommend = list.stream().findFirst().get();
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<ActivityRecommendGoods> page =
-                iActivityRecommendGoodsService.page(new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(bo.getPageNum(), bo.getPageSize()),
-                                                        new LambdaQueryWrapper<ActivityRecommendGoods>()
-                                                        .eq(ActivityRecommendGoods::getRecommendId, activityRecommend.getRecommendId())
-                                                                .orderByAsc(ActivityRecommendGoods::getSort));
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<GoodsVo> page =
+                iActivityRecommendGoodsService.getGoodsListByPage(new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(bo.getPageNum(), bo.getPageSize()),activityRecommend.getRecommendId());
+
         if (CollectionUtils.isEmpty(page.getRecords())){
             return tableDataInfo;
         }
-        List<GoodsVo> result = page.getRecords().stream().map(item -> {
-            Goods goods = iGoodsService.getById(item.getGoodsId());
-            GoodsVo goodsVo = new GoodsVo();
-            BeanUtil.copyProperties(goods, goodsVo);
-            return goodsVo;
-        }).collect(Collectors.toList());
 
         tableDataInfo.setTotal(page.getTotal());
-        tableDataInfo.setRows(result);
+        tableDataInfo.setRows(page.getRecords());
         tableDataInfo.setCode(200);
         return tableDataInfo;
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsCourseQueryBo.java

@@ -50,4 +50,9 @@ public class GoodsCourseQueryBo extends BaseEntity {
 	/** 1显示 0隐藏 */
 	@ApiModelProperty("1显示 0隐藏")
 	private Integer courseShow;
+
+	@ApiModelProperty("关键字")
+	private String keyWord;
+
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/mapper/GoodsCourseMapper.java

@@ -18,7 +18,7 @@ import java.util.List;
  * @date 2021-10-12
  */
 public interface GoodsCourseMapper extends BaseMapper<GoodsCourse> {
-    List<CourseVo> getList(Long goodsId);
+    List<CourseVo> getList(GoodsCourseQueryBo bo);
     List<GoodsCourseMoreVo> selectListMore(GoodsCourseQueryBo bo);
     List<GoodsCourseVo> selectGoodsList(Long courseId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/IGoodsCourseService.java

@@ -30,7 +30,7 @@ public interface IGoodsCourseService extends IService<GoodsCourse> {
 	 */
 	List<GoodsCourseVo> queryList(GoodsCourseQueryBo bo);
 
-	List<CourseVo> selectList(Long goodsId);
+	List<CourseVo> selectList(GoodsCourseQueryBo bo);
 
 	List<GoodsCourseMoreVo> selectListMore(List<Long> goodsIds);
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsCourseServiceImpl.java

@@ -51,8 +51,8 @@ public class GoodsCourseServiceImpl extends ServiceImpl<GoodsCourseMapper, Goods
     }
 
     @Override
-    public List<CourseVo> selectList(Long goodsId) {
-        return this.baseMapper.getList(goodsId);
+    public List<CourseVo> selectList(GoodsCourseQueryBo bo) {
+        return this.baseMapper.getList(bo);
     }
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -134,7 +134,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             list.forEach(goodsVo -> {
                 AtomicReference<Double> classHours = new AtomicReference<>(0.0);
                 //查询课程列表
-                List<CourseVo> courseVoList = iGoodsCourseService.selectList(goodsVo.getGoodsId());
+                GoodsCourseQueryBo courseQueryBo = new GoodsCourseQueryBo();
+                courseQueryBo.setGoodsId(goodsVo.getGoodsId());
+                List<CourseVo> courseVoList = iGoodsCourseService.selectList(courseQueryBo);
                 if (courseVoList != null && courseVoList.size() > 0) {
                     courseVoList.forEach(courseVo -> {
                         //获取模块信息
@@ -569,7 +571,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     @Override
     public List<CourseModuleFreeExamVo> moduleFreeExamList(Long goodsId) {
         List<CourseModuleFreeExamVo> moduleExamList = new ArrayList<>();
-        List<CourseVo> courseVoList = iGoodsCourseService.selectList(goodsId);
+        GoodsCourseQueryBo courseQueryBo = new GoodsCourseQueryBo();
+        courseQueryBo.setGoodsId(goodsId);
+        List<CourseVo> courseVoList = iGoodsCourseService.selectList(courseQueryBo);
         for(CourseVo vo : courseVoList){
             CourseMenuQueryBo bo = new CourseMenuQueryBo();
             bo.setCourseId(vo.getCourseId());

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsServiceImpl.java

@@ -26,6 +26,7 @@ import com.zhongzheng.modules.exam.service.IExamApplyGoodsService;
 import com.zhongzheng.modules.exam.service.IExamApplyUserService;
 import com.zhongzheng.modules.exam.service.IExamBeforeService;
 import com.zhongzheng.modules.exam.vo.ExamApplyGoodsVo;
+import com.zhongzheng.modules.goods.bo.GoodsCourseQueryBo;
 import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
 import com.zhongzheng.modules.goods.service.IGoodsCourseService;
 import com.zhongzheng.modules.goods.service.IGoodsService;
@@ -384,7 +385,9 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
 
     @Override
     public List<OrderGoodsVo> listLiveGoodsList(GoodsQueryBo bo) {
-        List<CourseVo> courseVoList = iGoodsCourseService.selectList(bo.getGoodsId());
+        GoodsCourseQueryBo courseQueryBo = new GoodsCourseQueryBo();
+        courseQueryBo.setGoodsId(bo.getGoodsId());
+        List<CourseVo> courseVoList = iGoodsCourseService.selectList(courseQueryBo);
         Integer totalLiveNum = 0; //总直播次数（含回放）
         Integer overLiveNum = 0; //已经直播次数
         Long liveTime = 0L; //直播总秒数
@@ -424,7 +427,9 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         List<OrderGoodsVo> orderGoodsVos = baseMapper.selectOrderGoods(orderGoodsQueryBo);
         for(OrderGoodsVo goodsVo : orderGoodsVos){
             if(goodsVo.getGoodsType()==1){
-                List<CourseVo> courseVoList = iGoodsCourseService.selectList(goodsVo.getGoodsId());
+                GoodsCourseQueryBo courseQueryBo = new GoodsCourseQueryBo();
+                courseQueryBo.setGoodsId(goodsVo.getGoodsId());
+                List<CourseVo> courseVoList = iGoodsCourseService.selectList(courseQueryBo);
                 for(CourseVo courseVo : courseVoList){
                     UserStudyRecordQueryBo queryBo = new UserStudyRecordQueryBo();
                     queryBo.setCourseId(courseVo.getCourseId());
@@ -446,7 +451,9 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
             Long startTime = null;
             Long endTime = null;
             Integer sectionNum = 0;
-            List<CourseVo> courseVoList = iGoodsCourseService.selectList(goodsVo.getGoodsId());
+            GoodsCourseQueryBo courseQueryBo = new GoodsCourseQueryBo();
+            courseQueryBo.setGoodsId(goodsVo.getGoodsId());
+            List<CourseVo> courseVoList = iGoodsCourseService.selectList(courseQueryBo);
             for(CourseVo courseVo : courseVoList){
                 UserStudyRecordQueryBo queryBo = new UserStudyRecordQueryBo();
                 queryBo.setCourseId(courseVo.getCourseId());

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

@@ -162,74 +162,79 @@ public class UserBankRecordServiceImpl extends ServiceImpl<UserBankRecordMapper,
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
         boolean b = this.updateById(update);
-        updateExam(update);
-        //判断有无学习结束
-        UserStudyRecord userStudyRecord = new UserStudyRecord();
-        userStudyRecord.setUserId(bo.getUserId());
-        userStudyRecord.setGoodsId(bo.getGoodsId());
-        userStudyRecord.setGradeId(bo.getGradeId());
-        userStudyRecord.setStatus(1);
-        iUserStudyRecordService.studyFinish(userStudyRecord);
+        UserBankRecordVo userBankRecordVo = this.queryById(update.getRecordId());
+        updateExam(userBankRecordVo,update);
+        if(userBankRecordVo.getType()==1){//章卷才进来
+            //判断有无学习结束
+            UserStudyRecord userStudyRecord = new UserStudyRecord();
+            userStudyRecord.setUserId(bo.getUserId());
+            userStudyRecord.setGoodsId(bo.getGoodsId());
+            userStudyRecord.setGradeId(bo.getGradeId());
+            userStudyRecord.setStatus(1);
+            iUserStudyRecordService.studyFinish(userStudyRecord);
+        }
         return b;
     }
 
-    private void updateExam(UserBankRecord add) {
+    private void updateExam(UserBankRecordVo userBankRecordVo,UserBankRecord add) {
         //试卷及格绑定成绩和记录做题，待审，通过不记录
-        UserBankRecordVo userBankRecordVo = this.queryById(add.getRecordId());
-        if (userStudyRecordMapper.selectStudyExamRecord(userBankRecordVo)  < 1 && Validator.isNotEmpty(add.getReportStatus())&& add.getReportStatus().equals(1)){
-            //增加一条审核记录
-            UserPeriod userPeriod = new UserPeriod();
-            userPeriod.setUserId(userBankRecordVo.getUserId());
-            userPeriod.setCourseId(userBankRecordVo.getCourseId());
-            userPeriod.setExamId(userBankRecordVo.getExamId());
-            userPeriod.setGoodsId(userBankRecordVo.getGoodsId());
-            userPeriod.setType(2);
-            userPeriod.setCreateTime(DateUtils.getNowTime());
-            userPeriod.setUpdateTime(DateUtils.getNowTime());
-            userPeriod.setModuleId(userBankRecordVo.getModuleId());
-            userPeriod.setChapterId(userBankRecordVo.getChapterId());
-            userPeriod.setGradeId(userBankRecordVo.getGradeId());
-            iUserPeriodService.save(userPeriod);
-            UserPeriodStatus userPeriodStatusAddBo = new UserPeriodStatus();
-            userPeriodStatusAddBo.setPeriodStatus(1);
-            userPeriodStatusAddBo.setStatus(2);
-            userPeriodStatusAddBo.setRecordStartTime(userBankRecordVo.getCreateTime());
-            userPeriodStatusAddBo.setRecordEndTime(userBankRecordVo.getUpdateTime());
-            userPeriodStatusAddBo.setPeriodId(userPeriod.getId());
-            userPeriodStatusAddBo.setCreateTime(DateUtils.getNowTime());
-            userPeriodStatusAddBo.setUpdateTime(DateUtils.getNowTime());
-            userPeriodStatusAddBo.setPerformance(userBankRecordVo.getPerformance());
-            iUserPeriodStatusService.save(userPeriodStatusAddBo);
-            //将照片绑定学时
-            LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
-            lqw.eq(UserStudyRecordPhoto::getRecordId, userBankRecordVo.getRecordId());
-            lqw.eq(UserStudyRecordPhoto::getStatus, 2);
-            lqw.eq(UserStudyRecordPhoto::getUserId, userBankRecordVo.getUserId());
-            UserStudyRecordPhoto userStudyRecordPhoto = new UserStudyRecordPhoto();
-            userStudyRecordPhoto.setPeriodId(userPeriodStatusAddBo.getId());
-            userStudyRecordPhoto.setUpdateTime(DateUtils.getNowTime());
-            userStudyRecordPhotoService.update(userStudyRecordPhoto,lqw);
-        }
 
-        //待重修
-        if (userStudyRecordMapper.selectStudyExamRecordOr(userBankRecordVo) > 0 && add.getReportStatus().equals(1)){
-            //将待重修改为待审核
-            UserPeriodStatus userPeriodStatus = userStudyRecordMapper.selectStudyExamRecordCount(userBankRecordVo);
-            userPeriodStatus.setStatus(2);
-            userPeriodStatus.setRecordStartTime(userBankRecordVo.getCreateTime());
-            userPeriodStatus.setRecordEndTime(userBankRecordVo.getUpdateTime());
-            userPeriodStatus.setPerformance(userBankRecordVo.getPerformance());
-            iUserPeriodStatusService.updateById(userPeriodStatus);
-
-            //将照片绑定学时
-            LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
-            lqw.eq(UserStudyRecordPhoto::getRecordId, userBankRecordVo.getRecordId());
-            lqw.eq(UserStudyRecordPhoto::getStatus, 2);
-            lqw.eq(UserStudyRecordPhoto::getUserId, userBankRecordVo.getUserId());
-            UserStudyRecordPhoto userStudyRecordPhoto = new UserStudyRecordPhoto();
-            userStudyRecordPhoto.setPeriodId(userPeriodStatus.getId());
-            userStudyRecordPhoto.setUpdateTime(DateUtils.getNowTime());
-            userStudyRecordPhotoService.update(userStudyRecordPhoto,lqw);
+        if(userBankRecordVo.getType()==1){ //章卷才进来
+            if (userStudyRecordMapper.selectStudyExamRecord(userBankRecordVo)  < 1 && Validator.isNotEmpty(add.getReportStatus())&& add.getReportStatus().equals(1)){
+                //增加一条审核记录
+                UserPeriod userPeriod = new UserPeriod();
+                userPeriod.setUserId(userBankRecordVo.getUserId());
+                userPeriod.setCourseId(userBankRecordVo.getCourseId());
+                userPeriod.setExamId(userBankRecordVo.getExamId());
+                userPeriod.setGoodsId(userBankRecordVo.getGoodsId());
+                userPeriod.setType(2);
+                userPeriod.setCreateTime(DateUtils.getNowTime());
+                userPeriod.setUpdateTime(DateUtils.getNowTime());
+                userPeriod.setModuleId(userBankRecordVo.getModuleId());
+                userPeriod.setChapterId(userBankRecordVo.getChapterId());
+                userPeriod.setGradeId(userBankRecordVo.getGradeId());
+                iUserPeriodService.save(userPeriod);
+                UserPeriodStatus userPeriodStatusAddBo = new UserPeriodStatus();
+                userPeriodStatusAddBo.setPeriodStatus(1);
+                userPeriodStatusAddBo.setStatus(2);
+                userPeriodStatusAddBo.setRecordStartTime(userBankRecordVo.getCreateTime());
+                userPeriodStatusAddBo.setRecordEndTime(userBankRecordVo.getUpdateTime());
+                userPeriodStatusAddBo.setPeriodId(userPeriod.getId());
+                userPeriodStatusAddBo.setCreateTime(DateUtils.getNowTime());
+                userPeriodStatusAddBo.setUpdateTime(DateUtils.getNowTime());
+                userPeriodStatusAddBo.setPerformance(userBankRecordVo.getPerformance());
+                iUserPeriodStatusService.save(userPeriodStatusAddBo);
+                //将照片绑定学时
+                LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
+                lqw.eq(UserStudyRecordPhoto::getRecordId, userBankRecordVo.getRecordId());
+                lqw.eq(UserStudyRecordPhoto::getStatus, 2);
+                lqw.eq(UserStudyRecordPhoto::getUserId, userBankRecordVo.getUserId());
+                UserStudyRecordPhoto userStudyRecordPhoto = new UserStudyRecordPhoto();
+                userStudyRecordPhoto.setPeriodId(userPeriodStatusAddBo.getId());
+                userStudyRecordPhoto.setUpdateTime(DateUtils.getNowTime());
+                userStudyRecordPhotoService.update(userStudyRecordPhoto,lqw);
+            }
+
+            //待重修
+            if (userStudyRecordMapper.selectStudyExamRecordOr(userBankRecordVo) > 0 && add.getReportStatus().equals(1)){
+                //将待重修改为待审核
+                UserPeriodStatus userPeriodStatus = userStudyRecordMapper.selectStudyExamRecordCount(userBankRecordVo);
+                userPeriodStatus.setStatus(2);
+                userPeriodStatus.setRecordStartTime(userBankRecordVo.getCreateTime());
+                userPeriodStatus.setRecordEndTime(userBankRecordVo.getUpdateTime());
+                userPeriodStatus.setPerformance(userBankRecordVo.getPerformance());
+                iUserPeriodStatusService.updateById(userPeriodStatus);
+
+                //将照片绑定学时
+                LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
+                lqw.eq(UserStudyRecordPhoto::getRecordId, userBankRecordVo.getRecordId());
+                lqw.eq(UserStudyRecordPhoto::getStatus, 2);
+                lqw.eq(UserStudyRecordPhoto::getUserId, userBankRecordVo.getUserId());
+                UserStudyRecordPhoto userStudyRecordPhoto = new UserStudyRecordPhoto();
+                userStudyRecordPhoto.setPeriodId(userPeriodStatus.getId());
+                userStudyRecordPhoto.setUpdateTime(DateUtils.getNowTime());
+                userStudyRecordPhotoService.update(userStudyRecordPhoto,lqw);
+            }
         }
     }
     /**

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityRecommendGoodsMapper.xml

@@ -13,5 +13,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sort" column="sort"/>
     </resultMap>
 
+    <select id="getGoodsListByPage" resultType="com.zhongzheng.modules.goods.vo.GoodsVo">
+        SELECT
+            g.*
+        FROM
+            activity_recommend_goods rg
+                LEFT JOIN goods g ON rg.goods_id = g.goods_id
+        WHERE
+            rg.recommend_id = #{recommendId}
+          and g.goods_status = 1 and g.`status` = 1
+        order by rg.sort asc
+    </select>
 
+    <select id="getRecommendGoodsListByPage" resultType="com.zhongzheng.modules.activity.vo.ActivityRecommendGoodsVo">
+        SELECT
+            rg.id,
+            rg.recommend_id,
+            rg.goods_id,
+            rg.sort,
+            g.goods_name,
+            g.goods_type,
+            g.stand_price,
+            g.line_price,
+            g.code,
+            g.year,
+            g.cover_url
+        FROM
+            activity_recommend_goods rg
+                LEFT JOIN goods g ON rg.goods_id = g.goods_id
+        WHERE
+            rg.recommend_id = #{recommendId}
+          and g.goods_status = 1 and g.`status` = 1
+        order by rg.sort asc
+    </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsCourseMapper.xml

@@ -66,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             gc.*,g.goods_type from goods_course gc LEFT JOIN goods g ON gc.goods_id = g.goods_id where gc.course_id = #{courseId}
     </select>
 
-    <select id="getList" parameterType="Long" resultMap="CourseResultVo">
+    <select id="getList" parameterType="com.zhongzheng.modules.goods.bo.GoodsCourseQueryBo" resultMap="CourseResultVo">
         SELECT
         c.*,
         cet.education_name,
@@ -89,6 +89,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN course_subject cs ON cs.id = c.subject_id
         WHERE
         gc.goods_id = #{goodsId} AND c.`status` = 1
+        <if test="keyWord != null and keyWord != ''">
+            AND (c.course_name  like concat('%', #{keyWord}, '%') or c.code  like concat('%', #{keyWord}, '%'))
+        </if>
+
         order by gc.sort
     </select>