merge

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;