售后服务服务项目、附加项目部分代码

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehModelVo.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.base.api.basevehiclemodel;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/3/7 15:16
+ */
+@Data
+public class BaseVehModelVo {
+    private String sid;
+    private String modelName;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java

@@ -219,4 +219,9 @@ public interface BaseVehicleModelFeign {
     @ApiOperation("根据车型sid查询车型信息")
     @GetMapping("/selectDetails/{modelSid}")
     ResultBean<BaseVehicleModel> selectDetails(@PathVariable(value = "modelSid") String modelSid);
+
+    @ApiOperation("查询分公司下所有的车型")
+    @GetMapping("/getVehModelByCreateOrg")
+    public ResultBean<List<BaseVehModelVo>> getVehModelByCreateOrg(@RequestParam("createOrg") String createOrg);
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java

@@ -125,6 +125,11 @@ public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<BaseVehModelVo>> getVehModelByCreateOrg(String createOrg) {
+        return null;
+    }
+
 
     /*@Override
     public ResultBean<PagerVo<BaseVehicleModelListVo>> selectPage(PagerQuery<BaseVehicleModelListQuery> query) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java

@@ -171,4 +171,6 @@ public interface BaseVehicleModelMapper extends BaseMapper<BaseVehicleModel> {
     List<BaseVehicleModel> selectBycreateOrg(String sid);
 
     BaseVehmodelConfig selectDetailss(@Param("modelSid") String vehicleSid, @Param("configSid") String configSid, @Param("useOrgSid") String createOrgSid);
+
+    List<BaseVehModelVo> getVehModelByCreateOrg(@Param("createOrg") String createOrg);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml

@@ -476,4 +476,10 @@
     <select id="selectDetailss" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfig">
         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>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java

@@ -335,6 +335,11 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
         return baseVehicleModelService.selectDetails(modelSid);
     }
 
+    @Override
+    public ResultBean<List<BaseVehModelVo>> getVehModelByCreateOrg(String createOrg) {
+        return baseVehicleModelService.getVehModelByCreateOrg(createOrg);
+    }
+
 
 //    @Override
 //    public ResultBean<PagerVo<BaseVehicleModelListVo>> selectPage(PagerQuery<BaseVehicleModelListQuery> query) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java

@@ -711,4 +711,10 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
     public BaseVehmodelConfig selectDetailss(String vehicleSid, String configSid, String createOrgSid) {
         return baseMapper.selectDetailss(vehicleSid,configSid,createOrgSid);
     }
+
+    public ResultBean<List<BaseVehModelVo>> getVehModelByCreateOrg(String createOrg) {
+        ResultBean rb = ResultBean.fireFail();
+        List<BaseVehModelVo> voList = baseMapper.getVehModelByCreateOrg(createOrg);
+        return rb.success().setData(voList);
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItem.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.as.api.asserviceattachitem;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
 import com.yxt.common.core.domain.Entity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -16,7 +17,7 @@ import java.math.BigDecimal;
 @Data
 @ApiModel(value = "附加项目", description = "附加项目")
 @TableName("as_service_attachitem")
-public class AsServiceAttachItem extends Entity {
+public class AsServiceAttachItem extends BaseEntity {
 
     @ApiModelProperty("项目名称")
     private String aitemName;

yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItemDetailsVo.java

@@ -0,0 +1,52 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asserviceattachitem;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackage.AsServicePackageVo <br/>
+ * Description: 附加项目 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "附加项目 视图数据详情", description = "附加项目 视图数据详情")
+public class AsServiceAttachItemDetailsVo implements Vo {
+
+
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItemDto.java

@@ -0,0 +1,52 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asserviceattachitem;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageDto.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackage.AsServicePackageDto <br/>
+ * Description: 附加项目 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "附加项目 数据传输对象", description = "附加项目 数据传输对象")
+public class AsServiceAttachItemDto implements Dto {
+
+
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItemQuery.java

@@ -0,0 +1,52 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asserviceattachitem;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageQuery.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackage.AsServicePackageQuery <br/>
+ * Description: 附加项目 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "附加项目 查询条件", description = "附加项目 查询条件")
+public class AsServiceAttachItemQuery implements Query {
+
+
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItemVo.java

@@ -0,0 +1,52 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asserviceattachitem;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackage.AsServicePackageVo <br/>
+ * Description: 附加项目 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "附加项目 视图数据对象", description = "附加项目 视图数据对象")
+public class AsServiceAttachItemVo implements Vo {
+
+
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItem.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.as.api.asserviceitem;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
 import com.yxt.common.core.domain.Entity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -17,7 +18,7 @@ import java.util.Date;
 @Data
 @ApiModel(value = "服务项目", description = "服务项目")
 @TableName("as_service_item")
-public class AsServiceItem extends Entity {
+public class AsServiceItem extends BaseEntity {
 
     @ApiModelProperty("项目名称")
     private String sitemName;
@@ -49,7 +50,7 @@ public class AsServiceItem extends Entity {
     private Integer isReserve;
     @ApiModelProperty("是否为洗车项目1是，0否")
     private Integer isClean;
-    @ApiModelProperty("工时数")
+    @ApiModelProperty("排序号")
     private Integer sortNo;
     @ApiModelProperty("使用组织sid")
     private String useOrgSid;

yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemDetailsVo.java

@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asserviceitem;
+
+
+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(售后服务) <br/>
+ * File: AsServicePackageVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackage.AsServicePackageVo <br/>
+ * Description: 服务项目 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务项目 视图数据详情", description = "服务项目 视图数据详情")
+public class AsServiceItemDetailsVo implements Vo {
+
+    private String sid;
+    private String createBySid;
+    @ApiModelProperty("项目名称")
+    private String sitemName;
+    @ApiModelProperty("项目名称")
+    private String sitemCode;
+    @ApiModelProperty("工种sid（分类）")
+    private String serviceTypeSid;
+    @ApiModelProperty("工种（分类）")
+    private String serviceType;
+    @ApiModelProperty("车型sid")
+    private String goodsModelSid;
+    @ApiModelProperty("车型")
+    private String goodsModel;
+    @ApiModelProperty("厂家sid")
+    private String manufacturerSid;
+    @ApiModelProperty("厂家")
+    private String manufacturer;
+    @ApiModelProperty("工时单价")
+    private String hourPrice;
+    @ApiModelProperty("工时数")
+    private String hours;
+    @ApiModelProperty("销售价(工时费)=工时单价*工时数")
+    private String price;
+    @ApiModelProperty("考核工时(考核价）")
+    private String examineHourPrice;
+    @ApiModelProperty("成本")
+    private String cost;
+    @ApiModelProperty("是否为预约项目1是，0否")
+    private String isReserve;
+    @ApiModelProperty("是否为洗车项目1是，0否")
+    private String isClean;
+    @ApiModelProperty("排序号")
+    private String sortNo;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemDto.java

@@ -0,0 +1,92 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asserviceitem;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageDto.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackage.AsServicePackageDto <br/>
+ * Description: 服务项目 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务项目 数据传输对象", description = "服务项目 数据传输对象")
+public class AsServiceItemDto implements Dto {
+
+    private String sid;
+    private String createBySid;
+    @ApiModelProperty("项目名称")
+    private String sitemName;
+    @ApiModelProperty("项目名称")
+    private String sitemCode;
+    @ApiModelProperty("工种sid（分类）")
+    private String serviceTypeSid;
+    @ApiModelProperty("工种（分类）")
+    private String serviceType;
+    @ApiModelProperty("车型sid")
+    private String goodsModelSid;
+    @ApiModelProperty("车型")
+    private String goodsModel;
+    @ApiModelProperty("厂家sid")
+    private String manufacturerSid;
+    @ApiModelProperty("厂家")
+    private String manufacturer;
+    @ApiModelProperty("工时单价")
+    private String hourPrice;
+    @ApiModelProperty("工时数")
+    private String hours;
+    @ApiModelProperty("销售价(工时费)=工时单价*工时数")
+    private String price;
+    @ApiModelProperty("考核工时(考核价）")
+    private String examineHourPrice;
+    @ApiModelProperty("成本")
+    private String cost;
+    @ApiModelProperty("是否为预约项目1是，0否")
+    private String isReserve;
+    @ApiModelProperty("是否为洗车项目1是，0否")
+    private String isClean;
+    @ApiModelProperty("排序号")
+    private String sortNo;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemQuery.java

@@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asserviceitem;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageQuery.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackage.AsServicePackageQuery <br/>
+ * Description: 服务项目 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务项目 查询条件", description = "服务项目 查询条件")
+public class AsServiceItemQuery implements Query {
+
+    @ApiModelProperty("项目名称")
+    private String sitemName;
+    @ApiModelProperty("工种（分类）")
+    private String serviceType;
+    @ApiModelProperty("厂家")
+    private String manufacturer;
+
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemVo.java

@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asserviceitem;
+
+
+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(售后服务) <br/>
+ * File: AsServicePackageVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackage.AsServicePackageVo <br/>
+ * Description: 服务套餐 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务项目 视图数据对象", description = "服务项目 视图数据对象")
+public class AsServiceItemVo implements Vo {
+
+    private String sid;
+    @ApiModelProperty("项目名称")
+    private String sitemName;
+    @ApiModelProperty("项目编码")
+    private String sitemCode;
+    @ApiModelProperty("工种（分类）")
+    private String serviceType;
+    @ApiModelProperty("车型")
+    private String goodsModel;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("厂家")
+    private String manufacturer;
+    @ApiModelProperty("工时单价")
+    private String hourPrice;
+    @ApiModelProperty("工时数")
+    private String hours;
+    @ApiModelProperty("销售价(工时费)=工时单价*工时数")
+    private String price;
+    @ApiModelProperty("考核工时(考核价）")
+    private String examineHourPrice;
+    @ApiModelProperty("成本")
+    private String cost;
+    @ApiModelProperty("是否为预约项目1是，0否")
+    private String isReserve;
+    @ApiModelProperty("是否为洗车项目1是，0否")
+    private String isClean;
+    @ApiModelProperty("排序号")
+    private String sortNo;
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/ManufacturerVo.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.as.api.asserviceitem;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/3/7 14:31
+ */
+@Data
+public class ManufacturerVo {
+    @ApiModelProperty("厂家sid")
+    private String manufacturerSid;
+    @ApiModelProperty("厂家")
+    private String manufacturer;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/VehModelVo.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.as.api.asserviceitem;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/3/7 15:21
+ */
+@Data
+public class VehModelVo {
+    @ApiModelProperty("车型sid")
+    private String goodsModelSid;
+    @ApiModelProperty("车型")
+    private String goodsModel;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/AsServicePackage.java

@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicepackage;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackage.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackage.AsServicePackage <br/>
+ * Description: 服务套餐. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务套餐", description = "服务套餐")
+@TableName("as_service_package")
+public class AsServicePackage extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("套餐名称")
+    private String packageName; // 套餐名称
+	@ApiModelProperty("套餐编码")
+    private String packageCode; // 套餐编码
+	@ApiModelProperty("排序号")
+    private Integer sortNo; // 排序号
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/AsServicePackageDetailsVo.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicepackage;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackage.AsServicePackageVo <br/>
+ * Description: 服务套餐 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务套餐 视图数据详情", description = "服务套餐 视图数据详情")
+public class AsServicePackageDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("套餐名称")
+    private String packageName; // 套餐名称
+	@ApiModelProperty("套餐编码")
+    private String packageCode; // 套餐编码
+	@ApiModelProperty("排序号")
+    private Integer sortNo; // 排序号
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/AsServicePackageDto.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicepackage;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageDto.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackage.AsServicePackageDto <br/>
+ * Description: 服务套餐 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务套餐 数据传输对象", description = "服务套餐 数据传输对象")
+public class AsServicePackageDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("套餐名称")
+    private String packageName; // 套餐名称
+	@ApiModelProperty("套餐编码")
+    private String packageCode; // 套餐编码
+	@ApiModelProperty("排序号")
+    private Integer sortNo; // 排序号
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/AsServicePackageQuery.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicepackage;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageQuery.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackage.AsServicePackageQuery <br/>
+ * Description: 服务套餐 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务套餐 查询条件", description = "服务套餐 查询条件")
+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
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/AsServicePackageVo.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicepackage;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackage.AsServicePackageVo <br/>
+ * Description: 服务套餐 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务套餐 视图数据对象", description = "服务套餐 视图数据对象")
+public class AsServicePackageVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("套餐名称")
+    private String packageName; // 套餐名称
+	@ApiModelProperty("套餐编码")
+    private String packageCode; // 套餐编码
+	@ApiModelProperty("排序号")
+    private Integer sortNo; // 排序号
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackageaitem/AsServicePackageAitem.java

@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicepackageaitem;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageAitem.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackageaitem.AsServicePackageAitem <br/>
+ * Description: 服务套餐-附件项目. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务套餐-附件项目", description = "服务套餐-附件项目")
+@TableName("as_service_package_aitem")
+public class AsServicePackageAitem extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("套餐sid")
+    private String packageSid; // 套餐sid
+	@ApiModelProperty("附加项目sid")
+    private String aitemSid; // 附加项目sid
+	@ApiModelProperty("附加项目名称")
+    private String aitmeName; // 附加项目名称
+	@ApiModelProperty("销售价")
+    private BigDecimal price; // 销售价
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackageaitem/AsServicePackageAitemDetailsVo.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicepackageaitem;
+
+
+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(售后服务) <br/>
+ * File: AsServicePackageAitemVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackageaitem.AsServicePackageAitemVo <br/>
+ * Description: 服务套餐-附件项目 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务套餐-附件项目 视图数据详情", description = "服务套餐-附件项目 视图数据详情")
+public class AsServicePackageAitemDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("套餐sid")
+    private String packageSid; // 套餐sid
+	@ApiModelProperty("附加项目sid")
+    private String aitemSid; // 附加项目sid
+	@ApiModelProperty("附加项目名称")
+    private String aitmeName; // 附加项目名称
+	@ApiModelProperty("销售价")
+    private BigDecimal price; // 销售价
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackageaitem/AsServicePackageAitemDto.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicepackageaitem;
+
+
+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(售后服务) <br/>
+ * File: AsServicePackageAitemDto.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackageaitem.AsServicePackageAitemDto <br/>
+ * Description: 服务套餐-附件项目 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务套餐-附件项目 数据传输对象", description = "服务套餐-附件项目 数据传输对象")
+public class AsServicePackageAitemDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("套餐sid")
+    private String packageSid; // 套餐sid
+	@ApiModelProperty("附加项目sid")
+    private String aitemSid; // 附加项目sid
+	@ApiModelProperty("附加项目名称")
+    private String aitmeName; // 附加项目名称
+	@ApiModelProperty("销售价")
+    private BigDecimal price; // 销售价
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackageaitem/AsServicePackageAitemQuery.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicepackageaitem;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageAitemQuery.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackageaitem.AsServicePackageAitemQuery <br/>
+ * Description: 服务套餐-附件项目 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务套餐-附件项目 查询条件", description = "服务套餐-附件项目 查询条件")
+public class AsServicePackageAitemQuery implements Query {
+
+	@ApiModelProperty("套餐sid")
+    private String packageSid; // 套餐sid
+	@ApiModelProperty("附加项目sid")
+    private String aitemSid; // 附加项目sid
+	@ApiModelProperty("附加项目名称")
+    private String aitmeName; // 附加项目名称
+	@ApiModelProperty("销售价")
+    private BigDecimal price; // 销售价
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackageaitem/AsServicePackageAitemVo.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicepackageaitem;
+
+
+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(售后服务) <br/>
+ * File: AsServicePackageAitemVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackageaitem.AsServicePackageAitemVo <br/>
+ * Description: 服务套餐-附件项目 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务套餐-附件项目 视图数据对象", description = "服务套餐-附件项目 视图数据对象")
+public class AsServicePackageAitemVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("套餐sid")
+    private String packageSid; // 套餐sid
+	@ApiModelProperty("附加项目sid")
+    private String aitemSid; // 附加项目sid
+	@ApiModelProperty("附加项目名称")
+    private String aitmeName; // 附加项目名称
+	@ApiModelProperty("销售价")
+    private BigDecimal price; // 销售价
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackagegoods/AsServicePackageGoods.java

@@ -0,0 +1,88 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicepackagegoods;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageGoods.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackagegoods.AsServicePackageGoods <br/>
+ * Description: 服务套餐-商品. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务套餐-商品", description = "服务套餐-商品")
+@TableName("as_service_package_goods")
+public class AsServicePackageGoods extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("套餐sid")
+    private String packageSid; // 套餐sid
+	@ApiModelProperty("商品sid")
+    private String goodsSid; // 商品sid
+	@ApiModelProperty("商品名称")
+    private String goodsName; // 商品名称
+	@ApiModelProperty("商品编码（图号）")
+    private String goodsCode; // 商品编码（图号）
+	@ApiModelProperty("车型sid")
+    private String goodsModelSid; // 车型sid
+	@ApiModelProperty("车型")
+    private String goodsModel; // 车型
+	@ApiModelProperty("单位")
+    private String unit; // 单位
+	@ApiModelProperty("仓库sid")
+    private String warehouseSid; // 仓库sid
+	@ApiModelProperty("仓库名称")
+    private String warehouse; // 仓库名称
+	@ApiModelProperty("科目sid")
+    private String subjectSid; // 科目sid
+	@ApiModelProperty("科目")
+    private String subject; // 科目
+	@ApiModelProperty("销售价")
+    private BigDecimal price; // 销售价
+	@ApiModelProperty("数量")
+    private Integer count; // 数量
+	@ApiModelProperty("折扣（0-10，0免费，10不打折）")
+    private Integer discount; // 折扣（0-10，0免费，10不打折）
+	@ApiModelProperty("优惠金额（=销售价*(折扣*0.1））")
+    private BigDecimal discountAmount; // 优惠金额（=销售价*(折扣*0.1））
+	@ApiModelProperty("金额（销售价-优惠金额）")
+    private BigDecimal amount; // 金额（销售价-优惠金额）
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackagegoods/AsServicePackageGoodsDetailsVo.java

@@ -0,0 +1,89 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicepackagegoods;
+
+
+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(售后服务) <br/>
+ * File: AsServicePackageGoodsVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackagegoods.AsServicePackageGoodsVo <br/>
+ * Description: 服务套餐-商品 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务套餐-商品 视图数据详情", description = "服务套餐-商品 视图数据详情")
+public class AsServicePackageGoodsDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("套餐sid")
+    private String packageSid; // 套餐sid
+	@ApiModelProperty("商品sid")
+    private String goodsSid; // 商品sid
+	@ApiModelProperty("商品名称")
+    private String goodsName; // 商品名称
+	@ApiModelProperty("商品编码（图号）")
+    private String goodsCode; // 商品编码（图号）
+	@ApiModelProperty("车型sid")
+    private String goodsModelSid; // 车型sid
+	@ApiModelProperty("车型")
+    private String goodsModel; // 车型
+	@ApiModelProperty("单位")
+    private String unit; // 单位
+	@ApiModelProperty("仓库sid")
+    private String warehouseSid; // 仓库sid
+	@ApiModelProperty("仓库名称")
+    private String warehouse; // 仓库名称
+	@ApiModelProperty("科目sid")
+    private String subjectSid; // 科目sid
+	@ApiModelProperty("科目")
+    private String subject; // 科目
+	@ApiModelProperty("销售价")
+    private BigDecimal price; // 销售价
+	@ApiModelProperty("数量")
+    private Integer count; // 数量
+	@ApiModelProperty("折扣（0-10，0免费，10不打折）")
+    private Integer discount; // 折扣（0-10，0免费，10不打折）
+	@ApiModelProperty("优惠金额（=销售价*(折扣*0.1））")
+    private BigDecimal discountAmount; // 优惠金额（=销售价*(折扣*0.1））
+	@ApiModelProperty("金额（销售价-优惠金额）")
+    private BigDecimal amount; // 金额（销售价-优惠金额）
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackagegoods/AsServicePackageGoodsDto.java

@@ -0,0 +1,89 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicepackagegoods;
+
+
+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(售后服务) <br/>
+ * File: AsServicePackageGoodsDto.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackagegoods.AsServicePackageGoodsDto <br/>
+ * Description: 服务套餐-商品 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务套餐-商品 数据传输对象", description = "服务套餐-商品 数据传输对象")
+public class AsServicePackageGoodsDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("套餐sid")
+    private String packageSid; // 套餐sid
+	@ApiModelProperty("商品sid")
+    private String goodsSid; // 商品sid
+	@ApiModelProperty("商品名称")
+    private String goodsName; // 商品名称
+	@ApiModelProperty("商品编码（图号）")
+    private String goodsCode; // 商品编码（图号）
+	@ApiModelProperty("车型sid")
+    private String goodsModelSid; // 车型sid
+	@ApiModelProperty("车型")
+    private String goodsModel; // 车型
+	@ApiModelProperty("单位")
+    private String unit; // 单位
+	@ApiModelProperty("仓库sid")
+    private String warehouseSid; // 仓库sid
+	@ApiModelProperty("仓库名称")
+    private String warehouse; // 仓库名称
+	@ApiModelProperty("科目sid")
+    private String subjectSid; // 科目sid
+	@ApiModelProperty("科目")
+    private String subject; // 科目
+	@ApiModelProperty("销售价")
+    private BigDecimal price; // 销售价
+	@ApiModelProperty("数量")
+    private Integer count; // 数量
+	@ApiModelProperty("折扣（0-10，0免费，10不打折）")
+    private Integer discount; // 折扣（0-10，0免费，10不打折）
+	@ApiModelProperty("优惠金额（=销售价*(折扣*0.1））")
+    private BigDecimal discountAmount; // 优惠金额（=销售价*(折扣*0.1））
+	@ApiModelProperty("金额（销售价-优惠金额）")
+    private BigDecimal amount; // 金额（销售价-优惠金额）
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackagegoods/AsServicePackageGoodsQuery.java

@@ -0,0 +1,87 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicepackagegoods;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageGoodsQuery.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackagegoods.AsServicePackageGoodsQuery <br/>
+ * Description: 服务套餐-商品 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务套餐-商品 查询条件", description = "服务套餐-商品 查询条件")
+public class AsServicePackageGoodsQuery implements Query {
+
+	@ApiModelProperty("套餐sid")
+    private String packageSid; // 套餐sid
+	@ApiModelProperty("商品sid")
+    private String goodsSid; // 商品sid
+	@ApiModelProperty("商品名称")
+    private String goodsName; // 商品名称
+	@ApiModelProperty("商品编码（图号）")
+    private String goodsCode; // 商品编码（图号）
+	@ApiModelProperty("车型sid")
+    private String goodsModelSid; // 车型sid
+	@ApiModelProperty("车型")
+    private String goodsModel; // 车型
+	@ApiModelProperty("单位")
+    private String unit; // 单位
+	@ApiModelProperty("仓库sid")
+    private String warehouseSid; // 仓库sid
+	@ApiModelProperty("仓库名称")
+    private String warehouse; // 仓库名称
+	@ApiModelProperty("科目sid")
+    private String subjectSid; // 科目sid
+	@ApiModelProperty("科目")
+    private String subject; // 科目
+	@ApiModelProperty("销售价")
+    private BigDecimal price; // 销售价
+	@ApiModelProperty("数量")
+    private Integer count; // 数量
+	@ApiModelProperty("折扣（0-10，0免费，10不打折）")
+    private Integer discount; // 折扣（0-10，0免费，10不打折）
+	@ApiModelProperty("优惠金额（=销售价*(折扣*0.1））")
+    private BigDecimal discountAmount; // 优惠金额（=销售价*(折扣*0.1））
+	@ApiModelProperty("金额（销售价-优惠金额）")
+    private BigDecimal amount; // 金额（销售价-优惠金额）
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackagegoods/AsServicePackageGoodsVo.java

@@ -0,0 +1,89 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicepackagegoods;
+
+
+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(售后服务) <br/>
+ * File: AsServicePackageGoodsVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackagegoods.AsServicePackageGoodsVo <br/>
+ * Description: 服务套餐-商品 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务套餐-商品 视图数据对象", description = "服务套餐-商品 视图数据对象")
+public class AsServicePackageGoodsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("套餐sid")
+    private String packageSid; // 套餐sid
+	@ApiModelProperty("商品sid")
+    private String goodsSid; // 商品sid
+	@ApiModelProperty("商品名称")
+    private String goodsName; // 商品名称
+	@ApiModelProperty("商品编码（图号）")
+    private String goodsCode; // 商品编码（图号）
+	@ApiModelProperty("车型sid")
+    private String goodsModelSid; // 车型sid
+	@ApiModelProperty("车型")
+    private String goodsModel; // 车型
+	@ApiModelProperty("单位")
+    private String unit; // 单位
+	@ApiModelProperty("仓库sid")
+    private String warehouseSid; // 仓库sid
+	@ApiModelProperty("仓库名称")
+    private String warehouse; // 仓库名称
+	@ApiModelProperty("科目sid")
+    private String subjectSid; // 科目sid
+	@ApiModelProperty("科目")
+    private String subject; // 科目
+	@ApiModelProperty("销售价")
+    private BigDecimal price; // 销售价
+	@ApiModelProperty("数量")
+    private Integer count; // 数量
+	@ApiModelProperty("折扣（0-10，0免费，10不打折）")
+    private Integer discount; // 折扣（0-10，0免费，10不打折）
+	@ApiModelProperty("优惠金额（=销售价*(折扣*0.1））")
+    private BigDecimal discountAmount; // 优惠金额（=销售价*(折扣*0.1））
+	@ApiModelProperty("金额（销售价-优惠金额）")
+    private BigDecimal amount; // 金额（销售价-优惠金额）
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackagesitem/AsServicePackageSitem.java

@@ -0,0 +1,84 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicepackagesitem;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageSitem.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackagesitem.AsServicePackageSitem <br/>
+ * Description: 服务套餐-服务项目. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务套餐-服务项目", description = "服务套餐-服务项目")
+@TableName("as_service_package_sitem")
+public class AsServicePackageSitem extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("套餐sid")
+    private String packageSid; // 套餐sid
+	@ApiModelProperty("项目sid")
+    private String sitemSid; // 项目sid
+	@ApiModelProperty("项目名称")
+    private String sitemName; // 项目名称
+	@ApiModelProperty("工种sid（分类）")
+    private String serviceTypeSid; // 工种sid（分类）
+	@ApiModelProperty("工种（分类）")
+    private String serviceType; // 工种（分类）
+	@ApiModelProperty("科目sid")
+    private String subjectSid; // 科目sid
+	@ApiModelProperty("科目")
+    private String subject; // 科目
+	@ApiModelProperty("考核工时(考核价）")
+    private BigDecimal examineHourPrice; // 考核工时(考核价）
+	@ApiModelProperty("工时单价")
+    private BigDecimal hourPrice; // 工时单价
+	@ApiModelProperty("工时数")
+    private Integer hours; // 工时数
+	@ApiModelProperty("销售价(工时费)=工时单价*工时数")
+    private BigDecimal price; // 销售价(工时费)=工时单价*工时数
+	@ApiModelProperty("折扣（0-10，0免费，10不打折）")
+    private Integer discount; // 折扣（0-10，0免费，10不打折）
+	@ApiModelProperty("优惠金额（=销售价*(折扣*0.1））")
+    private BigDecimal discountAmount; // 优惠金额（=销售价*(折扣*0.1））
+	@ApiModelProperty("金额（销售价-优惠金额）")
+    private BigDecimal amount; // 金额（销售价-优惠金额）
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackagesitem/AsServicePackageSitemDetailsVo.java

@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicepackagesitem;
+
+
+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(售后服务) <br/>
+ * File: AsServicePackageSitemVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackagesitem.AsServicePackageSitemVo <br/>
+ * Description: 服务套餐-服务项目 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务套餐-服务项目 视图数据详情", description = "服务套餐-服务项目 视图数据详情")
+public class AsServicePackageSitemDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("套餐sid")
+    private String packageSid; // 套餐sid
+	@ApiModelProperty("项目sid")
+    private String sitemSid; // 项目sid
+	@ApiModelProperty("项目名称")
+    private String sitemName; // 项目名称
+	@ApiModelProperty("工种sid（分类）")
+    private String serviceTypeSid; // 工种sid（分类）
+	@ApiModelProperty("工种（分类）")
+    private String serviceType; // 工种（分类）
+	@ApiModelProperty("科目sid")
+    private String subjectSid; // 科目sid
+	@ApiModelProperty("科目")
+    private String subject; // 科目
+	@ApiModelProperty("考核工时(考核价）")
+    private BigDecimal examineHourPrice; // 考核工时(考核价）
+	@ApiModelProperty("工时单价")
+    private BigDecimal hourPrice; // 工时单价
+	@ApiModelProperty("工时数")
+    private Integer hours; // 工时数
+	@ApiModelProperty("销售价(工时费)=工时单价*工时数")
+    private BigDecimal price; // 销售价(工时费)=工时单价*工时数
+	@ApiModelProperty("折扣（0-10，0免费，10不打折）")
+    private Integer discount; // 折扣（0-10，0免费，10不打折）
+	@ApiModelProperty("优惠金额（=销售价*(折扣*0.1））")
+    private BigDecimal discountAmount; // 优惠金额（=销售价*(折扣*0.1））
+	@ApiModelProperty("金额（销售价-优惠金额）")
+    private BigDecimal amount; // 金额（销售价-优惠金额）
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackagesitem/AsServicePackageSitemDto.java

@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicepackagesitem;
+
+
+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(售后服务) <br/>
+ * File: AsServicePackageSitemDto.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackagesitem.AsServicePackageSitemDto <br/>
+ * Description: 服务套餐-服务项目 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务套餐-服务项目 数据传输对象", description = "服务套餐-服务项目 数据传输对象")
+public class AsServicePackageSitemDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("套餐sid")
+    private String packageSid; // 套餐sid
+	@ApiModelProperty("项目sid")
+    private String sitemSid; // 项目sid
+	@ApiModelProperty("项目名称")
+    private String sitemName; // 项目名称
+	@ApiModelProperty("工种sid（分类）")
+    private String serviceTypeSid; // 工种sid（分类）
+	@ApiModelProperty("工种（分类）")
+    private String serviceType; // 工种（分类）
+	@ApiModelProperty("科目sid")
+    private String subjectSid; // 科目sid
+	@ApiModelProperty("科目")
+    private String subject; // 科目
+	@ApiModelProperty("考核工时(考核价）")
+    private BigDecimal examineHourPrice; // 考核工时(考核价）
+	@ApiModelProperty("工时单价")
+    private BigDecimal hourPrice; // 工时单价
+	@ApiModelProperty("工时数")
+    private Integer hours; // 工时数
+	@ApiModelProperty("销售价(工时费)=工时单价*工时数")
+    private BigDecimal price; // 销售价(工时费)=工时单价*工时数
+	@ApiModelProperty("折扣（0-10，0免费，10不打折）")
+    private Integer discount; // 折扣（0-10，0免费，10不打折）
+	@ApiModelProperty("优惠金额（=销售价*(折扣*0.1））")
+    private BigDecimal discountAmount; // 优惠金额（=销售价*(折扣*0.1））
+	@ApiModelProperty("金额（销售价-优惠金额）")
+    private BigDecimal amount; // 金额（销售价-优惠金额）
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackagesitem/AsServicePackageSitemQuery.java

@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicepackagesitem;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageSitemQuery.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackagesitem.AsServicePackageSitemQuery <br/>
+ * Description: 服务套餐-服务项目 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务套餐-服务项目 查询条件", description = "服务套餐-服务项目 查询条件")
+public class AsServicePackageSitemQuery implements Query {
+
+	@ApiModelProperty("套餐sid")
+    private String packageSid; // 套餐sid
+	@ApiModelProperty("项目sid")
+    private String sitemSid; // 项目sid
+	@ApiModelProperty("项目名称")
+    private String sitemName; // 项目名称
+	@ApiModelProperty("工种sid（分类）")
+    private String serviceTypeSid; // 工种sid（分类）
+	@ApiModelProperty("工种（分类）")
+    private String serviceType; // 工种（分类）
+	@ApiModelProperty("科目sid")
+    private String subjectSid; // 科目sid
+	@ApiModelProperty("科目")
+    private String subject; // 科目
+	@ApiModelProperty("考核工时(考核价）")
+    private BigDecimal examineHourPrice; // 考核工时(考核价）
+	@ApiModelProperty("工时单价")
+    private BigDecimal hourPrice; // 工时单价
+	@ApiModelProperty("工时数")
+    private Integer hours; // 工时数
+	@ApiModelProperty("销售价(工时费)=工时单价*工时数")
+    private BigDecimal price; // 销售价(工时费)=工时单价*工时数
+	@ApiModelProperty("折扣（0-10，0免费，10不打折）")
+    private Integer discount; // 折扣（0-10，0免费，10不打折）
+	@ApiModelProperty("优惠金额（=销售价*(折扣*0.1））")
+    private BigDecimal discountAmount; // 优惠金额（=销售价*(折扣*0.1））
+	@ApiModelProperty("金额（销售价-优惠金额）")
+    private BigDecimal amount; // 金额（销售价-优惠金额）
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackagesitem/AsServicePackageSitemVo.java

@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicepackagesitem;
+
+
+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(售后服务) <br/>
+ * File: AsServicePackageSitemVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackagesitem.AsServicePackageSitemVo <br/>
+ * Description: 服务套餐-服务项目 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务套餐-服务项目 视图数据对象", description = "服务套餐-服务项目 视图数据对象")
+public class AsServicePackageSitemVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("套餐sid")
+    private String packageSid; // 套餐sid
+	@ApiModelProperty("项目sid")
+    private String sitemSid; // 项目sid
+	@ApiModelProperty("项目名称")
+    private String sitemName; // 项目名称
+	@ApiModelProperty("工种sid（分类）")
+    private String serviceTypeSid; // 工种sid（分类）
+	@ApiModelProperty("工种（分类）")
+    private String serviceType; // 工种（分类）
+	@ApiModelProperty("科目sid")
+    private String subjectSid; // 科目sid
+	@ApiModelProperty("科目")
+    private String subject; // 科目
+	@ApiModelProperty("考核工时(考核价）")
+    private BigDecimal examineHourPrice; // 考核工时(考核价）
+	@ApiModelProperty("工时单价")
+    private BigDecimal hourPrice; // 工时单价
+	@ApiModelProperty("工时数")
+    private Integer hours; // 工时数
+	@ApiModelProperty("销售价(工时费)=工时单价*工时数")
+    private BigDecimal price; // 销售价(工时费)=工时单价*工时数
+	@ApiModelProperty("折扣（0-10，0免费，10不打折）")
+    private Integer discount; // 折扣（0-10，0免费，10不打折）
+	@ApiModelProperty("优惠金额（=销售价*(折扣*0.1））")
+    private BigDecimal discountAmount; // 优惠金额（=销售价*(折扣*0.1））
+	@ApiModelProperty("金额（销售价-优惠金额）")
+    private BigDecimal amount; // 金额（销售价-优惠金额）
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillRest.java

@@ -12,7 +12,7 @@ import java.util.List;
 
 @Api(tags = "预约单")
 @RestController
-@RequestMapping("asBusreserveBill")
+@RequestMapping("v1/asBusreserveBill")
 public class AsBusreserveBillRest {
 
 

yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceattachitem/AsServiceAttachItemMapper.java

@@ -1,14 +1,19 @@
 package com.yxt.anrui.as.biz.asserviceattachitem;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.as.api.asserviceattachitem.AsServiceAttachItem;
+import com.yxt.anrui.as.api.asserviceattachitem.AsServiceAttachItemVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 
 @Mapper
 public interface AsServiceAttachItemMapper extends BaseMapper<AsServiceAttachItem> {
 
 
-
+    IPage<AsServiceAttachItemVo> selectPageVo(IPage<AsServiceAttachItem> page,@Param(Constants.WRAPPER) QueryWrapper<AsServiceAttachItem> qw);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceattachitem/AsServiceAttachItemMapper.xml

@@ -5,4 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
 
 
+    <select id="selectPageVo" resultType="com.yxt.anrui.as.api.asserviceattachitem.AsServiceAttachItemVo">
+        SELECT * FROM as_service_attachitem <where> ${ew.sqlSegment} </where>
+    </select>
 </mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceattachitem/AsServiceAttachItemRest.java

@@ -1,6 +1,15 @@
 package com.yxt.anrui.as.biz.asserviceattachitem;
 
+import com.yxt.anrui.as.api.asserviceattachitem.AsServiceAttachItemQuery;
+import com.yxt.anrui.as.api.asserviceattachitem.AsServiceAttachItemVo;
+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;
 
@@ -11,8 +20,18 @@ import org.springframework.web.bind.annotation.RestController;
 
 @Api(tags = "附加项目")
 @RestController
-@RequestMapping("AsServiceAttachItem")
+@RequestMapping("v1/AsServiceAttachItem")
 public class AsServiceAttachItemRest {
 
+    @Autowired
+    private AsServiceAttachItemService asServiceAttachItemService;
 
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<AsServiceAttachItemVo>> listPage(@RequestBody PagerQuery<AsServiceAttachItemQuery> pq){
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<AsServiceAttachItemVo> pv = asServiceAttachItemService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceattachitem/AsServiceAttachItemService.java

@@ -1,8 +1,18 @@
 package com.yxt.anrui.as.biz.asserviceattachitem;
 
 
+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.asserviceitem.AsServiceItem;
+import com.yxt.anrui.as.api.asserviceitem.AsServiceItemQuery;
+import com.yxt.anrui.as.api.asserviceitem.AsServiceItemVo;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Service;
 
 /**
@@ -11,5 +21,21 @@ import org.springframework.stereotype.Service;
 @Service
 public class AsServiceAttachItemService extends MybatisBaseService<AsServiceAttachItemMapper, AsServiceAttachItem> {
 
+    private QueryWrapper<AsServiceAttachItem> createQueryWrapper(AsServiceAttachItemQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<AsServiceAttachItem> qw = new QueryWrapper<>();
+        return qw;
+    }
+
 
+
+    public PagerVo<AsServiceAttachItemVo> listPageVo(PagerQuery<AsServiceAttachItemQuery> pq) {
+        AsServiceAttachItemQuery query = pq.getParams();
+        QueryWrapper<AsServiceAttachItem> qw = createQueryWrapper(query);
+        IPage<AsServiceAttachItem> page = PagerUtil.queryToPage(pq);
+        IPage<AsServiceAttachItemVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<AsServiceAttachItemVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
 }

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

@@ -1,14 +1,20 @@
 package com.yxt.anrui.as.biz.asserviceitem;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+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.asservicepackage.AsServicePackageVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 
 @Mapper
 public interface AsServiceItemMapper extends BaseMapper<AsServiceItem> {
 
 
-
+    IPage<AsServiceItemVo> selectPageVo(IPage<AsServiceItem> page, @Param(Constants.WRAPPER) QueryWrapper<AsServiceItem> qw);
 }

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

@@ -5,4 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
 
 
+    <select id="selectPageVo" resultType="com.yxt.anrui.as.api.asserviceitem.AsServiceItemVo">
+        SELECT * FROM as_service_item <where> ${ew.sqlSegment} </where>
+    </select>
 </mapper>

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

@@ -1,8 +1,15 @@
 package com.yxt.anrui.as.biz.asserviceitem;
 
+import com.yxt.anrui.as.api.asserviceitem.*;
+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 org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * @author fzz
@@ -11,8 +18,60 @@ import org.springframework.web.bind.annotation.RestController;
 
 @Api(tags = "服务项目")
 @RestController
-@RequestMapping("AsServiceItem")
+@RequestMapping("v1/AsServiceItem")
 public class AsServiceItemRest {
 
 
+    @Autowired
+    private AsServiceItemService asServiceItemService;
+
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<AsServiceItemVo>> listPage(@RequestBody PagerQuery<AsServiceItemQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<AsServiceItemVo> pv = asServiceItemService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @ApiOperation("修改保存")
+    @PostMapping("/saveServiceItem")
+    public ResultBean saveServiceItem(@RequestBody AsServiceItemDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        asServiceItemService.saveServiceItem(dto);
+        return rb.success();
+    }
+
+    @ApiOperation("详情查看")
+    @GetMapping("/fetchDetails/{sid}")
+    public ResultBean<AsServiceItemDetailsVo> fetchDetails(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        AsServiceItemDetailsVo vo = asServiceItemService.fetchDetails(sid);
+        return rb.success().setData(vo);
+    }
+
+    @ApiOperation("获取分公司下厂家")
+    @GetMapping("/getManufacturers")
+    public ResultBean<List<ManufacturerVo>> getManufacturers(@RequestParam("useOrgSid") String useOrgSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<ManufacturerVo> list = asServiceItemService.getManufacturers(useOrgSid);
+        return rb.success().setData(list);
+    }
+
+    @ApiOperation("获取分公司下车型")
+    @GetMapping("/getVehModel")
+    public ResultBean<List<VehModelVo>> getVehModel(@RequestParam("useOrgSid") String useOrgSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<VehModelVo> list = asServiceItemService.getVehModel(useOrgSid);
+        return rb.success().setData(list);
+    }
+
+    @ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        asServiceItemService.delBySids(sids);
+        return rb.success();
+    }
+
 }

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

@@ -1,15 +1,110 @@
 package com.yxt.anrui.as.biz.asserviceitem;
 
 
-import com.yxt.anrui.as.api.asserviceitem.AsServiceItem;
+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.asserviceitem.*;
+import com.yxt.anrui.as.feign.base.basevehiclemodel.BaseVehModelVo;
+import com.yxt.anrui.as.feign.base.basevehiclemodel.BaseVehicleModelFeign;
+import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.as.feign.wms.wmsmanufacturer.WmsManufacturerFeign;
+import com.yxt.anrui.as.feign.wms.wmsmanufacturer.WmsManufacturerVo;
 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.vo.PagerVo;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author fzz
  */
 @Service
 public class AsServiceItemService extends MybatisBaseService<AsServiceItemMapper, AsServiceItem> {
 
+    @Resource
+    private WmsManufacturerFeign wmsManufacturerFeign;
+    @Resource
+    private BaseVehicleModelFeign baseVehicleModelFeign;
+
+    private QueryWrapper<AsServiceItem> createQueryWrapper(AsServiceItemQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<AsServiceItem> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getSitemName())) {
+            qw.and(wrapper -> wrapper.like("sitemName", query.getSitemName()).or().like("sitemCode", query.getSitemName()));
+        }
+        if (StringUtils.isNotBlank(query.getServiceType())) {
+            qw.eq("serviceType", query.getServiceType());
+        }
+        if (StringUtils.isNotBlank(query.getManufacturer())) {
+            qw.eq("manufacturer", query.getManufacturer());
+        }
+        qw.eq("useOrgSid", query.getUseOrgSid());
+        qw.orderByAsc("sortNo");
+        return qw;
+    }
+
+    public PagerVo<AsServiceItemVo> listPageVo(PagerQuery<AsServiceItemQuery> pq) {
+        AsServiceItemQuery query = pq.getParams();
+        QueryWrapper<AsServiceItem> qw = createQueryWrapper(query);
+        IPage<AsServiceItem> page = PagerUtil.queryToPage(pq);
+        IPage<AsServiceItemVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<AsServiceItemVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public AsServiceItemDetailsVo fetchDetails(String sid) {
+        AsServiceItemDetailsVo vo = new AsServiceItemDetailsVo();
+        AsServiceItem asServiceItem = fetchBySid(sid);
+        if (null != asServiceItem) {
+            BeanUtil.copyProperties(asServiceItem, vo);
+        }
+        return vo;
+    }
 
+    public void saveServiceItem(AsServiceItemDto dto) {
+        if (StringUtils.isNotBlank(dto.getSid())) {
+            AsServiceItem item = fetchBySid(dto.getSid());
+            BeanUtil.copyProperties(dto, item, "id", "sid");
+            baseMapper.updateById(item);
+        } else {
+            AsServiceItem item = new AsServiceItem();
+            BeanUtil.copyProperties(dto, item, "id", "sid");
+            baseMapper.insert(item);
+        }
+    }
+
+    public List<ManufacturerVo> getManufacturers(String useOrgSid) {
+        List<ManufacturerVo> voList = new ArrayList<>();
+        List<WmsManufacturerVo> wmsManufacturerVos = wmsManufacturerFeign.getAllTypeByUseOrgSid(useOrgSid).getData();
+        if (!wmsManufacturerVos.isEmpty()) {
+            for (WmsManufacturerVo wmsManufacturerVo : wmsManufacturerVos) {
+                ManufacturerVo vo = new ManufacturerVo();
+                vo.setManufacturerSid(wmsManufacturerVo.getSid());
+                vo.setManufacturer(wmsManufacturerVo.getManufacturerName());
+                voList.add(vo);
+            }
+        }
+        return voList;
+    }
+
+    public List<VehModelVo> getVehModel(String useOrgSid) {
+        List<VehModelVo> voList = new ArrayList<>();
+        List<BaseVehModelVo> baseVehModelVos = baseVehicleModelFeign.getVehModelByCreateOrg(useOrgSid).getData();
+        if (!baseVehModelVos.isEmpty()) {
+            for (BaseVehModelVo baseVehModelVo : baseVehModelVos) {
+                VehModelVo vo = new VehModelVo();
+                vo.setGoodsModelSid(baseVehModelVo.getSid());
+                vo.setGoodsModel(baseVehModelVo.getModelName());
+                voList.add(vo);
+            }
+        }
+        return voList;
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asservicepackage;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.as.api.asservicepackage.AsServicePackage;
+import com.yxt.anrui.as.api.asservicepackage.AsServicePackageVo;
+
+import java.util.List;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageMapper.java <br/>
+ * Class: com.yxt.anrui.as.biz.asservicepackage.AsServicePackageMapper <br/>
+ * Description: 服务套餐. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface AsServicePackageMapper extends BaseMapper<AsServicePackage> {
+
+	//@Update("update as_service_package set name=#{msg} where id=#{id}")
+	//IPage<AsServicePackageVo> voPage(IPage<AsServicePackage> page, @Param(Constants.WRAPPER) QueryWrapper<AsServicePackage> qw);
+	
+	IPage<AsServicePackageVo> selectPageVo(IPage<AsServicePackage> page, @Param(Constants.WRAPPER) Wrapper<AsServicePackage> qw);
+	
+	List<AsServicePackageVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsServicePackage> qw);
+	
+	@Select("select * from as_service_package")
+	List<AsServicePackageVo> selectListVo();
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.as.biz.asservicepackage.AsServicePackageMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asservicepackage.AsServicePackageVo">
+		SELECT * FROM as_service_package <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asservicepackage.AsServicePackageVo">
+		SELECT * FROM as_service_package <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageRest.java

@@ -0,0 +1,97 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asservicepackage;
+
+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.*;
+
+import com.yxt.anrui.as.api.asservicepackage.AsServicePackageQuery;
+import com.yxt.anrui.as.api.asservicepackage.AsServicePackageVo;
+import com.yxt.anrui.as.api.asservicepackage.AsServicePackageDetailsVo;
+import com.yxt.anrui.as.api.asservicepackage.AsServicePackageDto;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageFeignFallback.java <br/>
+ * Class: com.yxt.anrui.as.biz.asservicepackage.AsServicePackageRest <br/>
+ * Description: 服务套餐. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "服务套餐")
+@RestController("com.yxt.anrui.as.biz.asservicepackage.AsServicePackageRest")
+@RequestMapping("v1/asservicepackage")
+public class AsServicePackageRest {
+
+	@Autowired
+	private AsServicePackageService asServicePackageService;
+
+
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<AsServicePackageVo>> listPage(@RequestBody PagerQuery<AsServicePackageQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<AsServicePackageVo> pv = asServicePackageService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody AsServicePackageDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		asServicePackageService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		asServicePackageService.delBySids(sids);
+		return rb.success();
+	}
+
+
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<AsServicePackageDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		AsServicePackageDetailsVo vo = asServicePackageService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java

@@ -0,0 +1,106 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+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 org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.as.api.asservicepackage.AsServicePackage;
+import com.yxt.anrui.as.api.asservicepackage.AsServicePackageQuery;
+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.stereotype.Service;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageService.java <br/>
+ * Class: com.yxt.anrui.as.biz.asservicepackage.AsServicePackageService <br/>
+ * Description: 服务套餐 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@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){
+        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();
+        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;
+	}
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackageaitem/AsServicePackageAitemMapper.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asservicepackageaitem;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.as.api.asservicepackageaitem.AsServicePackageAitem;
+import com.yxt.anrui.as.api.asservicepackageaitem.AsServicePackageAitemVo;
+
+import java.util.List;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageAitemMapper.java <br/>
+ * Class: com.yxt.anrui.as.biz.asservicepackageaitem.AsServicePackageAitemMapper <br/>
+ * Description: 服务套餐-附件项目. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface AsServicePackageAitemMapper extends BaseMapper<AsServicePackageAitem> {
+
+	//@Update("update as_service_package_aitem set name=#{msg} where id=#{id}")
+	//IPage<AsServicePackageAitemVo> voPage(IPage<AsServicePackageAitem> page, @Param(Constants.WRAPPER) QueryWrapper<AsServicePackageAitem> qw);
+	
+	IPage<AsServicePackageAitemVo> selectPageVo(IPage<AsServicePackageAitem> page, @Param(Constants.WRAPPER) Wrapper<AsServicePackageAitem> qw);
+	
+	List<AsServicePackageAitemVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsServicePackageAitem> qw);
+	
+	@Select("select * from as_service_package_aitem")
+	List<AsServicePackageAitemVo> selectListVo();
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackageaitem/AsServicePackageAitemMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.as.biz.asservicepackageaitem.AsServicePackageAitemMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asservicepackageaitem.AsServicePackageAitemVo">
+		SELECT * FROM as_service_package_aitem <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asservicepackageaitem.AsServicePackageAitemVo">
+		SELECT * FROM as_service_package_aitem <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackageaitem/AsServicePackageAitemRest.java

@@ -0,0 +1,97 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asservicepackageaitem;
+
+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.*;
+
+import com.yxt.anrui.as.api.asservicepackageaitem.AsServicePackageAitemQuery;
+import com.yxt.anrui.as.api.asservicepackageaitem.AsServicePackageAitemVo;
+import com.yxt.anrui.as.api.asservicepackageaitem.AsServicePackageAitemDetailsVo;
+import com.yxt.anrui.as.api.asservicepackageaitem.AsServicePackageAitemDto;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageAitemFeignFallback.java <br/>
+ * Class: com.yxt.anrui.as.biz.asservicepackageaitem.AsServicePackageAitemRest <br/>
+ * Description: 服务套餐-附件项目. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "服务套餐-附件项目")
+@RestController("com.yxt.anrui.as.biz.asservicepackageaitem.AsServicePackageAitemRest")
+@RequestMapping("v1/asservicepackageaitem")
+public class AsServicePackageAitemRest  {
+
+	@Autowired
+	private AsServicePackageAitemService asServicePackageAitemService;
+
+
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<AsServicePackageAitemVo>> listPage(@RequestBody PagerQuery<AsServicePackageAitemQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<AsServicePackageAitemVo> pv = asServicePackageAitemService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody AsServicePackageAitemDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		asServicePackageAitemService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		asServicePackageAitemService.delBySids(sids);
+		return rb.success();
+	}
+
+
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<AsServicePackageAitemDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		AsServicePackageAitemDetailsVo vo = asServicePackageAitemService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackageaitem/AsServicePackageAitemService.java

@@ -0,0 +1,106 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asservicepackageaitem;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.as.api.asservicepackageaitem.AsServicePackageAitem;
+import com.yxt.anrui.as.api.asservicepackageaitem.AsServicePackageAitemQuery;
+import com.yxt.anrui.as.api.asservicepackageaitem.AsServicePackageAitemVo;
+import com.yxt.anrui.as.api.asservicepackageaitem.AsServicePackageAitemDetailsVo;
+import com.yxt.anrui.as.api.asservicepackageaitem.AsServicePackageAitemDto;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageAitemService.java <br/>
+ * Class: com.yxt.anrui.as.biz.asservicepackageaitem.AsServicePackageAitemService <br/>
+ * Description: 服务套餐-附件项目 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AsServicePackageAitemService extends MybatisBaseService<AsServicePackageAitemMapper, AsServicePackageAitem> {
+	private QueryWrapper<AsServicePackageAitem> createQueryWrapper(AsServicePackageAitemQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<AsServicePackageAitem> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<AsServicePackageAitemVo> listPageVo(PagerQuery<AsServicePackageAitemQuery> pq) {
+		AsServicePackageAitemQuery query = pq.getParams();
+		QueryWrapper<AsServicePackageAitem> qw = createQueryWrapper(query);
+		IPage<AsServicePackageAitem> page = PagerUtil.queryToPage(pq);
+		IPage<AsServicePackageAitemVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<AsServicePackageAitemVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(AsServicePackageAitemDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(AsServicePackageAitemDto dto){
+		AsServicePackageAitem entity = new AsServicePackageAitem();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(AsServicePackageAitemDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		AsServicePackageAitem entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public AsServicePackageAitemDetailsVo fetchDetailsVoBySid(String sid){
+		AsServicePackageAitem entity = fetchBySid(sid);
+		AsServicePackageAitemDetailsVo vo = new AsServicePackageAitemDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackagegoods/AsServicePackageGoodsMapper.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asservicepackagegoods;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.as.api.asservicepackagegoods.AsServicePackageGoods;
+import com.yxt.anrui.as.api.asservicepackagegoods.AsServicePackageGoodsVo;
+
+import java.util.List;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageGoodsMapper.java <br/>
+ * Class: com.yxt.anrui.as.biz.asservicepackagegoods.AsServicePackageGoodsMapper <br/>
+ * Description: 服务套餐-商品. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface AsServicePackageGoodsMapper extends BaseMapper<AsServicePackageGoods> {
+
+	//@Update("update as_service_package_goods set name=#{msg} where id=#{id}")
+	//IPage<AsServicePackageGoodsVo> voPage(IPage<AsServicePackageGoods> page, @Param(Constants.WRAPPER) QueryWrapper<AsServicePackageGoods> qw);
+	
+	IPage<AsServicePackageGoodsVo> selectPageVo(IPage<AsServicePackageGoods> page, @Param(Constants.WRAPPER) Wrapper<AsServicePackageGoods> qw);
+	
+	List<AsServicePackageGoodsVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsServicePackageGoods> qw);
+	
+	@Select("select * from as_service_package_goods")
+	List<AsServicePackageGoodsVo> selectListVo();
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackagegoods/AsServicePackageGoodsMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.as.biz.asservicepackagegoods.AsServicePackageGoodsMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asservicepackagegoods.AsServicePackageGoodsVo">
+		SELECT * FROM as_service_package_goods <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asservicepackagegoods.AsServicePackageGoodsVo">
+		SELECT * FROM as_service_package_goods <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackagegoods/AsServicePackageGoodsRest.java

@@ -0,0 +1,97 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asservicepackagegoods;
+
+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.*;
+
+import com.yxt.anrui.as.api.asservicepackagegoods.AsServicePackageGoodsQuery;
+import com.yxt.anrui.as.api.asservicepackagegoods.AsServicePackageGoodsVo;
+import com.yxt.anrui.as.api.asservicepackagegoods.AsServicePackageGoodsDetailsVo;
+import com.yxt.anrui.as.api.asservicepackagegoods.AsServicePackageGoodsDto;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageGoodsFeignFallback.java <br/>
+ * Class: com.yxt.anrui.as.biz.asservicepackagegoods.AsServicePackageGoodsRest <br/>
+ * Description: 服务套餐-商品. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "服务套餐-商品")
+@RestController("com.yxt.anrui.as.biz.asservicepackagegoods.AsServicePackageGoodsRest")
+@RequestMapping("v1/asservicepackagegoods")
+public class AsServicePackageGoodsRest {
+
+	@Autowired
+	private AsServicePackageGoodsService asServicePackageGoodsService;
+
+
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<AsServicePackageGoodsVo>> listPage(@RequestBody PagerQuery<AsServicePackageGoodsQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<AsServicePackageGoodsVo> pv = asServicePackageGoodsService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody AsServicePackageGoodsDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		asServicePackageGoodsService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		asServicePackageGoodsService.delBySids(sids);
+		return rb.success();
+	}
+
+
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<AsServicePackageGoodsDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		AsServicePackageGoodsDetailsVo vo = asServicePackageGoodsService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackagegoods/AsServicePackageGoodsService.java

@@ -0,0 +1,106 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asservicepackagegoods;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.as.api.asservicepackagegoods.AsServicePackageGoods;
+import com.yxt.anrui.as.api.asservicepackagegoods.AsServicePackageGoodsQuery;
+import com.yxt.anrui.as.api.asservicepackagegoods.AsServicePackageGoodsVo;
+import com.yxt.anrui.as.api.asservicepackagegoods.AsServicePackageGoodsDetailsVo;
+import com.yxt.anrui.as.api.asservicepackagegoods.AsServicePackageGoodsDto;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageGoodsService.java <br/>
+ * Class: com.yxt.anrui.as.biz.asservicepackagegoods.AsServicePackageGoodsService <br/>
+ * Description: 服务套餐-商品 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AsServicePackageGoodsService extends MybatisBaseService<AsServicePackageGoodsMapper, AsServicePackageGoods> {
+	private QueryWrapper<AsServicePackageGoods> createQueryWrapper(AsServicePackageGoodsQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<AsServicePackageGoods> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<AsServicePackageGoodsVo> listPageVo(PagerQuery<AsServicePackageGoodsQuery> pq) {
+		AsServicePackageGoodsQuery query = pq.getParams();
+		QueryWrapper<AsServicePackageGoods> qw = createQueryWrapper(query);
+		IPage<AsServicePackageGoods> page = PagerUtil.queryToPage(pq);
+		IPage<AsServicePackageGoodsVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<AsServicePackageGoodsVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(AsServicePackageGoodsDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(AsServicePackageGoodsDto dto){
+		AsServicePackageGoods entity = new AsServicePackageGoods();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(AsServicePackageGoodsDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		AsServicePackageGoods entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public AsServicePackageGoodsDetailsVo fetchDetailsVoBySid(String sid){
+		AsServicePackageGoods entity = fetchBySid(sid);
+		AsServicePackageGoodsDetailsVo vo = new AsServicePackageGoodsDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackagesitem/AsServicePackageSitemMapper.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asservicepackagesitem;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.as.api.asservicepackagesitem.AsServicePackageSitem;
+import com.yxt.anrui.as.api.asservicepackagesitem.AsServicePackageSitemVo;
+
+import java.util.List;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageSitemMapper.java <br/>
+ * Class: com.yxt.anrui.as.biz.asservicepackagesitem.AsServicePackageSitemMapper <br/>
+ * Description: 服务套餐-服务项目. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface AsServicePackageSitemMapper extends BaseMapper<AsServicePackageSitem> {
+
+	//@Update("update as_service_package_sitem set name=#{msg} where id=#{id}")
+	//IPage<AsServicePackageSitemVo> voPage(IPage<AsServicePackageSitem> page, @Param(Constants.WRAPPER) QueryWrapper<AsServicePackageSitem> qw);
+	
+	IPage<AsServicePackageSitemVo> selectPageVo(IPage<AsServicePackageSitem> page, @Param(Constants.WRAPPER) Wrapper<AsServicePackageSitem> qw);
+	
+	List<AsServicePackageSitemVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsServicePackageSitem> qw);
+	
+	@Select("select * from as_service_package_sitem")
+	List<AsServicePackageSitemVo> selectListVo();
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackagesitem/AsServicePackageSitemMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.as.biz.asservicepackagesitem.AsServicePackageSitemMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asservicepackagesitem.AsServicePackageSitemVo">
+		SELECT * FROM as_service_package_sitem <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asservicepackagesitem.AsServicePackageSitemVo">
+		SELECT * FROM as_service_package_sitem <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackagesitem/AsServicePackageSitemRest.java

@@ -0,0 +1,97 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asservicepackagesitem;
+
+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.*;
+
+import com.yxt.anrui.as.api.asservicepackagesitem.AsServicePackageSitemQuery;
+import com.yxt.anrui.as.api.asservicepackagesitem.AsServicePackageSitemVo;
+import com.yxt.anrui.as.api.asservicepackagesitem.AsServicePackageSitemDetailsVo;
+import com.yxt.anrui.as.api.asservicepackagesitem.AsServicePackageSitemDto;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageSitemFeignFallback.java <br/>
+ * Class: com.yxt.anrui.as.biz.asservicepackagesitem.AsServicePackageSitemRest <br/>
+ * Description: 服务套餐-服务项目. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "服务套餐-服务项目")
+@RestController("com.yxt.anrui.as.biz.asservicepackagesitem.AsServicePackageSitemRest")
+@RequestMapping("v1/asservicepackagesitem")
+public class AsServicePackageSitemRest  {
+
+	@Autowired
+	private AsServicePackageSitemService asServicePackageSitemService;
+
+
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<AsServicePackageSitemVo>> listPage(@RequestBody PagerQuery<AsServicePackageSitemQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<AsServicePackageSitemVo> pv = asServicePackageSitemService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody AsServicePackageSitemDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		asServicePackageSitemService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		asServicePackageSitemService.delBySids(sids);
+		return rb.success();
+	}
+
+
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<AsServicePackageSitemDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		AsServicePackageSitemDetailsVo vo = asServicePackageSitemService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackagesitem/AsServicePackageSitemService.java

@@ -0,0 +1,106 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asservicepackagesitem;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.as.api.asservicepackagesitem.AsServicePackageSitem;
+import com.yxt.anrui.as.api.asservicepackagesitem.AsServicePackageSitemQuery;
+import com.yxt.anrui.as.api.asservicepackagesitem.AsServicePackageSitemVo;
+import com.yxt.anrui.as.api.asservicepackagesitem.AsServicePackageSitemDetailsVo;
+import com.yxt.anrui.as.api.asservicepackagesitem.AsServicePackageSitemDto;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageSitemService.java <br/>
+ * Class: com.yxt.anrui.as.biz.asservicepackagesitem.AsServicePackageSitemService <br/>
+ * Description: 服务套餐-服务项目 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AsServicePackageSitemService extends MybatisBaseService<AsServicePackageSitemMapper, AsServicePackageSitem> {
+	private QueryWrapper<AsServicePackageSitem> createQueryWrapper(AsServicePackageSitemQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<AsServicePackageSitem> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<AsServicePackageSitemVo> listPageVo(PagerQuery<AsServicePackageSitemQuery> pq) {
+		AsServicePackageSitemQuery query = pq.getParams();
+		QueryWrapper<AsServicePackageSitem> qw = createQueryWrapper(query);
+		IPage<AsServicePackageSitem> page = PagerUtil.queryToPage(pq);
+		IPage<AsServicePackageSitemVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<AsServicePackageSitemVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(AsServicePackageSitemDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(AsServicePackageSitemDto dto){
+		AsServicePackageSitem entity = new AsServicePackageSitem();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(AsServicePackageSitemDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		AsServicePackageSitem entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public AsServicePackageSitemDetailsVo fetchDetailsVoBySid(String sid){
+		AsServicePackageSitem entity = fetchBySid(sid);
+		AsServicePackageSitemDetailsVo vo = new AsServicePackageSitemDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}

yxt-as/src/main/java/com/yxt/anrui/as/feign/base/basevehiclemodel/BaseVehModelVo.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.as.feign.base.basevehiclemodel;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/3/7 15:16
+ */
+@Data
+public class BaseVehModelVo {
+    private String sid;
+    private String modelName;
+}

yxt-as/src/main/java/com/yxt/anrui/as/feign/base/basevehiclemodel/BaseVehicleModelFeign.java

@@ -0,0 +1,42 @@
+package com.yxt.anrui.as.feign.base.basevehiclemodel;
+
+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.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Project: anrui-base(安瑞基础信息模块) <br/>
+ * File: BaseVehicleModelFeign.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign <br/>
+ * Description: 车型信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-09-10 11:31:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "车型信息")
+@FeignClient(
+        contextId = "anrui-base-BaseVehicleModel",
+        name = "anrui-base",
+        path = "v1/basevehiclemodel",
+        fallback = BaseVehicleModelFeignFallback.class)
+public interface BaseVehicleModelFeign {
+
+    @ApiOperation("查询分公司下所有的车型")
+    @GetMapping("/getVehModelByCreateOrg")
+    public ResultBean<List<BaseVehModelVo>> getVehModelByCreateOrg(@RequestParam("createOrg") String createOrg);
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/feign/base/basevehiclemodel/BaseVehicleModelFeignFallback.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.as.feign.base.basevehiclemodel;
+
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/3/7 15:13
+ */
+@Component
+public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign{
+    @Override
+    public ResultBean<List<BaseVehModelVo>> getVehModelByCreateOrg(String createOrg) {
+        return null;
+    }
+}

yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsmanufacturer/WmsManufacturerFeign.java

@@ -0,0 +1,29 @@
+package com.yxt.anrui.as.feign.wms.wmsmanufacturer;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * @description: 厂家
+ * @author: fzz
+ * @date: 2024/3/7
+ **/
+@FeignClient(
+        contextId = "yxt-wms-WmsManufacturer",
+        name = "yxt-wms",
+        path = "apiadmin/base/wmsmanufacturer",
+        fallback = WmsManufacturerFeignFallback.class
+)
+public interface WmsManufacturerFeign {
+
+    @ApiOperation("查询分公司下所有的厂家")
+    @GetMapping("/getAllTypeByUseOrgSid")
+    public ResultBean<List<WmsManufacturerVo>> getAllTypeByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid);
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsmanufacturer/WmsManufacturerFeignFallback.java

@@ -0,0 +1,56 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.feign.wms.wmsmanufacturer;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-fin(安瑞财务) <br/>
+ * File: FinManufacturerBankFeignFallback.java <br/>
+ * Class: com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankFeignFallback <br/>
+ * Description: 公司开户账号表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-08-03 15:00:11 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class WmsManufacturerFeignFallback implements WmsManufacturerFeign {
+
+
+	@Override
+	public ResultBean<List<WmsManufacturerVo>> getAllTypeByUseOrgSid(String useOrgSid) {
+		return null;
+	}
+}

yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsmanufacturer/WmsManufacturerVo.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.as.feign.wms.wmsmanufacturer;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/3/7 14:29
+ */
+@Data
+public class WmsManufacturerVo {
+    private String id;
+    private String sid;
+    private String lockVersion;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date modifyTime;
+    private String remarks;
+    private String isEnable;
+    private String state;
+    private String isDelete;
+    private String manufacturerName;//厂家名称
+    private String manufacturerCode;//厂家编码
+    private String sortNo;//排序
+    private String useOrgSid;//使用组织sid
+    private String createOrgSid;//创建组织sid
+}