1

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java

@@ -123,7 +123,7 @@ public class ScmVehRebateVo implements Vo {
     private String createOrgSid; // 创建组织sid
 	@ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
-    @ApiModelProperty("上传状态(2未上传、3已上传)")
+    @ApiModelProperty("上传状态(0未上传、1已上传)")
     private String uploadState; // 上传状态
     @ApiModelProperty("是否可以点击是否调整")
     private Boolean adjustOrNot;

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

@@ -253,11 +253,11 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         for (ScmVehRebateVo record : pagging.getRecords()) {
             //上传状态：未上传
             if (StringUtils.isBlank(record.getUploadDate()) && StringUtils.isBlank(record.getUploadMoney())) {
-                record.setUploadState("2");
+                record.setUploadState("0");
             }
             //上传状态：已上传
             if (StringUtils.isNotBlank(record.getUploadDate()) && StringUtils.isNotBlank(record.getUploadMoney())) {
-                record.setUploadState("3");
+                record.setUploadState("1");
             }
             //是否调整
             if (new BigDecimal(record.getStayDetermineMoney()).compareTo(BigDecimal.ZERO) == 0){