EMRGE

zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -287,6 +287,7 @@ public class CommonController extends BaseController {
         UserPeriodEditBo queryBo = new UserPeriodEditBo();
         queryBo.setRollBackPlat(2);
         queryBo.setOrderGoodsId(bo.getOrderGoodsId());
+        queryBo.setAuditUserName("旧系统操作");
         iUserPeriodService.confirmRollbackPeriod(queryBo);
         return AjaxResult.success();
     }

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

@@ -91,4 +91,6 @@ public class UserPeriodEditBo {
     @ApiModelProperty("重学原因")
     @NotBlank(message = "重学原因")
     private String allReStudyReason;
+
+    private String auditUserName;
 }

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

@@ -679,6 +679,8 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             periodQueryBo.setGradeId(classGradeUser.getGradeId());
             periodQueryBo.setUserId(classGradeUser.getUserId());
             periodQueryBo.setPeriodStatus(1);
+            periodQueryBo.setUserId(classGradeUser.getUserId());
+            periodQueryBo.setGradeId(classGradeUser.getGradeId());
             List<UserPeriodStatusVo> upsList = userPeriodStatusService.selectPeriodStatus(periodQueryBo);
             for(UserPeriodStatusVo periodStatusVo : upsList){
                 UserPeriod period = getById(periodStatusVo.getPeriodId());
@@ -692,7 +694,11 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                     userPeriodStatus.setUpdateTime(DateUtils.getNowTime());
                     userPeriodStatus.setAuditTime(DateUtils.getNowTime());
                     userPeriodStatus.setAuditReason(bo.getAllReStudyReason());
-                    userPeriodStatus.setAuditUserName("系统全部打回");
+                    if(Validator.isEmpty(bo.getAuditUserName())){
+                        userPeriodStatus.setAuditUserName(SecurityUtils.getUsername());
+                    }else{
+                        userPeriodStatus.setAuditUserName(bo.getAuditUserName());
+                    }
                     LambdaQueryWrapper<UserPeriodStatus> userPeriods = Wrappers.lambdaQuery();
                     userPeriods.eq(UserPeriodStatus::getId, periodStatusVo.getId());
                     userPeriodStatusService.update(userPeriodStatus, userPeriods);

zhongzheng-system/src/main/resources/mapper/modules/grade/UserPeriodStatusMapper.xml

@@ -97,4 +97,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ups.create_time asc
     </select>
 
+
+
 </mapper>