merge

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-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionServiceImpl.java

@@ -1043,6 +1043,9 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                 errorLog += "第" + index + "条题目选项错误\n";
                             }
                             if(!hasError){
+                                if(type==5){
+                                    answerQuestion = null;
+                                }
                                 bo.setType(type);
                                 bo.setStatus(1);
                                 bo.setContent(qContent);
@@ -1234,6 +1237,11 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                             strContent = "";
                         }
                         nowPart = 7;
+                        if(Validator.isNotEmpty(answerQuestion)){
+                            answerQuestion = answerQuestion +  "<br />" + content ;
+                        }else{
+                            answerQuestion = content.replace("正确答案：", "");
+                        }
                         if (isOption) {
                             //选择题
                             answerQuestion = dealImportAnswer(answerQuestion);
@@ -1250,24 +1258,23 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                 answerQuestion = "0";
                                 type = 3;
                             } else {
-                                answerQuestion = null;
+                                analysisContent = answerQuestion; //简答题把正确答案填充到解析文本
                                 type = 5; //简答题
-                                analysisContent = analysisContent +  "<br />" + content; //答案文本
                             }
                         }
 
                     }
                     else if (content.startsWith("解题思路")||(nowPart==8&&!isLineStart(content))) {
                         nowPart = 8;
-                        analysisContent = analysisContent + "<br />"+  content +"<br />";
+                        analysisContent = analysisContent +   content +"<br />";
                     }
                     else if (content.startsWith("考查考点")||(nowPart==9&&!isLineStart(content))) {
                         nowPart = 9;
-                        analysisContent = analysisContent + "<br />"+  content +"<br />";
+                        analysisContent = analysisContent +   content +"<br />";
                     }
                     else if (content.startsWith("老师解答")||(nowPart==10&&!isLineStart(content))) {
                         nowPart = 10;
-                        analysisContent = analysisContent +  "<br />"+  content +"<br />";
+                        analysisContent = analysisContent +    content +"<br />";
                     }
                 }
                 //遍历正文
@@ -1421,6 +1428,9 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
 
                             }
                             if(!hasError){
+                                if(type==5){
+                                    answerQuestion = null;
+                                }
                                 bo.setType(type);
                                 bo.setStatus(1);
                                 bo.setContent(qContent);
@@ -1610,8 +1620,14 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                         if(nowPart!=7){
                             strContent = "";
                         }
-                        answerQuestion = content.replace("正确答案：", "");
+
                         nowPart = 7;
+
+                        if(Validator.isNotEmpty(answerQuestion)){
+                            answerQuestion = answerQuestion +  "<br />" + content ;
+                        }else{
+                            answerQuestion = content.replace("正确答案：", "");
+                        }
                         if (isOption) {
                             //选择题
                             answerQuestion = dealImportAnswer(answerQuestion);
@@ -1628,24 +1644,23 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                 answerQuestion = "0";
                                 type = 3;
                             } else {
-                                answerQuestion = null;
+                                analysisContent = answerQuestion; //简答题把正确答案填充到解析文本
                                 type = 5; //简答题
-                                analysisContent = analysisContent +  "<br />" + content; //答案文本
                             }
                         }
 
                     }
                     else if (content.startsWith("解题思路")||(nowPart==8&&!isLineStart(content))) {
                         nowPart = 8;
-                        analysisContent = analysisContent + "<br />"+  content +"<br />";
+                        analysisContent = analysisContent +   content +"<br />";
                     }
                     else if (content.startsWith("考查考点")||(nowPart==9&&!isLineStart(content))) {
                         nowPart = 9;
-                        analysisContent = analysisContent + "<br />"+  content +"<br />";
+                        analysisContent = analysisContent +   content +"<br />";
                     }
                     else if (content.startsWith("老师解答")||(nowPart==10&&!isLineStart(content))) {
                         nowPart = 10;
-                        analysisContent = analysisContent + "<br />"+  content +"<br />";
+                        analysisContent = analysisContent +   content +"<br />";
                     }
                 }
                 //遍历正文

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

@@ -221,14 +221,14 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
         classGradeUserQueryBo.setGoodsId(userPeriodVo.getGoodsId());
         Integer gradePeriodStatus = iClassGradeUserService.updateUserPeriodStatus(classGradeUserQueryBo);
         //发送审核不通过消息
+        bo.setStatus(gradePeriodStatus);
+        bo.setGoodsId(userPeriodVo.getGoodsId());
+        bo.setUserId(userPeriodVo.getUserId());
+        bo.setGradeId(userPeriodVo.getGradeId());
         if (gradePeriodStatus == 0) {
-            bo.setStatus(gradePeriodStatus);
-            bo.setGoodsId(userPeriodVo.getGoodsId());
-            bo.setUserId(userPeriodVo.getUserId());
-            bo.setGradeId(userPeriodVo.getGradeId());
             sendPeriodSMS(bo);
             sendPeriodSevenSMS(bo);
-        }else {
+        }else if(gradePeriodStatus == 3){
             if (ObjectUtils.isNotNull(business.getPeriodNumber()) && business.getPeriodNumber() == 1){
                 //只需要初审，不用复审
                 this.confirmPeriod(bo);
@@ -257,6 +257,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean editPeriodAll(UserPeriodEditBo bo) {
+        CourseBusiness business = null;
         for (Long id : bo.getIds()) {
             UserPeriodStatusVo oldData = userPeriodStatusService.queryById(id);
             Long goodsId;
@@ -269,7 +270,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             }
             //获取业务学时审核数据
             Goods goods = iGoodsService.getById(goodsId);
-            CourseBusiness business = iCourseBusinessService.getById(goods.getBusinessId());
+            business = iCourseBusinessService.getById(goods.getBusinessId());
             if (ObjectUtils.isNull(business.getPeriodType()) || business.getPeriodType() == 1){
                 //人工审核
                 //查询此人学时审核是否有权限
@@ -322,6 +323,11 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             bo.setStatus(gradePeriodStatus);
             sendPeriodSMS(bo);
             sendPeriodSevenSMS(bo);
+        }else if(gradePeriodStatus == 3) {
+            if (ObjectUtils.isNotNull(business.getPeriodNumber()) && business.getPeriodNumber() == 1){
+                //只需要初审，不用复审
+                this.confirmPeriod(bo);
+            }
         }
 
         return true;

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/grade/ClassGradeUserMapper.xml

@@ -971,6 +971,7 @@
         course_menu_exam cme
         LEFT JOIN exam e ON cme.exam_id = e.exam_id
         WHERE 1=1
+        AND  cme.type=1
         <if test="courseId != null and courseId !='' ">
             AND  cme.course_id=#{courseId}
         </if>
@@ -1035,6 +1036,7 @@
         LEFT JOIN exam e ON cme.exam_id = e.exam_id
         WHERE 1=1
         and cme.module_id =0
+        and cme.type =1
         <if test="courseId != null and courseId !='' ">
             AND  cme.course_id=#{courseId}
         </if>