更改

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

@@ -210,7 +210,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         IPage<ScmSpecialRebateVo> pagging = baseMapper.selectPageVo(page, qw);
         for (ScmSpecialRebateVo record : pagging.getRecords()) {
             if (StringUtils.isNotBlank(record.getSecondaryUploadMoney())) {
-                if (Integer.parseInt(record.getSecondaryUploadMoney()) > 0 && "是".equals(record.getIsAdjustment())) {
+                if (new BigDecimal(record.getSecondaryUploadMoney()).compareTo(BigDecimal.ZERO) == 1 && "是".equals(record.getIsAdjustment())) {
                     record.setSecondCheckState("是");
                 } else {
                     record.setSecondCheckState("否");
@@ -556,7 +556,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 record.setUploadState("1");
             }
             if (StringUtils.isNotBlank(record.getSecondaryUploadMoney())) {
-                if (Integer.parseInt(record.getSecondaryUploadMoney()) > 0 && "是".equals(record.getIsAdjustment())) {
+                if (new BigDecimal(record.getSecondaryUploadMoney()).compareTo(BigDecimal.ZERO) == 1 && "是".equals(record.getIsAdjustment())) {
                     record.setSecondCheckState("是");
                 } else {
                     record.setSecondCheckState("否");
@@ -695,7 +695,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 record.setUploadState("1");
             }
             if (StringUtils.isNotBlank(record.getSecondaryUploadMoney())) {
-                if (Integer.parseInt(record.getSecondaryUploadMoney()) > 0 && "是".equals(record.getIsAdjustment())) {
+                if (new BigDecimal(record.getSecondaryUploadMoney()).compareTo(BigDecimal.ZERO) == 1 && "是".equals(record.getIsAdjustment())) {
                     record.setSecondCheckState("是");
                 } else {
                     record.setSecondCheckState("否");

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java

@@ -25,8 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.scm.biz.scmvehrebate;
 
-import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateExcelVo;
-import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateQuery;
 import com.yxt.anrui.scm.api.scmvehrebate.*;
 import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -35,36 +33,20 @@ import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.compress.utils.IOUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.text.ParseException;
 import java.util.List;
 
-/**
- * Project: anrui-scm(单车返利) <br/>
- * File: ScmVehRebateFeignFallback.java <br/>
- * Class: com.yxt.anrui.scm.biz.scmvehrebate.ScmVehRebateRest <br/>
- * Description: 单车返利表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-08-24 09:01:54 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "单车返利表")
 @RestController
 @RequestMapping("v1/scmvehrebate")

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -210,7 +210,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 record.setCalculationStandard(record.getCalculationStandard() + "%");
             }
             if (StringUtils.isNotBlank(record.getSecondaryUploadMoney())) {
-                if (Integer.parseInt(record.getSecondaryUploadMoney()) > 0 && "是".equals(record.getIsAdjustment())) {
+                if (new BigDecimal(record.getSecondaryUploadMoney()).compareTo(BigDecimal.ZERO) == 1 && "是".equals(record.getIsAdjustment())) {
                     record.setSecondCheckState("是");
                 } else {
                     record.setSecondCheckState("否");
@@ -660,7 +660,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 record.setUploadState("1");
             }
             if (StringUtils.isNotBlank(record.getSecondaryUploadMoney())) {
-                if (Integer.parseInt(record.getSecondaryUploadMoney()) > 0 && "是".equals(record.getIsAdjustment())) {
+                if (new BigDecimal(record.getSecondaryUploadMoney()).compareTo(BigDecimal.ZERO) == 1 && "是".equals(record.getIsAdjustment())) {
                     record.setSecondCheckState("是");
                 } else {
                     record.setSecondCheckState("否");