|
|
@@ -947,13 +947,13 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
|
|
|
@Override
|
|
|
public HashMap<String, Object> getPlush(ClassGradeUserQueryBo bo) {
|
|
|
HashMap<String, Object> stringObjectHashMap = new HashMap<>();
|
|
|
- if (ObjectUtils.isNotEmpty(bo.getPeriodPlush()) && bo.getPeriodPlush() != 1) {
|
|
|
+ if (ObjectUtils.isNotEmpty(bo.getOfficialStatus()) && bo.getOfficialStatus() != 1) {
|
|
|
Integer notPlush = this.baseMapper.getPlush(bo);
|
|
|
stringObjectHashMap.put("notPlush", notPlush);
|
|
|
stringObjectHashMap.put("plush", 0);
|
|
|
} else {
|
|
|
Integer allPlush = this.baseMapper.getPlush(bo);
|
|
|
- bo.setPeriodPlush(1);
|
|
|
+ bo.setOfficialStatus(1);
|
|
|
Integer plush = this.baseMapper.getPlush(bo);
|
|
|
stringObjectHashMap.put("plush", plush);
|
|
|
stringObjectHashMap.put("notPlush", allPlush - plush);
|