fix 同步公共课程

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

@@ -390,7 +390,6 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                     iOrderGoodsService.update(null, objectLambdaUpdateWrapper);
                 }
             }
-
         }
         //更新班级学员信息
         ClassGradeUserQueryBo classGradeUserQueryBo = new ClassGradeUserQueryBo();

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

@@ -19,6 +19,8 @@ import com.zhongzheng.modules.grade.domain.UserPeriod;
 import com.zhongzheng.modules.grade.domain.UserPeriodStatus;
 import com.zhongzheng.modules.grade.service.IUserPeriodService;
 import com.zhongzheng.modules.grade.service.IUserPeriodStatusService;
+import com.zhongzheng.modules.order.domain.OrderGoods;
+import com.zhongzheng.modules.order.service.IOrderGoodsService;
 import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.domain.UserBankRecord;
@@ -84,7 +86,8 @@ public class UserBankRecordServiceImpl extends ServiceImpl<UserBankRecordMapper,
     @Autowired
     private IExamPaperService iExamPaperService;
 
-
+    @Autowired
+    private IOrderGoodsService iOrderGoodsService;
 
     private static Logger log = LoggerFactory.getLogger(UserBankRecordServiceImpl.class);
 
@@ -206,15 +209,20 @@ public class UserBankRecordServiceImpl extends ServiceImpl<UserBankRecordMapper,
 
     private void updateExam(UserBankRecordVo userBankRecordVo,UserBankRecord add) {
         //试卷及格绑定成绩和记录做题，待审，通过不记录
-
+        OrderGoods orderGoods = iOrderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderGoodsId, userBankRecordVo.getOrderGoodsId()));
+        UserBankRecordVo bakVo =  BeanUtil.toBean(userBankRecordVo, UserBankRecordVo.class);
+        if(Validator.isEmpty(orderGoods.getSevenYear())){
+            bakVo.setOrderGoodsId(null);
+        }
         if(userBankRecordVo.getType()==1||userBankRecordVo.getType()==3){ //章卷 模块卷才进来
-            if (userStudyRecordMapper.selectStudyExamRecord(userBankRecordVo)  < 1 && Validator.isNotEmpty(add.getReportStatus())&& add.getReportStatus().equals(1)){
+            if (userStudyRecordMapper.selectStudyExamRecord(bakVo)  < 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.setOrderGoodsId(userBankRecordVo.getOrderGoodsId());
                 if(userBankRecordVo.getType()==1){
                     userPeriod.setType(2);
                 }
@@ -250,7 +258,7 @@ public class UserBankRecordServiceImpl extends ServiceImpl<UserBankRecordMapper,
             }
 
             //待重修
-            if (userStudyRecordMapper.selectStudyExamRecordOr(userBankRecordVo) > 0 && add.getReportStatus().equals(1)){
+            if (userStudyRecordMapper.selectStudyExamRecordOr(bakVo) > 0 && add.getReportStatus().equals(1)){
                 //将待重修改为待审核
                 UserPeriodStatus userPeriodStatus = userStudyRecordMapper.selectStudyExamRecordCount(userBankRecordVo);
                 userPeriodStatus.setStatus(2);

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

@@ -538,7 +538,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         }
 
         //新增学时记录,照片
-        userPeriodSave(add, bo);
+        userPeriodSave(add, bo,fullName);
         //判断有无学习结束
         studyFinish(add);
         //完成当天学习计划
@@ -1381,11 +1381,15 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
     }
 
 
-    private void userPeriodSave(UserStudyRecord entity, UserStudyRecordAddBo bo) {
+    private void userPeriodSave(UserStudyRecord entity, UserStudyRecordAddBo bo,String businessFullName) {
         //记录学时审核
         Long periodId = null;
+        UserStudyRecord bakStudyRecord =  BeanUtil.toBean(entity, UserStudyRecord.class);
+        if(!businessFullName.contains("继续教育")||!businessFullName.contains("施工现场专业人员")){
+            bakStudyRecord.setOrderGoodsId(null);
+        }
         // 学习无记录加一条学时审核记录
-        if (baseMapper.selectStudyRecord(entity) < 1) {
+        if ( baseMapper.selectStudyRecord(bakStudyRecord) < 1) {
             UserPeriod userPeriod = new UserPeriod();
             userPeriod.setUserId(entity.getUserId());
             userPeriod.setCourseId(entity.getCourseId());

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

@@ -816,6 +816,9 @@
                 AND up.goods_id = 0
             </otherwise>
         </choose>
+        <if test="orderGoodsId != null and orderGoodsId != '' ">
+            AND up.order_goods_id =  #{orderGoodsId}
+        </if>
         AND up.user_id = #{userId}
     </select>
 
@@ -890,6 +893,9 @@
         <if test="type != null and type == 3">
             and up.type = 3
         </if>
+        <if test="orderGoodsId != null and orderGoodsId != '' ">
+            AND up.order_goods_id =  #{orderGoodsId}
+        </if>
         AND up.user_id = #{userId}
     </select>
 
@@ -1188,6 +1194,9 @@
         <if test="type != null and type == 3">
             and up.type = 3
         </if>
+        <if test="orderGoodsId != null and orderGoodsId != '' ">
+            AND up.order_goods_id =  #{orderGoodsId}
+        </if>
         AND up.user_id = #{userId}
     </select>
 
@@ -1262,6 +1271,9 @@
         <if test="type != null and type == 3">
             and up.type = 3
         </if>
+        <if test="orderGoodsId != null and orderGoodsId != '' ">
+            AND up.order_goods_id =  #{orderGoodsId}
+        </if>
         AND up.user_id = #{userId}
         AND ups.period_status = 1
     </select>