diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceaccomm/AsServiceAccommDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceaccomm/AsServiceAccommDetailsVo.java
index 9743a21507..828124ecbf 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceaccomm/AsServiceAccommDetailsVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceaccomm/AsServiceAccommDetailsVo.java
@@ -57,21 +57,21 @@ public class AsServiceAccommDetailsVo implements Vo {
private String remarks;
@ApiModelProperty("申请人sid")
private String createBySid;
- @ApiModelProperty("岗位sid")
+ @ApiModelProperty("岗位sid")
private String postSid; // 岗位sid
- @ApiModelProperty("岗位名称")
+ @ApiModelProperty("岗位名称")
private String postName; // 岗位名称
- @ApiModelProperty("提成比例")
+ @ApiModelProperty("提成比例")
private BigDecimal commRatio; // 提成比例
- @ApiModelProperty("排序")
+ @ApiModelProperty("排序")
private Integer sortNo; // 排序
- @ApiModelProperty("部门sid")
+ @ApiModelProperty("部门sid")
private String useOrgSid; // 部门sid
- @ApiModelProperty("部门名称")
+ @ApiModelProperty("部门名称")
private String useOrgName; // 部门名称
- @ApiModelProperty("创建组织名称")
+ @ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
- @ApiModelProperty("创建组织sid")
+ @ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("是否曾备案")
private Integer isBa;
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceaccomm/AsServiceAccommService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceaccomm/AsServiceAccommService.java
index 04eaa429ee..0ec388c30e 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceaccomm/AsServiceAccommService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceaccomm/AsServiceAccommService.java
@@ -28,7 +28,6 @@ package com.yxt.anrui.as.biz.asserviceaccomm;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.as.api.asserviceitemapply.AsServiceItemApplyVo;
import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery;
import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
@@ -49,23 +48,9 @@ import com.yxt.anrui.as.api.asserviceaccomm.AsServiceAccommDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
-/**
- * Project: yxt-as(销售配件提成)
- * File: AsServiceAccommService.java
- * Class: com.yxt.anrui.as.biz.asserviceaccomm.AsServiceAccommService
- * Description: 配件销售提成 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-08-30 09:09:58
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Service
public class AsServiceAccommService extends MybatisBaseService {
@@ -122,6 +107,15 @@ public class AsServiceAccommService extends MybatisBaseService page = PagerUtil.queryToPage(pq);
IPage pagging = baseMapper.selectPageVo(page, qw);
+ for (AsServiceAccommVo record : pagging.getRecords()) {
+ if ("1".equals(record.getState())) {
+ record.setState("未备案");
+ } else if ("2".equals(record.getState())) {
+ record.setState("备案中");
+ } else if ("0".equals(record.getState())) {
+ record.setState("已备案");
+ }
+ }
PagerVo p = PagerUtil.pageToVo(pagging, null);
return p;
}