diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml index 8c0abe912a..e8c640ba2f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml @@ -477,9 +477,10 @@ select * from base_vehmodel_config WHERE modelSid = #{modelSid} and configurationItemsSid = #{configSid} and useOrgSid = #{useOrgSid} \ No newline at end of file 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 4b64876558..6ebb226168 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 @@ -25,6 +25,8 @@ public class AsServiceAttachItem extends BaseEntity { private String aitemCode; @ApiModelProperty("销售价(工时费)=工时单价*工时数") private BigDecimal price; + @ApiModelProperty("成本") + private BigDecimal cost; @ApiModelProperty("排序号") private Integer sortNo; @ApiModelProperty("使用组织sid") 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 c738dbfaab..cd9d07a0a0 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 @@ -62,6 +62,8 @@ public class AsServiceAttachItemDetailsVo implements Vo { private String price; @ApiModelProperty("排序号") private String sortNo; + @ApiModelProperty("成本") + private String cost; @ApiModelProperty("使用组织sid") private String useOrgSid; @ApiModelProperty("创建组织sid") 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 1055fc7ba8..7cb52ee981 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 @@ -63,6 +63,8 @@ public class AsServiceAttachItemDto implements Dto { private String price; @ApiModelProperty("排序号") private String sortNo; + @ApiModelProperty("成本") + private String cost; @ApiModelProperty("使用组织sid") private String useOrgSid; @ApiModelProperty("创建组织sid") 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 bf96579a33..ea69f52c3b 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 @@ -50,12 +50,15 @@ import java.math.BigDecimal; @ApiModel(value = "附加项目 视图数据对象", description = "附加项目 视图数据对象") public class AsServiceAttachItemVo implements Vo { + private String sid; @ApiModelProperty("项目名称") private String aitemName; @ApiModelProperty("项目名称") private String aitemCode; @ApiModelProperty("销售价(工时费)=工时单价*工时数") private String price; + @ApiModelProperty("成本") + private String cost; @ApiModelProperty("排序号") private String sortNo; @ApiModelProperty("备注") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/AsServicePackageDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/AsServicePackageDetailsVo.java index 38e7f5f9f3..c6d2d06042 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/AsServicePackageDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/AsServicePackageDetailsVo.java @@ -32,6 +32,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * Project: yxt-as(售后服务)
* File: AsServicePackageVo.java
@@ -51,15 +54,17 @@ public class AsServicePackageDetailsVo implements Vo { private String sid; // sid - @ApiModelProperty("套餐名称") + @ApiModelProperty("套餐名称") private String packageName; // 套餐名称 - @ApiModelProperty("套餐编码") - private String packageCode; // 套餐编码 - @ApiModelProperty("排序号") - private Integer sortNo; // 排序号 - @ApiModelProperty("使用组织sid") + @ApiModelProperty("备注") + private String remarks; // 备注 + @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid + private String orgPath; + private List itemVos = new ArrayList<>(); + private List goodsVos = new ArrayList<>(); + private List attachItemVos = new ArrayList<>(); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/AsServicePackageQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/AsServicePackageQuery.java index b7200433d9..ca1b14baab 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/AsServicePackageQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/AsServicePackageQuery.java @@ -51,13 +51,6 @@ public class AsServicePackageQuery implements Query { @ApiModelProperty("套餐名称") private String packageName; // 套餐名称 - @ApiModelProperty("套餐编码") - private String packageCode; // 套餐编码 - @ApiModelProperty("排序号") - private Integer sortNo; // 排序号 - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid + private String orgPath; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/AsServicePackageVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/AsServicePackageVo.java index 1d25026bd6..94b589c63b 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/AsServicePackageVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/AsServicePackageVo.java @@ -53,13 +53,8 @@ public class AsServicePackageVo implements Vo { @ApiModelProperty("套餐名称") private String packageName; // 套餐名称 - @ApiModelProperty("套餐编码") - private String packageCode; // 套餐编码 - @ApiModelProperty("排序号") - private Integer sortNo; // 排序号 - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid + @ApiModelProperty("备注") + private String remarks; // 备注 + } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageAttachItemVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageAttachItemVo.java new file mode 100644 index 0000000000..3491cc7dea --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageAttachItemVo.java @@ -0,0 +1,15 @@ +package com.yxt.anrui.as.api.asservicepackage; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/3/11 8:54 + */ +@Data +public class PackageAttachItemVo { + + + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageGoodsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageGoodsVo.java new file mode 100644 index 0000000000..f4b1d966fd --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageGoodsVo.java @@ -0,0 +1,15 @@ +package com.yxt.anrui.as.api.asservicepackage; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/3/11 8:54 + */ +@Data +public class PackageGoodsVo { + + + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageItemVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageItemVo.java new file mode 100644 index 0000000000..581ff2cfa6 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageItemVo.java @@ -0,0 +1,36 @@ +package com.yxt.anrui.as.api.asservicepackage; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author Fan + * @description + * @date 2024/3/11 8:54 + */ +@Data +public class PackageItemVo { + + private String sitemSid; + @ApiModelProperty("项目名称") + private String sitemName; + @ApiModelProperty("项目名称") + private String sitemCode; + @ApiModelProperty("工种sid（分类）") + private String serviceTypeSid; + @ApiModelProperty("工种（分类）") + private String serviceType; + @ApiModelProperty("工时单价") + private String hourPrice; + @ApiModelProperty("工时数") + private String hours; + @ApiModelProperty("销售价(工时费)=工时单价*工时数") + private String price; + @ApiModelProperty("科目sid") + private String subjectSid; + @ApiModelProperty("科目名称") + private String subjectName; + +} 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 7f41dc81f4..673392a4b9 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 @@ -44,10 +44,10 @@ public class AsServiceItemService extends MybatisBaseService wrapper.like("sitemName", query.getSitemName()).or().like("sitemCode", query.getSitemName())); } if (StringUtils.isNotBlank(query.getServiceType())) { - qw.eq("serviceType", query.getServiceType()); + qw.like("serviceType", query.getServiceType()); } if (StringUtils.isNotBlank(query.getManufacturer())) { - qw.eq("manufacturer", query.getManufacturer()); + qw.like("manufacturer", query.getManufacturer()); } ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()); if (orgSidByPath.getSuccess()) { diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java index 837621a061..89aea0d91c 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java @@ -28,6 +28,8 @@ package com.yxt.anrui.as.biz.asservicepackage; 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.feign.portal.sysstafforg.SysStaffOrgFeign; +import com.yxt.common.core.result.ResultBean; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -39,6 +41,7 @@ import com.yxt.anrui.as.api.asservicepackage.AsServicePackageVo; import com.yxt.anrui.as.api.asservicepackage.AsServicePackageDetailsVo; import com.yxt.anrui.as.api.asservicepackage.AsServicePackageDto; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -56,51 +59,62 @@ import org.springframework.stereotype.Service; */ @Service public class AsServicePackageService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(AsServicePackageQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - AsServicePackageQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(AsServicePackageDto dto){ + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + + private QueryWrapper createQueryWrapper(AsServicePackageQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()); + if (orgSidByPath.getSuccess()) { + qw.eq("useOrgSid", orgSidByPath.getData()); + } + if (StringUtils.isNotBlank(query.getPackageName())) { + qw.like("packageName", query.getPackageName()); + } + qw.orderByDesc("createTime"); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + AsServicePackageQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(AsServicePackageDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(AsServicePackageDto dto){ - AsServicePackage entity = new AsServicePackage(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(AsServicePackageDto dto){ - String dtoSid = dto.getSid(); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(AsServicePackageDto dto) { + AsServicePackage entity = new AsServicePackage(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(AsServicePackageDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - AsServicePackage entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public AsServicePackageDetailsVo fetchDetailsVoBySid(String sid){ - AsServicePackage entity = fetchBySid(sid); - AsServicePackageDetailsVo vo = new AsServicePackageDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + } + AsServicePackage entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public AsServicePackageDetailsVo fetchDetailsVoBySid(String sid) { + AsServicePackage entity = fetchBySid(sid); + AsServicePackageDetailsVo vo = new AsServicePackageDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsmanufacturer/WmsManufacturerFeign.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsmanufacturer/WmsManufacturerFeign.java index ad4db4fba6..11e9f27b4d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsmanufacturer/WmsManufacturerFeign.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsmanufacturer/WmsManufacturerFeign.java @@ -17,7 +17,7 @@ import java.util.List; @FeignClient( contextId = "yxt-wms-WmsManufacturer", name = "yxt-wms", - path = "apiadmin/base/wmsmanufacturer", + path = "apiadmin/base/basemanufacturer", fallback = WmsManufacturerFeignFallback.class ) public interface WmsManufacturerFeign {