Merge remote-tracking branch 'origin/master'

1 year ago · c34ecc09bd
41 changed files with 2034 additions and 3 deletions
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
@ -1032,6 +1032,16 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
        if (StringUtils.isBlank(dto.getOrgPriceDate())) {
            return new ResultBean().fail().setMsg("公司入库日期不能为空");
        }
+        for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : vehicleList) {
+            if (StringUtils.isNotBlank(scmApplyInboundVehicleDto.getVinNo())) {
+                String vinNo = scmApplyInboundVehicleDto.getVinNo();
+                vinNo = vinNo.trim();
+                vinNo = vinNo.replace(" ", "");
+                if (vinNo.length() != 17) {
+                    return new ResultBean().fail().setMsg(scmApplyInboundVehicleDto.getVinNo() + "车架号输入不正确");
+                }
+            }
+        }
        /*int vinCount = 0;
        if (!vehicleList.isEmpty()) {
            for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : vehicleList) {
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItem.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceattachitem/AsServiceAttachItem.java
@ -0,0 +1,35 @@
+package com.yxt.anrui.as.api.asserviceattachitem;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.Entity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/3/6 17:27
+ */
+@Data
+@ApiModel(value = "附加项目", description = "附加项目")
+@TableName("as_service_attachitem")
+public class AsServiceAttachItem extends Entity {
+
+    @ApiModelProperty("项目名称")
+    private String aitemName;
+    @ApiModelProperty("项目名称")
+    private String aitemCode;
+    @ApiModelProperty("销售价(工时费)=工时单价*工时数")
+    private BigDecimal price;
+    @ApiModelProperty("工时数")
+    private Integer sortNo;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+
+
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroup.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroup.java
@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicegroup;
+
+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: AsServiceGroup.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicegroup.AsServiceGroup <br/>
+ * Description: 班组. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 10:27:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "班组", description = "班组")
+@TableName("as_service_group")
+public class AsServiceGroup extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("班组名称")
+    private String groupName;
+	@ApiModelProperty("排序")
+    private Integer sortNo;
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDetailsVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDetailsVo.java
@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicegroup;
+
+
+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: AsServiceGroupVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicegroup.AsServiceGroupVo <br/>
+ * Description: 班组 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 10:27:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "班组 视图数据详情", description = "班组 视图数据详情")
+public class AsServiceGroupDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("班组名称")
+    private String groupName;
+    @ApiModelProperty("排序")
+    private Integer sortNo;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDto.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDto.java
@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicegroup;
+
+
+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: AsServiceGroupDto.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicegroup.AsServiceGroupDto <br/>
+ * Description: 班组 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 10:27:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "班组 数据传输对象", description = "班组 数据传输对象")
+public class AsServiceGroupDto implements Dto {
+
+    private String sid; // sid
+
+    @ApiModelProperty("班组名称")
+    private String groupName;
+    @ApiModelProperty("排序")
+    private Integer sortNo;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupQuery.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupQuery.java
@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicegroup;
+
+
+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: AsServiceGroupQuery.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicegroup.AsServiceGroupQuery <br/>
+ * Description: 班组 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 10:27:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "班组 查询条件", description = "班组 查询条件")
+public class AsServiceGroupQuery implements Query {
+
+    @ApiModelProperty("班组名称")
+    private String groupName;
+    @ApiModelProperty("排序")
+    private Integer sortNo;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupVo.java
@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicegroup;
+
+
+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: AsServiceGroupVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicegroup.AsServiceGroupVo <br/>
+ * Description: 班组 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 10:27:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "班组 视图数据对象", description = "班组 视图数据对象")
+public class AsServiceGroupVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("班组名称")
+    private String groupName;
+    @ApiModelProperty("排序")
+    private Integer sortNo;
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItem.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItem.java
@ -0,0 +1,60 @@
+package com.yxt.anrui.as.api.asserviceitem;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.Entity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/3/6 17:27
+ */
+@Data
+@ApiModel(value = "服务项目", description = "服务项目")
+@TableName("as_service_item")
+public class AsServiceItem extends Entity {
+
+    @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 BigDecimal hourPrice;
+    @ApiModelProperty("工时数")
+    private Integer hours;
+    @ApiModelProperty("销售价(工时费)=工时单价*工时数")
+    private BigDecimal price;
+    @ApiModelProperty("考核工时(考核价）")
+    private BigDecimal examineHourPrice;
+    @ApiModelProperty("成本")
+    private BigDecimal cost;
+    @ApiModelProperty("是否为预约项目1是，0否")
+    private Integer isReserve;
+    @ApiModelProperty("是否为洗车项目1是，0否")
+    private Integer isClean;
+    @ApiModelProperty("工时数")
+    private Integer sortNo;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+
+
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubject.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubject.java
@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicesubject;
+
+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: AsServiceSubject.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicesubject.AsServiceSubject <br/>
+ * Description: 科目. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 10:27:31 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "科目", description = "科目")
+@TableName("as_service_subject")
+public class AsServiceSubject extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("科目名称")
+    private String subjectName;
+	@ApiModelProperty("科目编码")
+    private String subjectCode;
+	@ApiModelProperty("科目类型")
+    private String subjectType;
+	@ApiModelProperty("排序")
+    private Integer sortNo;
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectDetailsVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectDetailsVo.java
@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicesubject;
+
+
+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: AsServiceSubjectVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicesubject.AsServiceSubjectVo <br/>
+ * Description: 科目 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 10:27:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "科目 视图数据详情", description = "科目 视图数据详情")
+public class AsServiceSubjectDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("科目名称")
+    private String subjectName;
+    @ApiModelProperty("科目编码")
+    private String subjectCode;
+    @ApiModelProperty("科目类型")
+    private String subjectType;
+    @ApiModelProperty("排序")
+    private Integer sortNo;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectDto.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectDto.java
@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicesubject;
+
+
+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: AsServiceSubjectDto.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicesubject.AsServiceSubjectDto <br/>
+ * Description: 科目 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 10:27:31 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "科目 数据传输对象", description = "科目 数据传输对象")
+public class AsServiceSubjectDto implements Dto {
+
+    private String sid; // sid
+
+    @ApiModelProperty("科目名称")
+    private String subjectName;
+    @ApiModelProperty("科目编码")
+    private String subjectCode;
+    @ApiModelProperty("科目类型")
+    private String subjectType;
+    @ApiModelProperty("排序")
+    private Integer sortNo;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectQuery.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectQuery.java
@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicesubject;
+
+
+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: AsServiceSubjectQuery.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicesubject.AsServiceSubjectQuery <br/>
+ * Description: 科目 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 10:27:31 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "科目 查询条件", description = "科目 查询条件")
+public class AsServiceSubjectQuery implements Query {
+
+    @ApiModelProperty("科目名称")
+    private String subjectName;
+    @ApiModelProperty("科目编码")
+    private String subjectCode;
+    @ApiModelProperty("科目类型")
+    private String subjectType;
+    @ApiModelProperty("排序")
+    private Integer sortNo;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectVo.java
@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicesubject;
+
+
+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: AsServiceSubjectVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicesubject.AsServiceSubjectVo <br/>
+ * Description: 科目 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 10:27:31 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "科目 视图数据对象", description = "科目 视图数据对象")
+public class AsServiceSubjectVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("科目名称")
+    private String subjectName;
+    @ApiModelProperty("科目编码")
+    private String subjectCode;
+    @ApiModelProperty("科目类型")
+    private String subjectType;
+    @ApiModelProperty("排序")
+    private Integer sortNo;
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceType.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceType.java
@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicetype;
+
+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: AsServiceType.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicetype.AsServiceType <br/>
+ * Description: 服务类别-工种. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 10:27:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务类别-工种", description = "服务类别-工种")
+@TableName("as_service_type")
+public class AsServiceType extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("服务类别名称")
+    private String serviceTypeName;
+	@ApiModelProperty("服务类别编码")
+    private String serviceTypeCode;
+	@ApiModelProperty("提成比例")
+    private BigDecimal percentageRate;
+	@ApiModelProperty("提成金额")
+    private BigDecimal percentageAmount;
+	@ApiModelProperty("排序")
+    private Integer sortNo;
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeDetailsVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeDetailsVo.java
@ -0,0 +1,71 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicetype;
+
+
+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: AsServiceTypeVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicetype.AsServiceTypeVo <br/>
+ * Description: 服务类别-工种 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 10:27:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务类别-工种 视图数据详情", description = "服务类别-工种 视图数据详情")
+public class AsServiceTypeDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("服务类别名称")
+    private String serviceTypeName;
+    @ApiModelProperty("服务类别编码")
+    private String serviceTypeCode;
+    @ApiModelProperty("提成比例")
+    private BigDecimal percentageRate;
+    @ApiModelProperty("提成金额")
+    private BigDecimal percentageAmount;
+    @ApiModelProperty("排序")
+    private Integer sortNo;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeDto.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeDto.java
@ -0,0 +1,71 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicetype;
+
+
+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: AsServiceTypeDto.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicetype.AsServiceTypeDto <br/>
+ * Description: 服务类别-工种 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 10:27:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务类别-工种 数据传输对象", description = "服务类别-工种 数据传输对象")
+public class AsServiceTypeDto implements Dto {
+
+    private String sid; // sid
+
+    @ApiModelProperty("服务类别名称")
+    private String serviceTypeName;
+    @ApiModelProperty("服务类别编码")
+    private String serviceTypeCode;
+    @ApiModelProperty("提成比例")
+    private BigDecimal percentageRate;
+    @ApiModelProperty("提成金额")
+    private BigDecimal percentageAmount;
+    @ApiModelProperty("排序")
+    private Integer sortNo;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeQuery.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeQuery.java
@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicetype;
+
+
+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: AsServiceTypeQuery.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicetype.AsServiceTypeQuery <br/>
+ * Description: 服务类别-工种 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 10:27:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务类别-工种 查询条件", description = "服务类别-工种 查询条件")
+public class AsServiceTypeQuery implements Query {
+
+    @ApiModelProperty("服务类别名称")
+    private String serviceTypeName;
+    @ApiModelProperty("服务类别编码")
+    private String serviceTypeCode;
+    @ApiModelProperty("提成比例")
+    private BigDecimal percentageRate;
+    @ApiModelProperty("提成金额")
+    private BigDecimal percentageAmount;
+    @ApiModelProperty("排序")
+    private Integer sortNo;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeVo.java
@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asservicetype;
+
+
+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: AsServiceTypeVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicetype.AsServiceTypeVo <br/>
+ * Description: 服务类别-工种 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 10:27:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务类别-工种 视图数据对象", description = "服务类别-工种 视图数据对象")
+public class AsServiceTypeVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("服务类别名称")
+    private String serviceTypeName;
+    @ApiModelProperty("服务类别编码")
+    private String serviceTypeCode;
+    @ApiModelProperty("提成比例")
+    private BigDecimal percentageRate;
+    @ApiModelProperty("提成金额")
+    private BigDecimal percentageAmount;
+    @ApiModelProperty("排序")
+    private Integer sortNo;
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceattachitem/AsServiceAttachItemMapper.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceattachitem/AsServiceAttachItemMapper.java
@ -0,0 +1,14 @@
+package com.yxt.anrui.as.biz.asserviceattachitem;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.as.api.asserviceattachitem.AsServiceAttachItem;
+import org.apache.ibatis.annotations.Mapper;
+
+
+@Mapper
+public interface AsServiceAttachItemMapper extends BaseMapper<AsServiceAttachItem> {
+
+
+
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceattachitem/AsServiceAttachItemMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceattachitem/AsServiceAttachItemMapper.xml
@ -0,0 +1,8 @@
+<?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.asserviceattachitem.AsServiceAttachItemMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+
+
+</mapper>
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceattachitem/AsServiceAttachItemRest.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceattachitem/AsServiceAttachItemRest.java
@ -0,0 +1,18 @@
+package com.yxt.anrui.as.biz.asserviceattachitem;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author fzz
+ * @date 2024/03/06 17:03
+ */
+
+@Api(tags = "附加项目")
+@RestController
+@RequestMapping("AsServiceAttachItem")
+public class AsServiceAttachItemRest {
+
+
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceattachitem/AsServiceAttachItemService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceattachitem/AsServiceAttachItemService.java
@ -0,0 +1,15 @@
+package com.yxt.anrui.as.biz.asserviceattachitem;
+
+
+import com.yxt.anrui.as.api.asserviceattachitem.AsServiceAttachItem;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author fzz
+ */
+@Service
+public class AsServiceAttachItemService extends MybatisBaseService<AsServiceAttachItemMapper, AsServiceAttachItem> {
+
+
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceTypeMapper.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceTypeMapper.java
@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asservicegroup;
+
+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.asservicetype.AsServiceType;
+import com.yxt.anrui.as.api.asservicetype.AsServiceTypeVo;
+
+import java.util.List;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServiceTypeMapper.java <br/>
+ * Class: com.yxt.anrui.as.biz.asservicetype.AsServiceTypeMapper <br/>
+ * Description: 服务类别-工种. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 10:27:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface AsServiceTypeMapper extends BaseMapper<AsServiceType> {
+
+	//@Update("update as_service_type set name=#{msg} where id=#{id}")
+	//IPage<AsServiceTypeVo> voPage(IPage<AsServiceType> page, @Param(Constants.WRAPPER) QueryWrapper<AsServiceType> qw);
+	
+	IPage<AsServiceTypeVo> selectPageVo(IPage<AsServiceType> page, @Param(Constants.WRAPPER) Wrapper<AsServiceType> qw);
+	
+	List<AsServiceTypeVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsServiceType> qw);
+	
+	@Select("select * from as_service_type")
+	List<AsServiceTypeVo> selectListVo();
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceTypeMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceTypeMapper.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.asservicetype.AsServiceTypeMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asservicetype.AsServiceTypeVo">
+		SELECT * FROM as_service_type <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asservicetype.AsServiceTypeVo">
+		SELECT * FROM as_service_type <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceTypeRest.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceTypeRest.java
@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asservicegroup;
+
+import com.yxt.anrui.as.biz.asservicetype.AsServiceTypeService;
+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.asservicetype.AsServiceTypeQuery;
+import com.yxt.anrui.as.api.asservicetype.AsServiceTypeVo;
+import com.yxt.anrui.as.api.asservicetype.AsServiceTypeDetailsVo;
+import com.yxt.anrui.as.api.asservicetype.AsServiceTypeDto;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServiceTypeFeignFallback.java <br/>
+ * Class: com.yxt.anrui.as.biz.asservicetype.AsServiceTypeRest <br/>
+ * Description: 服务类别-工种. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 10:27:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "服务类别-工种")
+@RestController
+@RequestMapping("v1/asservicetype")
+public class AsServiceTypeRest{
+
+	@Autowired
+	private AsServiceTypeService asServiceTypeService;
+
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<AsServiceTypeVo>> listPage(@RequestBody PagerQuery<AsServiceTypeQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<AsServiceTypeVo> pv = asServiceTypeService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody AsServiceTypeDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		asServiceTypeService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		asServiceTypeService.delBySids(sids);
+		return rb.success();
+	}
+
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<AsServiceTypeDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		AsServiceTypeDetailsVo vo = asServiceTypeService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceTypeService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceTypeService.java
@ -0,0 +1,107 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asservicegroup;
+
+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.biz.asservicetype.AsServiceTypeMapper;
+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.asservicetype.AsServiceType;
+import com.yxt.anrui.as.api.asservicetype.AsServiceTypeQuery;
+import com.yxt.anrui.as.api.asservicetype.AsServiceTypeVo;
+import com.yxt.anrui.as.api.asservicetype.AsServiceTypeDetailsVo;
+import com.yxt.anrui.as.api.asservicetype.AsServiceTypeDto;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServiceTypeService.java <br/>
+ * Class: com.yxt.anrui.as.biz.asservicetype.AsServiceTypeService <br/>
+ * Description: 服务类别-工种 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 10:27:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AsServiceTypeService extends MybatisBaseService<AsServiceTypeMapper, AsServiceType> {
+	private QueryWrapper<AsServiceType> createQueryWrapper(AsServiceTypeQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<AsServiceType> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<AsServiceTypeVo> listPageVo(PagerQuery<AsServiceTypeQuery> pq) {
+		AsServiceTypeQuery query = pq.getParams();
+		QueryWrapper<AsServiceType> qw = createQueryWrapper(query);
+		IPage<AsServiceType> page = PagerUtil.queryToPage(pq);
+		IPage<AsServiceTypeVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<AsServiceTypeVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(AsServiceTypeDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(AsServiceTypeDto dto){
+		AsServiceType entity = new AsServiceType();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(AsServiceTypeDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		AsServiceType entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public AsServiceTypeDetailsVo fetchDetailsVoBySid(String sid){
+		AsServiceType entity = fetchBySid(sid);
+		AsServiceTypeDetailsVo vo = new AsServiceTypeDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.java
@ -0,0 +1,14 @@
+package com.yxt.anrui.as.biz.asserviceitem;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.as.api.asserviceitem.AsServiceItem;
+import org.apache.ibatis.annotations.Mapper;
+
+
+@Mapper
+public interface AsServiceItemMapper extends BaseMapper<AsServiceItem> {
+
+
+
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.xml
@ -0,0 +1,8 @@
+<?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.asserviceitem.AsServiceItemMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+
+
+</mapper>
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemRest.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemRest.java
@ -0,0 +1,18 @@
+package com.yxt.anrui.as.biz.asserviceitem;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author fzz
+ * @date 2024/03/06 17:03
+ */
+
+@Api(tags = "服务项目")
+@RestController
+@RequestMapping("AsServiceItem")
+public class AsServiceItemRest {
+
+
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java
@ -0,0 +1,15 @@
+package com.yxt.anrui.as.biz.asserviceitem;
+
+
+import com.yxt.anrui.as.api.asserviceitem.AsServiceItem;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author fzz
+ */
+@Service
+public class AsServiceItemService extends MybatisBaseService<AsServiceItemMapper, AsServiceItem> {
+
+
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceTypeMapper.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceTypeMapper.java
@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asservicesubject;
+
+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.asservicetype.AsServiceType;
+import com.yxt.anrui.as.api.asservicetype.AsServiceTypeVo;
+
+import java.util.List;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServiceTypeMapper.java <br/>
+ * Class: com.yxt.anrui.as.biz.asservicetype.AsServiceTypeMapper <br/>
+ * Description: 服务类别-工种. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 10:27:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface AsServiceTypeMapper extends BaseMapper<AsServiceType> {
+
+	//@Update("update as_service_type set name=#{msg} where id=#{id}")
+	//IPage<AsServiceTypeVo> voPage(IPage<AsServiceType> page, @Param(Constants.WRAPPER) QueryWrapper<AsServiceType> qw);
+	
+	IPage<AsServiceTypeVo> selectPageVo(IPage<AsServiceType> page, @Param(Constants.WRAPPER) Wrapper<AsServiceType> qw);
+	
+	List<AsServiceTypeVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsServiceType> qw);
+	
+	@Select("select * from as_service_type")
+	List<AsServiceTypeVo> selectListVo();
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceTypeMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceTypeMapper.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.asservicetype.AsServiceTypeMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asservicetype.AsServiceTypeVo">
+		SELECT * FROM as_service_type <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asservicetype.AsServiceTypeVo">
+		SELECT * FROM as_service_type <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceTypeRest.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceTypeRest.java
@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asservicesubject;
+
+import com.yxt.anrui.as.biz.asservicetype.AsServiceTypeService;
+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.asservicetype.AsServiceTypeQuery;
+import com.yxt.anrui.as.api.asservicetype.AsServiceTypeVo;
+import com.yxt.anrui.as.api.asservicetype.AsServiceTypeDetailsVo;
+import com.yxt.anrui.as.api.asservicetype.AsServiceTypeDto;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServiceTypeFeignFallback.java <br/>
+ * Class: com.yxt.anrui.as.biz.asservicetype.AsServiceTypeRest <br/>
+ * Description: 服务类别-工种. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 10:27:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "服务类别-工种")
+@RestController("com.yxt.anrui.as.biz.asservicetype.AsServiceTypeRest")
+@RequestMapping("v1/asservicetype")
+public class AsServiceTypeRest{
+
+	@Autowired
+	private AsServiceTypeService asServiceTypeService;
+
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<AsServiceTypeVo>> listPage(@RequestBody PagerQuery<AsServiceTypeQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<AsServiceTypeVo> pv = asServiceTypeService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody AsServiceTypeDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		asServiceTypeService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		asServiceTypeService.delBySids(sids);
+		return rb.success();
+	}
+
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<AsServiceTypeDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		AsServiceTypeDetailsVo vo = asServiceTypeService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceTypeService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceTypeService.java
@ -0,0 +1,107 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asservicesubject;
+
+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.biz.asservicetype.AsServiceTypeMapper;
+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.asservicetype.AsServiceType;
+import com.yxt.anrui.as.api.asservicetype.AsServiceTypeQuery;
+import com.yxt.anrui.as.api.asservicetype.AsServiceTypeVo;
+import com.yxt.anrui.as.api.asservicetype.AsServiceTypeDetailsVo;
+import com.yxt.anrui.as.api.asservicetype.AsServiceTypeDto;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServiceTypeService.java <br/>
+ * Class: com.yxt.anrui.as.biz.asservicetype.AsServiceTypeService <br/>
+ * Description: 服务类别-工种 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 10:27:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AsServiceTypeService extends MybatisBaseService<AsServiceTypeMapper, AsServiceType> {
+	private QueryWrapper<AsServiceType> createQueryWrapper(AsServiceTypeQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<AsServiceType> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<AsServiceTypeVo> listPageVo(PagerQuery<AsServiceTypeQuery> pq) {
+		AsServiceTypeQuery query = pq.getParams();
+		QueryWrapper<AsServiceType> qw = createQueryWrapper(query);
+		IPage<AsServiceType> page = PagerUtil.queryToPage(pq);
+		IPage<AsServiceTypeVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<AsServiceTypeVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(AsServiceTypeDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(AsServiceTypeDto dto){
+		AsServiceType entity = new AsServiceType();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(AsServiceTypeDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		AsServiceType entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public AsServiceTypeDetailsVo fetchDetailsVoBySid(String sid){
+		AsServiceType entity = fetchBySid(sid);
+		AsServiceTypeDetailsVo vo = new AsServiceTypeDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeMapper.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeMapper.java
@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asservicetype;
+
+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.asservicetype.AsServiceType;
+import com.yxt.anrui.as.api.asservicetype.AsServiceTypeVo;
+
+import java.util.List;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServiceTypeMapper.java <br/>
+ * Class: com.yxt.anrui.as.biz.asservicetype.AsServiceTypeMapper <br/>
+ * Description: 服务类别-工种. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 10:27:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface AsServiceTypeMapper extends BaseMapper<AsServiceType> {
+
+	//@Update("update as_service_type set name=#{msg} where id=#{id}")
+	//IPage<AsServiceTypeVo> voPage(IPage<AsServiceType> page, @Param(Constants.WRAPPER) QueryWrapper<AsServiceType> qw);
+	
+	IPage<AsServiceTypeVo> selectPageVo(IPage<AsServiceType> page, @Param(Constants.WRAPPER) Wrapper<AsServiceType> qw);
+	
+	List<AsServiceTypeVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsServiceType> qw);
+	
+	@Select("select * from as_service_type")
+	List<AsServiceTypeVo> selectListVo();
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeMapper.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.asservicetype.AsServiceTypeMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asservicetype.AsServiceTypeVo">
+		SELECT * FROM as_service_type <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asservicetype.AsServiceTypeVo">
+		SELECT * FROM as_service_type <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeRest.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeRest.java
@ -0,0 +1,93 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asservicetype;
+
+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.asservicetype.AsServiceTypeQuery;
+import com.yxt.anrui.as.api.asservicetype.AsServiceTypeVo;
+import com.yxt.anrui.as.api.asservicetype.AsServiceTypeDetailsVo;
+import com.yxt.anrui.as.api.asservicetype.AsServiceTypeDto;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServiceTypeFeignFallback.java <br/>
+ * Class: com.yxt.anrui.as.biz.asservicetype.AsServiceTypeRest <br/>
+ * Description: 服务类别-工种. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 10:27:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "服务类别-工种")
+@RestController
+@RequestMapping("v1/asservicetype")
+public class AsServiceTypeRest{
+
+	@Autowired
+	private AsServiceTypeService asServiceTypeService;
+
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<AsServiceTypeVo>> listPage(@RequestBody PagerQuery<AsServiceTypeQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<AsServiceTypeVo> pv = asServiceTypeService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody AsServiceTypeDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		asServiceTypeService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		asServiceTypeService.delBySids(sids);
+		return rb.success();
+	}
+
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<AsServiceTypeDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		AsServiceTypeDetailsVo vo = asServiceTypeService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java
@ -0,0 +1,106 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asservicetype;
+
+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.asservicetype.AsServiceType;
+import com.yxt.anrui.as.api.asservicetype.AsServiceTypeQuery;
+import com.yxt.anrui.as.api.asservicetype.AsServiceTypeVo;
+import com.yxt.anrui.as.api.asservicetype.AsServiceTypeDetailsVo;
+import com.yxt.anrui.as.api.asservicetype.AsServiceTypeDto;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServiceTypeService.java <br/>
+ * Class: com.yxt.anrui.as.biz.asservicetype.AsServiceTypeService <br/>
+ * Description: 服务类别-工种 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 10:27:32 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AsServiceTypeService extends MybatisBaseService<AsServiceTypeMapper, AsServiceType> {
+	private QueryWrapper<AsServiceType> createQueryWrapper(AsServiceTypeQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<AsServiceType> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<AsServiceTypeVo> listPageVo(PagerQuery<AsServiceTypeQuery> pq) {
+		AsServiceTypeQuery query = pq.getParams();
+		QueryWrapper<AsServiceType> qw = createQueryWrapper(query);
+		IPage<AsServiceType> page = PagerUtil.queryToPage(pq);
+		IPage<AsServiceTypeVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<AsServiceTypeVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(AsServiceTypeDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(AsServiceTypeDto dto){
+		AsServiceType entity = new AsServiceType();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(AsServiceTypeDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		AsServiceType entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public AsServiceTypeDetailsVo fetchDetailsVoBySid(String sid){
+		AsServiceType entity = fetchBySid(sid);
+		AsServiceTypeDetailsVo vo = new AsServiceTypeDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}
--- a/yxt-as/src/main/resources/application-devv.yml
+++ b/yxt-as/src/main/resources/application-devv.yml
@ -1,7 +1,7 @@
 spring:
  datasource:
    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/yxt_as?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://127.0.0.1:3306/yxt_4sas?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
    username: root
    password: root
  cloud:
--- a/yxt-as/src/main/resources/application-pro.yml
+++ b/yxt-as/src/main/resources/application-pro.yml
@ -1,7 +1,7 @@
 spring:
  datasource:
    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://120.46.172.184:3306/yxt_as?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
+    url: jdbc:mysql://120.46.172.184:3306/yxt_4sas?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
    username: root
    password: '@anrui18033887500'
  cloud:
--- a/yxt-as/src/main/resources/application-test.yml
+++ b/yxt-as/src/main/resources/application-test.yml
@ -1,7 +1,7 @@
 spring:
  datasource:
    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://172.18.0.4:3306/yxt_as?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://172.18.0.4:3306/yxt_4sas?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
    username: root
    password: yxt_mysql_138
  cloud: