考试显示

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/UserPeriodEditBo.java

@@ -19,7 +19,7 @@ public class UserPeriodEditBo {
 
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")
-    private Long[] id;
+    private Long id;
 
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")

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

@@ -11,6 +11,7 @@ import com.zhongzheng.modules.grade.domain.ClassGradeUser;
 import com.zhongzheng.modules.grade.domain.UserPeriodStatus;
 import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.grade.service.IUserPeriodStatusService;
+import com.zhongzheng.modules.grade.vo.UserPeriodStatusVo;
 import com.zhongzheng.modules.inform.bo.InformUserAddBo;
 import com.zhongzheng.modules.inform.service.IInformRemindService;
 import com.zhongzheng.modules.inform.service.IInformUserService;
@@ -131,82 +132,76 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateByEditBo(UserPeriodEditBo bo) {
-        List<UserPeriodStatus> list = new ArrayList<>();
-        for (Long aLong : bo.getId()) {
-            UserPeriodStatus userPeriodStatus = new UserPeriodStatus();
-            userPeriodStatus.setPeriodStatus(1);
-            userPeriodStatus.setStatus(bo.getStatus());
-            userPeriodStatus.setUpdateTime(DateUtils.getNowTime());
-            LambdaQueryWrapper<UserPeriodStatus> lqw = Wrappers.lambdaQuery();
-            lqw.eq(UserPeriodStatus::getPeriodId, aLong);
-            lqw.eq(UserPeriodStatus::getPeriodStatus, 1);
-            userPeriodStatusService.update(userPeriodStatus, lqw);
-            list = userPeriodStatusService.list(lqw);
-        }
-        if (!CollectionUtils.isEmpty(list)) {
-            UserPeriodStatus userPeriodStatus = list.get(0);
-            UserPeriodVo userPeriodVo = this.queryById(userPeriodStatus.getPeriodId());
-            LambdaQueryWrapper<UserPeriod> lqw = Wrappers.lambdaQuery();
-            lqw.eq(userPeriodVo.getUserId() != null, UserPeriod::getUserId, userPeriodVo.getUserId());
-            lqw.eq(userPeriodVo.getGoodsId() != null, UserPeriod::getGoodsId, userPeriodVo.getGoodsId());
-            lqw.eq(userPeriodVo.getGradeId() != null, UserPeriod::getGradeId, userPeriodVo.getGradeId());
-            List<UserPeriod> listPeriodVo = this.list(lqw);
-            if (bo.getStatus().equals(1)) {
 
-                for (UserPeriod userPeriod : listPeriodVo) {
-                    LambdaQueryWrapper<UserPeriodStatus> userPeriods = Wrappers.lambdaQuery();
-                    userPeriods.eq(UserPeriodStatus::getPeriodId, userPeriod.getId());
-                    userPeriods.eq(UserPeriodStatus::getPeriodStatus, 1);
-                    userPeriods.eq(UserPeriodStatus::getStatus, 1);
-                    List<UserPeriodStatus> list1 = userPeriodStatusService.list(userPeriods);
-                    if (CollectionUtils.isEmpty(list1)) {
-                        return true;
-                    }
+        UserPeriodStatus userUp = new UserPeriodStatus();
+        userUp.setPeriodStatus(1);
+        userUp.setStatus(bo.getStatus());
+        userUp.setUpdateTime(DateUtils.getNowTime());
+        userPeriodStatusService.updateById(userUp);
+
+        //判断是否已全部审核结束
+        UserPeriodStatusVo userPeriodStatus = userPeriodStatusService.queryById(bo.getId());
+        UserPeriodVo userPeriodVo = this.queryById(userPeriodStatus.getPeriodId());
+        LambdaQueryWrapper<UserPeriod> lqw = Wrappers.lambdaQuery();
+        lqw.eq(userPeriodVo.getUserId() != null, UserPeriod::getUserId, userPeriodVo.getUserId());
+        lqw.eq(userPeriodVo.getGoodsId() != null, UserPeriod::getGoodsId, userPeriodVo.getGoodsId());
+        lqw.eq(userPeriodVo.getGradeId() != null, UserPeriod::getGradeId, userPeriodVo.getGradeId());
+        List<UserPeriod> listPeriodVo = this.list(lqw);
+        if (bo.getStatus().equals(1)) {
+            for (UserPeriod userPeriod : listPeriodVo) {
+                LambdaQueryWrapper<UserPeriodStatus> userPeriods = Wrappers.lambdaQuery();
+                userPeriods.eq(UserPeriodStatus::getPeriodId, userPeriod.getId());
+                userPeriods.eq(UserPeriodStatus::getPeriodStatus, 1);
+                userPeriods.eq(UserPeriodStatus::getStatus, 1);
+                List<UserPeriodStatus> list1 = userPeriodStatusService.list(userPeriods);
+                if (CollectionUtils.isEmpty(list1)) {
+                    return true;
                 }
-                UserPeriodEditBo userPeriodEditBo = new UserPeriodEditBo();
-                userPeriodEditBo.setUserId(userPeriodVo.getUserId());
-                userPeriodEditBo.setGoodsId(userPeriodVo.getGoodsId());
-                userPeriodEditBo.setGradeId(userPeriodVo.getGradeId());
-                userPeriodEditBo.setStatus(bo.getStatus());
-                sendPeriodSMS(userPeriodEditBo);
-                sendPeriodSevenSMS(userPeriodEditBo);
+            }
+            UserPeriodEditBo userPeriodEditBo = new UserPeriodEditBo();
+            userPeriodEditBo.setUserId(userPeriodVo.getUserId());
+            userPeriodEditBo.setGoodsId(userPeriodVo.getGoodsId());
+            userPeriodEditBo.setGradeId(userPeriodVo.getGradeId());
+            userPeriodEditBo.setStatus(bo.getStatus());
+            sendPeriodSMS(userPeriodEditBo);
+            sendPeriodSevenSMS(userPeriodEditBo);
 
-                LambdaQueryWrapper<ClassGradeUser> classGradeUser = Wrappers.lambdaQuery();
-                classGradeUser.eq(ClassGradeUser::getUserId, userPeriodVo.getUserId());
-                classGradeUser.eq(ClassGradeUser::getGradeId, userPeriodVo.getGradeId());
-                ClassGradeUser classGradeUser1 = new ClassGradeUser();
-                classGradeUser1.setPeriodStatus(1);
-                classGradeUser1.setUpdateTime(DateUtils.getNowTime());
-                List<ClassGradeUser> list1 = iClassGradeUserService.list(classGradeUser);
-                iClassGradeUserService.update(classGradeUser1, classGradeUser);
-            } else {
-                for (UserPeriod userPeriod : listPeriodVo) {
-                    LambdaQueryWrapper<UserPeriodStatus> userPeriods = Wrappers.lambdaQuery();
-                    userPeriods.eq(UserPeriodStatus::getPeriodId, userPeriod.getId());
-                    userPeriods.eq(UserPeriodStatus::getPeriodStatus, 1);
-                    userPeriods.notIn(UserPeriodStatus::getStatus, 1);
-                    List<UserPeriodStatus> list1 = userPeriodStatusService.list(userPeriods);
-                    if (CollectionUtils.isEmpty(list1)) {
-                        return true;
-                    }
+            LambdaQueryWrapper<ClassGradeUser> classGradeUser = Wrappers.lambdaQuery();
+            classGradeUser.eq(ClassGradeUser::getUserId, userPeriodVo.getUserId());
+            classGradeUser.eq(ClassGradeUser::getGradeId, userPeriodVo.getGradeId());
+            ClassGradeUser classGradeUser1 = new ClassGradeUser();
+            classGradeUser1.setPeriodStatus(1);
+            classGradeUser1.setUpdateTime(DateUtils.getNowTime());
+            List<ClassGradeUser> list1 = iClassGradeUserService.list(classGradeUser);
+            iClassGradeUserService.update(classGradeUser1, classGradeUser);
+        } else {
+            for (UserPeriod userPeriod : listPeriodVo) {
+                LambdaQueryWrapper<UserPeriodStatus> userPeriods = Wrappers.lambdaQuery();
+                userPeriods.eq(UserPeriodStatus::getPeriodId, userPeriod.getId());
+                userPeriods.eq(UserPeriodStatus::getPeriodStatus, 1);
+                userPeriods.notIn(UserPeriodStatus::getStatus, 1);
+                List<UserPeriodStatus> list1 = userPeriodStatusService.list(userPeriods);
+                if (CollectionUtils.isEmpty(list1)) {
+                    return true;
                 }
-                UserPeriodEditBo userPeriodEditBo = new UserPeriodEditBo();
-                userPeriodEditBo.setUserId(userPeriodVo.getUserId());
-                userPeriodEditBo.setGoodsId(userPeriodVo.getGoodsId());
-                userPeriodEditBo.setGradeId(userPeriodVo.getGradeId());
-                userPeriodEditBo.setStatus(bo.getStatus());
-                sendPeriodSMS(userPeriodEditBo);
-                sendPeriodSevenSMS(userPeriodEditBo);
-                LambdaQueryWrapper<ClassGradeUser> classGradeUser = Wrappers.lambdaQuery();
-                classGradeUser.eq(ClassGradeUser::getUserId, userPeriodVo.getUserId());
-                classGradeUser.eq(ClassGradeUser::getGradeId, userPeriodVo.getGradeId());
-                ClassGradeUser classGradeUser1 = new ClassGradeUser();
-                classGradeUser1.setPeriodStatus(0);
-                classGradeUser1.setUpdateTime(DateUtils.getNowTime());
-                List<ClassGradeUser> list1 = iClassGradeUserService.list(classGradeUser);
-                iClassGradeUserService.update(classGradeUser1, classGradeUser);
             }
+            UserPeriodEditBo userPeriodEditBo = new UserPeriodEditBo();
+            userPeriodEditBo.setUserId(userPeriodVo.getUserId());
+            userPeriodEditBo.setGoodsId(userPeriodVo.getGoodsId());
+            userPeriodEditBo.setGradeId(userPeriodVo.getGradeId());
+            userPeriodEditBo.setStatus(bo.getStatus());
+            sendPeriodSMS(userPeriodEditBo);
+            sendPeriodSevenSMS(userPeriodEditBo);
+            LambdaQueryWrapper<ClassGradeUser> classGradeUser = Wrappers.lambdaQuery();
+            classGradeUser.eq(ClassGradeUser::getUserId, userPeriodVo.getUserId());
+            classGradeUser.eq(ClassGradeUser::getGradeId, userPeriodVo.getGradeId());
+            ClassGradeUser classGradeUser1 = new ClassGradeUser();
+            classGradeUser1.setPeriodStatus(0);
+            classGradeUser1.setUpdateTime(DateUtils.getNowTime());
+            List<ClassGradeUser> list1 = iClassGradeUserService.list(classGradeUser);
+            iClassGradeUserService.update(classGradeUser1, classGradeUser);
         }
+
         return true;
     }