Merge remote-tracking branch 'origin/master'

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}
     </select>
     <select id="getVehModelByCreateOrg" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehModelVo">
-        SELECT sid,
-               modelName
-        FROM base_vehicle_model
-        WHERE createOrg = #{createOrg}
+        SELECT DISTINCT
+            m.sid,
+            m.modelName
+        FROM base_vehicle_brand as b LEFT JOIN base_vehicle_model as m ON b.sid = m.carBrand
+        WHERE m.createOrg = #{createOrg}
     </select>
 </mapper>

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")

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")

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")

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("备注")

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(售后服务) <br/>
  * File: AsServicePackageVo.java <br/>
@@ -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<PackageItemVo> itemVos = new ArrayList<>();
+    private List<PackageGoodsVo> goodsVos = new ArrayList<>();
+    private List<PackageAttachItemVo> attachItemVos = new ArrayList<>();
 
 }

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;
 
 }

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; // 备注
+
 
 }

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 {
+
+
+
+}

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 {
+
+
+
+}

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;
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java

@@ -44,10 +44,10 @@ public class AsServiceItemService extends MybatisBaseService<AsServiceItemMapper
             qw.and(wrapper -> 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<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath());
         if (orgSidByPath.getSuccess()) {

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<AsServicePackageMapper, AsServicePackage> {
-	private QueryWrapper<AsServicePackage> createQueryWrapper(AsServicePackageQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<AsServicePackage> qw = new QueryWrapper<>();
-		return qw;
-	}
-	
-	public PagerVo<AsServicePackageVo> listPageVo(PagerQuery<AsServicePackageQuery> pq) {
-		AsServicePackageQuery query = pq.getParams();
-		QueryWrapper<AsServicePackage> qw = createQueryWrapper(query);
-		IPage<AsServicePackage> page = PagerUtil.queryToPage(pq);
-		IPage<AsServicePackageVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<AsServicePackageVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	
-	public void saveOrUpdateDto(AsServicePackageDto dto){
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+
+    private QueryWrapper<AsServicePackage> createQueryWrapper(AsServicePackageQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<AsServicePackage> qw = new QueryWrapper<>();
+        ResultBean<String> 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<AsServicePackageVo> listPageVo(PagerQuery<AsServicePackageQuery> pq) {
+        AsServicePackageQuery query = pq.getParams();
+        QueryWrapper<AsServicePackage> qw = createQueryWrapper(query);
+        IPage<AsServicePackage> page = PagerUtil.queryToPage(pq);
+        IPage<AsServicePackageVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<AsServicePackageVo> 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;
+    }
 }

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 {