diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItem.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItem.java
index 1ca39eb3ce..4b64876558 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItem.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItem.java
@@ -21,11 +21,11 @@ public class AsServiceAttachItem extends BaseEntity {
@ApiModelProperty("项目名称")
private String aitemName;
- @ApiModelProperty("项目名称")
+ @ApiModelProperty("项目编码")
private String aitemCode;
@ApiModelProperty("销售价(工时费)=工时单价*工时数")
private BigDecimal price;
- @ApiModelProperty("工时数")
+ @ApiModelProperty("排序号")
private Integer sortNo;
@ApiModelProperty("使用组织sid")
private String useOrgSid;
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItemDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItemDetailsVo.java
index 482cf4ee1b..c738dbfaab 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItemDetailsVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItemDetailsVo.java
@@ -28,8 +28,11 @@ package com.yxt.anrui.as.api.asserviceattachitem;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+
/**
* Project: yxt-as(售后服务)
* File: AsServicePackageVo.java
@@ -46,7 +49,23 @@ import lombok.Data;
@Data
@ApiModel(value = "附加项目 视图数据详情", description = "附加项目 视图数据详情")
public class AsServiceAttachItemDetailsVo implements Vo {
-
-
+ private String sid;
+ @ApiModelProperty("备注信息")
+ private String remarks;
+ @ApiModelProperty("创建者")
+ private String createBySid;
+ @ApiModelProperty("项目名称")
+ private String aitemName;
+ @ApiModelProperty("项目编码")
+ private String aitemCode;
+ @ApiModelProperty("销售价(工时费)=工时单价*工时数")
+ private String price;
+ @ApiModelProperty("排序号")
+ private String sortNo;
+ @ApiModelProperty("使用组织sid")
+ private String useOrgSid;
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid;
+ private String orgPath;
}
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItemDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItemDto.java
index 286cd3b711..1055fc7ba8 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItemDto.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItemDto.java
@@ -28,8 +28,11 @@ package com.yxt.anrui.as.api.asserviceattachitem;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+
/**
* Project: yxt-as(售后服务)
* File: AsServicePackageDto.java
@@ -47,6 +50,23 @@ import lombok.Data;
@ApiModel(value = "附加项目 数据传输对象", description = "附加项目 数据传输对象")
public class AsServiceAttachItemDto implements Dto {
-
+ private String sid;
+ @ApiModelProperty("备注信息")
+ private String remarks;
+ @ApiModelProperty("创建者")
+ private String createBySid;
+ @ApiModelProperty("项目名称")
+ private String aitemName;
+ @ApiModelProperty("项目编码")
+ private String aitemCode;
+ @ApiModelProperty("销售价(工时费)=工时单价*工时数")
+ private String price;
+ @ApiModelProperty("排序号")
+ private String sortNo;
+ @ApiModelProperty("使用组织sid")
+ private String useOrgSid;
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid;
+ private String orgPath;
}
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItemQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItemQuery.java
index 8519559f7b..ba4b18b01a 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItemQuery.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItemQuery.java
@@ -28,6 +28,7 @@ package com.yxt.anrui.as.api.asserviceattachitem;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -47,6 +48,9 @@ import lombok.Data;
@ApiModel(value = "附加项目 查询条件", description = "附加项目 查询条件")
public class AsServiceAttachItemQuery implements Query {
-
+ @ApiModelProperty("项目名称")
+ private String aitemName;
+ @ApiModelProperty("全路径")
+ private String orgPath;
}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItemVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItemVo.java
index b4f152a12a..bf96579a33 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItemVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItemVo.java
@@ -28,8 +28,11 @@ package com.yxt.anrui.as.api.asserviceattachitem;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+
/**
* Project: yxt-as(售后服务)
* File: AsServicePackageVo.java
@@ -47,6 +50,14 @@ import lombok.Data;
@ApiModel(value = "附加项目 视图数据对象", description = "附加项目 视图数据对象")
public class AsServiceAttachItemVo implements Vo {
-
-
+ @ApiModelProperty("项目名称")
+ private String aitemName;
+ @ApiModelProperty("项目名称")
+ private String aitemCode;
+ @ApiModelProperty("销售价(工时费)=工时单价*工时数")
+ private String price;
+ @ApiModelProperty("排序号")
+ private String sortNo;
+ @ApiModelProperty("备注")
+ private String remarks;
}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemDetailsVo.java
index 58ba3db081..91a3c8fa43 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemDetailsVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemDetailsVo.java
@@ -90,5 +90,6 @@ public class AsServiceItemDetailsVo implements Vo {
private String useOrgSid;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
+ private String orgPath;
}
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemDto.java
index c4bffcc16d..c979aebbbb 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemDto.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemDto.java
@@ -88,5 +88,5 @@ public class AsServiceItemDto implements Dto {
private String useOrgSid;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
-
+ private String orgPath;
}
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemQuery.java
index 2f586ed01e..1b4acc0e12 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemQuery.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemQuery.java
@@ -55,6 +55,6 @@ public class AsServiceItemQuery implements Query {
@ApiModelProperty("厂家")
private String manufacturer;
- @ApiModelProperty("使用组织sid")
- private String useOrgSid;
+ @ApiModelProperty("全路径")
+ private String orgPath;
}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/ServiceTypeVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/ServiceTypeVo.java
new file mode 100644
index 0000000000..b4cf57cd28
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/ServiceTypeVo.java
@@ -0,0 +1,14 @@
+package com.yxt.anrui.as.api.asserviceitem;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/3/8 10:03
+ */
+@Data
+public class ServiceTypeVo {
+ private String serviceTypeSid;
+ private String serviceType;
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceattachitem/AsServiceAttachItemRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceattachitem/AsServiceAttachItemRest.java
index 9b2b9d1574..64fd95a3c4 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceattachitem/AsServiceAttachItemRest.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceattachitem/AsServiceAttachItemRest.java
@@ -1,17 +1,18 @@
package com.yxt.anrui.as.biz.asserviceattachitem;
+import com.yxt.anrui.as.api.asserviceattachitem.AsServiceAttachItemDetailsVo;
+import com.yxt.anrui.as.api.asserviceattachitem.AsServiceAttachItemDto;
import com.yxt.anrui.as.api.asserviceattachitem.AsServiceAttachItemQuery;
import com.yxt.anrui.as.api.asserviceattachitem.AsServiceAttachItemVo;
+import com.yxt.anrui.as.api.asserviceitem.AsServiceItemDetailsVo;
+import com.yxt.anrui.as.api.asserviceitem.AsServiceItemDto;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
/**
* @author fzz
@@ -34,4 +35,28 @@ public class AsServiceAttachItemRest {
PagerVo pv = asServiceAttachItemService.listPageVo(pq);
return rb.success().setData(pv);
}
+
+ @ApiOperation("详情查看")
+ @GetMapping("/fetchDetails/{sid}")
+ public ResultBean fetchDetails(@PathVariable("sid") String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ AsServiceAttachItemDetailsVo vo = asServiceAttachItemService.fetchDetails(sid);
+ return rb.success().setData(vo);
+ }
+
+ @ApiOperation("修改保存")
+ @PostMapping("/saveAttachItem")
+ public ResultBean saveAttachItem(@RequestBody AsServiceAttachItemDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ asServiceAttachItemService.saveAttachItem(dto);
+ return rb.success();
+ }
+
+ @ApiOperation("根据sid批量删除")
+ @DeleteMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids) {
+ ResultBean rb = ResultBean.fireFail();
+ asServiceAttachItemService.delBySids(sids);
+ return rb.success();
+ }
}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceattachitem/AsServiceAttachItemService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceattachitem/AsServiceAttachItemService.java
index 44e049aced..bcf3ec07bc 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceattachitem/AsServiceAttachItemService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceattachitem/AsServiceAttachItemService.java
@@ -1,18 +1,21 @@
package com.yxt.anrui.as.biz.asserviceattachitem;
+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.asserviceattachitem.AsServiceAttachItem;
-import com.yxt.anrui.as.api.asserviceattachitem.AsServiceAttachItemQuery;
-import com.yxt.anrui.as.api.asserviceattachitem.AsServiceAttachItemVo;
+import com.yxt.anrui.as.api.asserviceattachitem.*;
import com.yxt.anrui.as.api.asserviceitem.AsServiceItem;
import com.yxt.anrui.as.api.asserviceitem.AsServiceItemQuery;
import com.yxt.anrui.as.api.asserviceitem.AsServiceItemVo;
+import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
@@ -21,15 +24,26 @@ import org.springframework.stereotype.Service;
@Service
public class AsServiceAttachItemService extends MybatisBaseService {
+ @Autowired
+ private SysStaffOrgFeign sysStaffOrgFeign;
+
+
private QueryWrapper createQueryWrapper(AsServiceAttachItemQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper qw = new QueryWrapper<>();
+ if (StringUtils.isNotBlank(query.getAitemName())) {
+ qw.and(wrapper -> wrapper.like("aitemName", query.getAitemName()).or().like("aitemCode", query.getAitemName()));
+ }
+ ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath());
+ if (orgSidByPath.getSuccess()) {
+ qw.eq("useOrgSid", orgSidByPath.getData());
+ }
+ qw.orderByAsc("sortNo");
return qw;
}
-
public PagerVo listPageVo(PagerQuery pq) {
AsServiceAttachItemQuery query = pq.getParams();
QueryWrapper qw = createQueryWrapper(query);
@@ -38,4 +52,34 @@ public class AsServiceAttachItemService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null);
return p;
}
+
+ public AsServiceAttachItemDetailsVo fetchDetails(String sid) {
+ AsServiceAttachItemDetailsVo vo = new AsServiceAttachItemDetailsVo();
+ AsServiceAttachItem asServiceAttachItem = fetchBySid(sid);
+ if (null != asServiceAttachItem) {
+ BeanUtil.copyProperties(asServiceAttachItem, vo);
+ }
+ return vo;
+ }
+
+ public void saveAttachItem(AsServiceAttachItemDto dto) {
+ if (StringUtils.isNotBlank(dto.getSid())) {
+ AsServiceAttachItem item = fetchBySid(dto.getSid());
+ BeanUtil.copyProperties(dto, item, "id", "sid");
+ baseMapper.updateById(item);
+ } else {
+ AsServiceAttachItem item = new AsServiceAttachItem();
+ BeanUtil.copyProperties(dto, item, "id", "sid");
+ String orgPath = dto.getOrgPath();
+ ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath);
+ if (orgSidByPath.getSuccess()) {
+ String useOrgSid = orgSidByPath.getData();
+ item.setUseOrgSid(useOrgSid);
+ item.setCreateOrgSid(useOrgSid);
+ }
+ baseMapper.insert(item);
+ }
+ }
+
+
}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.java
index 8204e81a40..d69bd9c372 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.java
@@ -7,14 +7,19 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.as.api.asserviceitem.AsServiceItem;
import com.yxt.anrui.as.api.asserviceitem.AsServiceItemVo;
+import com.yxt.anrui.as.api.asserviceitem.ServiceTypeVo;
import com.yxt.anrui.as.api.asservicepackage.AsServicePackageVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
@Mapper
public interface AsServiceItemMapper extends BaseMapper {
IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+
+ List getServiceType(@Param("useOrgSid") String useOrgSid);
}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.xml
index dcfb6a16db..ded09bef97 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.xml
@@ -8,4 +8,12 @@
+
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemRest.java
index 7631e38e69..cf7a58876b 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemRest.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemRest.java
@@ -52,22 +52,30 @@ public class AsServiceItemRest {
@ApiOperation("获取分公司下厂家")
@GetMapping("/getManufacturers")
- public ResultBean> getManufacturers(@RequestParam("useOrgSid") String useOrgSid) {
+ public ResultBean> getManufacturers(@RequestParam("orgPath") String orgPath) {
ResultBean rb = ResultBean.fireFail();
- List list = asServiceItemService.getManufacturers(useOrgSid);
+ List list = asServiceItemService.getManufacturers(orgPath);
return rb.success().setData(list);
}
@ApiOperation("获取分公司下车型")
@GetMapping("/getVehModel")
- public ResultBean> getVehModel(@RequestParam("useOrgSid") String useOrgSid) {
+ public ResultBean> getVehModel(@RequestParam("orgPath") String orgPath) {
ResultBean rb = ResultBean.fireFail();
- List list = asServiceItemService.getVehModel(useOrgSid);
+ List list = asServiceItemService.getVehModel(orgPath);
+ return rb.success().setData(list);
+ }
+
+ @ApiOperation("获取分公司下工种")
+ @GetMapping("/getServiceType")
+ public ResultBean> getServiceType(@RequestParam("orgPath") String orgPath) {
+ ResultBean rb = ResultBean.fireFail();
+ List list = asServiceItemService.getServiceType(orgPath);
return rb.success().setData(list);
}
@ApiOperation("根据sid批量删除")
- @PostMapping("/delBySids")
+ @DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids) {
ResultBean rb = ResultBean.fireFail();
asServiceItemService.delBySids(sids);
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java
index 9b029d131d..7f41dc81f4 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java
@@ -14,7 +14,9 @@ import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -31,6 +33,8 @@ public class AsServiceItemService extends MybatisBaseService createQueryWrapper(AsServiceItemQuery query) {
// todo: 这里根据具体业务调整查询条件
@@ -45,7 +49,10 @@ public class AsServiceItemService extends MybatisBaseService orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath());
+ if (orgSidByPath.getSuccess()) {
+ qw.eq("useOrgSid", orgSidByPath.getData());
+ }
qw.orderByAsc("sortNo");
return qw;
}
@@ -76,12 +83,24 @@ public class AsServiceItemService extends MybatisBaseService orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath);
+ if (orgSidByPath.getSuccess()) {
+ String useOrgSid = orgSidByPath.getData();
+ item.setUseOrgSid(useOrgSid);
+ item.setCreateOrgSid(useOrgSid);
+ }
baseMapper.insert(item);
}
}
- public List getManufacturers(String useOrgSid) {
+ public List getManufacturers(String orgPath) {
List voList = new ArrayList<>();
+ String useOrgSid = "";
+ ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath);
+ if (orgSidByPath.getSuccess()) {
+ useOrgSid = orgSidByPath.getData();
+ }
List wmsManufacturerVos = wmsManufacturerFeign.getAllTypeByUseOrgSid(useOrgSid).getData();
if (!wmsManufacturerVos.isEmpty()) {
for (WmsManufacturerVo wmsManufacturerVo : wmsManufacturerVos) {
@@ -94,8 +113,13 @@ public class AsServiceItemService extends MybatisBaseService getVehModel(String useOrgSid) {
+ public List getVehModel(String orgPath) {
List voList = new ArrayList<>();
+ String useOrgSid = "";
+ ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath);
+ if (orgSidByPath.getSuccess()) {
+ useOrgSid = orgSidByPath.getData();
+ }
List baseVehModelVos = baseVehicleModelFeign.getVehModelByCreateOrg(useOrgSid).getData();
if (!baseVehModelVos.isEmpty()) {
for (BaseVehModelVo baseVehModelVo : baseVehModelVos) {
@@ -107,4 +131,14 @@ public class AsServiceItemService extends MybatisBaseService getServiceType(String orgPath) {
+ String useOrgSid = "";
+ ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath);
+ if (orgSidByPath.getSuccess()) {
+ useOrgSid = orgSidByPath.getData();
+ }
+ List voList = baseMapper.getServiceType(useOrgSid);
+ return voList;
+ }
}