|
|
@@ -25,7 +25,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.core.metadata.OrderItem;
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
@@ -48,15 +47,10 @@ import com.qunzhixinxi.hnqz.admin.mapper.*;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.*;
|
|
|
import com.qunzhixinxi.hnqz.common.core.util.R;
|
|
|
import com.qunzhixinxi.hnqz.common.data.datascope.DataScope;
|
|
|
-import com.qunzhixinxi.hnqz.common.ding.enums.DingEnum;
|
|
|
import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
|
|
|
import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
-import lombok.RequiredArgsConstructor;
|
|
|
-import lombok.val;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
-import org.apache.poi.xssf.extractor.XSSFExportToXml;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.scheduling.annotation.Async;
|
|
|
import org.springframework.scheduling.annotation.AsyncResult;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@@ -70,9 +64,7 @@ import java.util.*;
|
|
|
import java.util.concurrent.Future;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
-import static com.qunzhixinxi.hnqz.admin.enums.ReportEnum.REPORT_STATUS_CREATE;
|
|
|
import static com.qunzhixinxi.hnqz.admin.enums.ReportEnum.REPORT_STATUS_END;
|
|
|
-import static com.qunzhixinxi.hnqz.admin.enums.ReportEnum.REPORT_STATUS_SUBMIT;
|
|
|
|
|
|
/**
|
|
|
* 积分包
|
|
|
@@ -1984,7 +1976,8 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
|
|
|
|
|
|
|
|
|
// 设置
|
|
|
- scorePackage.setYsh(yshtt >= 100 ? scorePackage.getScore() : ysh);
|
|
|
+ // scorePackage.setYsh(yshtt >= 100 ? scorePackage.getScore() : ysh);
|
|
|
+ scorePackage.setYsh(ysh);
|
|
|
scorePackage.setYjd((int) yjd);
|
|
|
scorePackage.setYjddsh((int) yjddsh);
|
|
|
scorePackage.setDsh(dsh);
|
shc