Merge remote-tracking branch 'origin/master'

anrui-riskcenter-ui/src/components/tab-search/index.vue

@@ -38,7 +38,7 @@
 	.tab-header {
 			background-color: $search-bg;
 			padding: 5px 20px;
-			//margin-bottom: 15px;
+			margin-bottom: 15px;
 			.tab-search{
 				padding: 9px 0px;
 			}

anrui-riskcenter-ui/src/styles/element-table.scss

@@ -1,19 +1,38 @@
 .el-table {
-  .el-table__header{
-    tr th{
+  .el-table__header {
+    tr th {
       background: #edf1f7;
       color: #333333;
+      padding: 8px 0;
+      font-size: 16px;
     }
   }
 }
 
-.table-describe{
+.el-table {
+  .el-table__row {
+    .cell {
+      line-height:15px;
+    }
+  }
+}
+
+.el-table {
+  .el-table__body {
+    tr td {
+      padding: 6px 0 !important;
+    }
+  }
+}
+
+.table-describe {
   border: 1px solid #dfe4ed;
-  border-bottom: 0px solid #dfe4ed;
-  h4{
+  border-bottom: 0 solid #dfe4ed;
+
+  h4 {
     float: left;
     margin: 0;
     line-height: 34px;
-    padding:0 15px;
+    padding: 0 15px;
   }
 }

anrui-riskcenter-ui/src/views/customerrepayment/customerrepayment.vue

@@ -78,7 +78,7 @@
         </div>
         <!--Start 主页面主要部分 -->
         <div class="">
-          <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column fixed type="selection" align="center" width="50"/>
             <el-table-column fixed label="序号" type="index" width="80" :index="indexMethod" align="center"/>
             <el-table-column fixed prop="useOrgName" label="分公司" width="130" align="center" />

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBill.java

@@ -1,50 +1,86 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
 package com.yxt.anrui.as.api.asbusreservebill;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yxt.common.core.domain.Entity;
+import com.yxt.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
- * @author Fan
- * @description
- * @date 2024/3/6 17:27
+ * Project: as(as) <br/>
+ * File: AsBusreserveBill.java <br/>
+ * Class: as.api.asbusreservebill.AsBusreserveBill <br/>
+ * Description: 预约单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-09 17:01:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
  */
 @Data
 @ApiModel(value = "预约单", description = "预约单")
 @TableName("as_busreserve_bill")
-public class AsBusreserveBill extends Entity {
+public class AsBusreserveBill extends BaseEntity {
+    private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty("制单人姓名")
-    private String createByName;
-    @ApiModelProperty("单据编号")
-    private String billNo;
-    @ApiModelProperty("预约时间开始")
-    private Date reserveStart;
-    @ApiModelProperty("预约时间截止")
-    private Date reserveEnd;
-    @ApiModelProperty("预约服务顾问sid")
-    private String waitorSid;
-    @ApiModelProperty("预约服务顾问")
-    private String waitorName;
-    @ApiModelProperty("预约设备")
-    private String reserveEquip;
-    @ApiModelProperty("客户sid")
-    private String customerSid;
-    @ApiModelProperty("客户名称")
-    private String customerName;
-    @ApiModelProperty("联系电话")
-    private String mobile;
-    @ApiModelProperty("车牌号")
-    private String vehMark;
-    @ApiModelProperty("车型")
-    private String vehModel;
-    @ApiModelProperty("使用组织sid")
-    private String useOrgSid;
-    @ApiModelProperty("创建组织sid")
-    private String createOrgSid;
+	@ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+	@ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("预约时间开始")
+    private Date reserveStart; // 预约时间开始
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("预约时间截止")
+    private Date reserveEnd; // 预约时间截止
+	@ApiModelProperty("预约服务顾问sid")
+    private String waitorSid; // 预约服务顾问sid
+	@ApiModelProperty("预约服务顾问")
+    private String waitorName; // 预约服务顾问
+	@ApiModelProperty("预约设备")
+    private String reserveEquip; // 预约设备
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("联系电话")
+    private String mobile; // 联系电话
+	@ApiModelProperty("车牌号")
+    private String vehMark; // 车牌号
+	@ApiModelProperty("车型")
+    private String vehModel; // 车型
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
 
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDetailsVo.java

@@ -0,0 +1,90 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asbusreservebill;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: as(as) <br/>
+ * File: AsBusreserveBillVo.java <br/>
+ * Class: as.api.asbusreservebill.AsBusreserveBillVo <br/>
+ * Description: 预约单 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-09 17:01:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "预约单 视图数据详情", description = "预约单 视图数据详情")
+public class AsBusreserveBillDetailsVo implements Vo {
+
+    private String sid; // sid
+    private String createBySid; // sid
+    private String remarks; // 备注
+    @ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+    @ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+    private String reserveStart; // 预约时间开始
+    @ApiModelProperty("预约时间截止")
+    private String reserveEnd; // 预约时间截止
+    @ApiModelProperty("预约服务顾问sid")
+    private String waitorSid; // 预约服务顾问sid
+    @ApiModelProperty("预约服务顾问")
+    private String waitorName; // 预约服务顾问
+    @ApiModelProperty("预约设备")
+    private String reserveEquip; // 预约设备
+    @ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("联系电话")
+    private String mobile; // 联系电话
+    @ApiModelProperty("车牌号")
+    private String vehMark; // 车牌号
+    @ApiModelProperty("车型")
+    private String vehModel; // 车型
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+    private List<AsbillSitemVo> sitemVos = new ArrayList<>();
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java

@@ -0,0 +1,91 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asbusreservebill;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: as(as) <br/>
+ * File: AsBusreserveBillDto.java <br/>
+ * Class: as.api.asbusreservebill.AsBusreserveBillDto <br/>
+ * Description: 预约单 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-09 17:01:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "预约单 数据传输对象", description = "预约单 数据传输对象")
+public class AsBusreserveBillDto implements Dto {
+
+    private String sid; // sid
+    private String createBySid; // sid
+    private String remarks; // 备注
+    @ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+    @ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+    private String reserveStart; // 预约时间开始
+    @ApiModelProperty("预约时间截止")
+    private String reserveEnd; // 预约时间截止
+    @ApiModelProperty("预约服务顾问sid")
+    private String waitorSid; // 预约服务顾问sid
+    @ApiModelProperty("预约服务顾问")
+    private String waitorName; // 预约服务顾问
+    @ApiModelProperty("预约设备")
+    private String reserveEquip; // 预约设备
+    @ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("联系电话")
+    private String mobile; // 联系电话
+    @ApiModelProperty("车牌号")
+    private String vehMark; // 车牌号
+    @ApiModelProperty("车型")
+    private String vehModel; // 车型
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+    private List<AsbillSitemVo> sitemVos = new ArrayList<>();
+
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillQuery.java

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asbusreservebill;
+
+
+import com.yxt.common.core.query.Query;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: as(as) <br/>
+ * File: AsBusreserveBillQuery.java <br/>
+ * Class: as.api.asbusreservebill.AsBusreserveBillQuery <br/>
+ * Description: 预约单 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-09 17:01:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "预约单 查询条件", description = "预约单 查询条件")
+public class AsBusreserveBillQuery implements Query {
+
+	@ApiModelProperty("预约时间开始")
+    private String startDate; // 预约时间开始
+    private String endDate; // 预约时间开始
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("联系电话")
+    private String mobile; // 联系电话
+	@ApiModelProperty("车牌号")
+    private String vehMark; // 车牌号
+	@ApiModelProperty("车型")
+    private String vehModel; // 车型
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+    private String state;
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillVo.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asbusreservebill;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: as(as) <br/>
+ * File: AsBusreserveBillVo.java <br/>
+ * Class: as.api.asbusreservebill.AsBusreserveBillVo <br/>
+ * Description: 预约单 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-09 17:01:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "预约单 视图数据对象", description = "预约单 视图数据对象")
+public class AsBusreserveBillVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+	@ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+    private String reserveStart; // 预约时间开始
+    @ApiModelProperty("预约时间截止")
+    private String reserveEnd; // 预约时间截止
+	@ApiModelProperty("预约服务顾问")
+    private String waitorName; // 预约服务顾问
+	@ApiModelProperty("预约设备")
+    private String reserveEquip; // 预约设备
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("联系电话")
+    private String mobile; // 联系电话
+	@ApiModelProperty("车牌号")
+    private String vehMark; // 车牌号
+	@ApiModelProperty("车型")
+    private String vehModel; // 车型
+    private String remarks;
+    private String state; // 1未完成 0已完成
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsbillSitemVo.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.as.api.asbusreservebill;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/4/9 17:09
+ */
+@Data
+public class AsbillSitemVo{
+    @ApiModelProperty("项目sid")
+    private String serviceItemSid; // 项目sid
+    @ApiModelProperty("项目名称")
+    private String serviceItem; // 项目名称
+    @ApiModelProperty("工时单价")
+    private String hourPrice; // 工时单价
+    @ApiModelProperty("工时数")
+    private String hours; // 工时数
+    @ApiModelProperty("销售价(工时费)=工时单价*工时数")
+    private String price; // 销售价(工时费)=工时单价*工时数
+    private String remarks;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebillsitem/AsBusreserveBillSitem.java

@@ -0,0 +1,68 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asbusreservebillsitem;
+
+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: as(as) <br/>
+ * File: AsBusreserveBillSitem.java <br/>
+ * Class: as.api.asbusreservebillsitem.AsBusreserveBillSitem <br/>
+ * Description: 预约单-服务项目. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-09 17:01:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "预约单-服务项目", description = "预约单-服务项目")
+@TableName("as_busreserve_bill_sitem")
+public class AsBusreserveBillSitem extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("工单sid")
+    private String billSid; // 工单sid
+	@ApiModelProperty("项目sid")
+    private String serviceItemSid; // 项目sid
+	@ApiModelProperty("项目名称")
+    private String serviceItem; // 项目名称
+	@ApiModelProperty("工时单价")
+    private BigDecimal hourPrice; // 工时单价
+	@ApiModelProperty("工时数")
+    private BigDecimal hours; // 工时数
+	@ApiModelProperty("销售价(工时费)=工时单价*工时数")
+    private BigDecimal price; // 销售价(工时费)=工时单价*工时数
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebillsitem/AsBusreserveBillSitemDetailsVo.java

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asbusreservebillsitem;
+
+
+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: as(as) <br/>
+ * File: AsBusreserveBillSitemVo.java <br/>
+ * Class: as.api.asbusreservebillsitem.AsBusreserveBillSitemVo <br/>
+ * Description: 预约单-服务项目 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-09 17:01:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "预约单-服务项目 视图数据详情", description = "预约单-服务项目 视图数据详情")
+public class AsBusreserveBillSitemDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("工单sid")
+    private String billSid; // 工单sid
+	@ApiModelProperty("项目sid")
+    private String serviceItemSid; // 项目sid
+	@ApiModelProperty("项目名称")
+    private String serviceItem; // 项目名称
+	@ApiModelProperty("工时单价")
+    private BigDecimal hourPrice; // 工时单价
+	@ApiModelProperty("工时数")
+    private BigDecimal hours; // 工时数
+	@ApiModelProperty("销售价(工时费)=工时单价*工时数")
+    private BigDecimal price; // 销售价(工时费)=工时单价*工时数
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebillsitem/AsBusreserveBillSitemDto.java

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asbusreservebillsitem;
+
+
+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: as(as) <br/>
+ * File: AsBusreserveBillSitemDto.java <br/>
+ * Class: as.api.asbusreservebillsitem.AsBusreserveBillSitemDto <br/>
+ * Description: 预约单-服务项目 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-09 17:01:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "预约单-服务项目 数据传输对象", description = "预约单-服务项目 数据传输对象")
+public class AsBusreserveBillSitemDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("工单sid")
+    private String billSid; // 工单sid
+	@ApiModelProperty("项目sid")
+    private String serviceItemSid; // 项目sid
+	@ApiModelProperty("项目名称")
+    private String serviceItem; // 项目名称
+	@ApiModelProperty("工时单价")
+    private BigDecimal hourPrice; // 工时单价
+	@ApiModelProperty("工时数")
+    private BigDecimal hours; // 工时数
+	@ApiModelProperty("销售价(工时费)=工时单价*工时数")
+    private BigDecimal price; // 销售价(工时费)=工时单价*工时数
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebillsitem/AsBusreserveBillSitemQuery.java

@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asbusreservebillsitem;
+
+
+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: as(as) <br/>
+ * File: AsBusreserveBillSitemQuery.java <br/>
+ * Class: as.api.asbusreservebillsitem.AsBusreserveBillSitemQuery <br/>
+ * Description: 预约单-服务项目 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-09 17:01:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "预约单-服务项目 查询条件", description = "预约单-服务项目 查询条件")
+public class AsBusreserveBillSitemQuery implements Query {
+
+	@ApiModelProperty("工单sid")
+    private String billSid; // 工单sid
+	@ApiModelProperty("项目sid")
+    private String serviceItemSid; // 项目sid
+	@ApiModelProperty("项目名称")
+    private String serviceItem; // 项目名称
+	@ApiModelProperty("工时单价")
+    private BigDecimal hourPrice; // 工时单价
+	@ApiModelProperty("工时数")
+    private BigDecimal hours; // 工时数
+	@ApiModelProperty("销售价(工时费)=工时单价*工时数")
+    private BigDecimal price; // 销售价(工时费)=工时单价*工时数
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebillsitem/AsBusreserveBillSitemVo.java

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asbusreservebillsitem;
+
+
+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: as(as) <br/>
+ * File: AsBusreserveBillSitemVo.java <br/>
+ * Class: as.api.asbusreservebillsitem.AsBusreserveBillSitemVo <br/>
+ * Description: 预约单-服务项目 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-09 17:01:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "预约单-服务项目 视图数据对象", description = "预约单-服务项目 视图数据对象")
+public class AsBusreserveBillSitemVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("工单sid")
+    private String billSid; // 工单sid
+	@ApiModelProperty("项目sid")
+    private String serviceItemSid; // 项目sid
+	@ApiModelProperty("项目名称")
+    private String serviceItem; // 项目名称
+	@ApiModelProperty("工时单价")
+    private BigDecimal hourPrice; // 工时单价
+	@ApiModelProperty("工时数")
+    private BigDecimal hours; // 工时数
+	@ApiModelProperty("销售价(工时费)=工时单价*工时数")
+    private BigDecimal price; // 销售价(工时费)=工时单价*工时数
+
+}

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

@@ -1,17 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
 package com.yxt.anrui.as.biz.asbusreservebill;
 
-
+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 com.yxt.anrui.as.api.asbusreservebill.AsBusreserveBill;
+import com.yxt.anrui.as.api.asbusreservebill.AsBusreserveBillVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
-
+/**
+ * Project: as(as) <br/>
+ * File: AsBusreserveBillMapper.java <br/>
+ * Class: as.biz.asbusreservebill.AsBusreserveBillMapper <br/>
+ * Description: 预约单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-09 17:01:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
 @Mapper
 public interface AsBusreserveBillMapper extends BaseMapper<AsBusreserveBill> {
 
-
-
-}
+	//@Update("update as_busreserve_bill set name=#{msg} where id=#{id}")
+	//IPage<AsBusreserveBillVo> voPage(IPage<AsBusreserveBill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusreserveBill> qw);
+	
+	IPage<AsBusreserveBillVo> selectPageVo(IPage<AsBusreserveBill> page, @Param(Constants.WRAPPER) Wrapper<AsBusreserveBill> qw);
+	
+	List<AsBusreserveBillVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsBusreserveBill> qw);
+	
+	@Select("select * from as_busreserve_bill")
+	List<AsBusreserveBillVo> selectListVo();
+}

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

@@ -1,8 +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.asbusreservebill.AsBusreserveBillMapper">
-    <!--    <where> ${ew.sqlSegment} </where>-->
-    <!--    ${ew.customSqlSegment} -->
-
-
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asbusreservebill.AsBusreserveBillVo">
+		SELECT * FROM as_busreserve_bill <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asbusreservebill.AsBusreserveBillVo">
+		SELECT * FROM as_busreserve_bill <where> ${ew.sqlSegment} </where>
+	</select>
 </mapper>

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

@@ -1,19 +1,103 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
 package com.yxt.anrui.as.biz.asbusreservebill;
 
+import com.yxt.anrui.as.api.asbusreservebill.AsBusreserveBillDetailsVo;
+import com.yxt.anrui.as.api.asbusreservebill.AsBusreserveBillDto;
+import com.yxt.anrui.as.api.asbusreservebill.AsBusreserveBillQuery;
+import com.yxt.anrui.as.api.asbusreservebill.AsBusreserveBillVo;
+import com.yxt.anrui.as.biz.asbusreservebillsitem.AsBusreserveBillSitemService;
+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 java.util.List;
 
 /**
- * @author fzz
- * @date 2024/03/06 17:03
+ * Project: as(as) <br/>
+ * File: AsBusreserveBillFeignFallback.java <br/>
+ * Class: as.biz.asbusreservebill.AsBusreserveBillRest <br/>
+ * Description: 预约单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-09 17:01:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
  */
-
 @Api(tags = "预约单")
 @RestController
-@RequestMapping("v1/asBusreserveBill")
+@RequestMapping("v1/asbusreservebill")
 public class AsBusreserveBillRest {
 
+    @Autowired
+    private AsBusreserveBillService asBusreserveBillService;
+    @Autowired
+    private AsBusreserveBillSitemService asBusreserveBillSitemService;
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<AsBusreserveBillVo>> listPage(@RequestBody PagerQuery<AsBusreserveBillQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<AsBusreserveBillVo> pv = asBusreserveBillService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody AsBusreserveBillDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        asBusreserveBillService.saveOrUpdateDto(dto);
+        return rb.success();
+    }
+
+
+    @ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        asBusreserveBillService.delBySids(sids);
+        for (String sid : sids) {
+            asBusreserveBillSitemService.delByMainSid(sid);
+        }
+        return rb.success();
+    }
+
 
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<AsBusreserveBillDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        AsBusreserveBillDetailsVo vo = asBusreserveBillService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
 }

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

@@ -1,16 +1,165 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
 package com.yxt.anrui.as.biz.asbusreservebill;
 
-
-import com.yxt.anrui.as.api.asbusreservebill.AsBusreserveBill;
+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.asbusreservebill.*;
+import com.yxt.anrui.as.api.asbusreservebillsitem.AsBusreserveBillSitem;
+import com.yxt.anrui.as.biz.asbusreservebillsitem.AsBusreserveBillSitemService;
+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.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
- * @author wangpengfei
- * @date 2023/11/21 15:03
+ * Project: as(as) <br/>
+ * File: AsBusreserveBillService.java <br/>
+ * Class: as.biz.asbusreservebill.AsBusreserveBillService <br/>
+ * Description: 预约单 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-09 17:01:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
  */
 @Service
 public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBillMapper, AsBusreserveBill> {
 
 
-}
+    @Autowired
+    private AsBusreserveBillSitemService asBusreserveBillSitemService;
+
+    private QueryWrapper<AsBusreserveBill> createQueryWrapper(AsBusreserveBillQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<AsBusreserveBill> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getUseOrgSid())) {
+            qw.eq("useOrgSid",query.getUseOrgSid());
+        }
+        if (StringUtils.isNotBlank(query.getState())) {
+            qw.eq("state",query.getState());
+        }
+        if (StringUtils.isNotBlank(query.getCustomerName())) {
+            qw.like("customerName",query.getCustomerName());
+        }
+        if (StringUtils.isNotBlank(query.getMobile())) {
+            qw.like("mobile",query.getMobile());
+        }
+        if (StringUtils.isNotBlank(query.getVehMark())) {
+            qw.like("vehMark",query.getVehMark());
+        }
+        if (StringUtils.isNotBlank(query.getVehModel())) {
+            qw.like("vehModel",query.getVehModel());
+        }
+        return qw;
+    }
+
+    public PagerVo<AsBusreserveBillVo> listPageVo(PagerQuery<AsBusreserveBillQuery> pq) {
+        AsBusreserveBillQuery query = pq.getParams();
+        QueryWrapper<AsBusreserveBill> qw = createQueryWrapper(query);
+        IPage<AsBusreserveBill> page = PagerUtil.queryToPage(pq);
+        IPage<AsBusreserveBillVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<AsBusreserveBillVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void saveOrUpdateDto(AsBusreserveBillDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isNotBlank(dtoSid)) {
+            AsBusreserveBill bill = fetchBySid(dtoSid);
+            BeanUtil.copyProperties(dto, bill, "id", "sid");
+            baseMapper.updateById(bill);
+            asBusreserveBillSitemService.delByMainSid(dtoSid);
+            List<AsbillSitemVo> sitemVos = dto.getSitemVos();
+            if (!sitemVos.isEmpty()) {
+                for (AsbillSitemVo sitemVo : sitemVos) {
+                    AsBusreserveBillSitem sitem = new AsBusreserveBillSitem();
+                    BeanUtil.copyProperties(sitemVo, sitem, "id", "sid");
+                    sitem.setBillSid(dtoSid);
+                    asBusreserveBillSitemService.insert(sitem);
+                }
+            }
+        } else {
+            AsBusreserveBill entity = new AsBusreserveBill();
+            BeanUtil.copyProperties(dto, entity, "id", "sid");
+            baseMapper.insert(entity);
+            List<AsbillSitemVo> sitemVos = dto.getSitemVos();
+            if (!sitemVos.isEmpty()) {
+                for (AsbillSitemVo sitemVo : sitemVos) {
+                    AsBusreserveBillSitem sitem = new AsBusreserveBillSitem();
+                    BeanUtil.copyProperties(sitemVo, sitem, "id", "sid");
+                    sitem.setBillSid(entity.getSid());
+                    asBusreserveBillSitemService.insert(sitem);
+                }
+            }
+        }
+    }
+
+    public void insertByDto(AsBusreserveBillDto dto) {
+        AsBusreserveBill entity = new AsBusreserveBill();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void updateByDto(AsBusreserveBillDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        }
+        AsBusreserveBill entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public AsBusreserveBillDetailsVo fetchDetailsVoBySid(String sid) {
+        AsBusreserveBill entity = fetchBySid(sid);
+        AsBusreserveBillDetailsVo vo = new AsBusreserveBillDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        List<AsbillSitemVo> sitemVos = new ArrayList<>();
+        List<AsBusreserveBillSitem> asBusreserveBillSitems = asBusreserveBillSitemService.fetchByMainSid(sid);
+        if (!asBusreserveBillSitems.isEmpty()) {
+            for (AsBusreserveBillSitem asBusreserveBillSitem : asBusreserveBillSitems) {
+                AsbillSitemVo sitemVo = new AsbillSitemVo();
+                BeanUtil.copyProperties(asBusreserveBillSitem, sitemVo);
+                sitemVos.add(sitemVo);
+            }
+            vo.setSitemVos(sitemVos);
+        }
+        return vo;
+    }
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebillsitem/AsBusreserveBillSitemMapper.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asbusreservebillsitem;
+
+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 com.yxt.anrui.as.api.asbusreservebillsitem.AsBusreserveBillSitem;
+import com.yxt.anrui.as.api.asbusreservebillsitem.AsBusreserveBillSitemVo;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * Project: as(as) <br/>
+ * File: AsBusreserveBillSitemMapper.java <br/>
+ * Class: as.biz.asbusreservebillsitem.AsBusreserveBillSitemMapper <br/>
+ * Description: 预约单-服务项目. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-09 17:01:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface AsBusreserveBillSitemMapper extends BaseMapper<AsBusreserveBillSitem> {
+
+    //@Update("update as_busreserve_bill_sitem set name=#{msg} where id=#{id}")
+    //IPage<AsBusreserveBillSitemVo> voPage(IPage<AsBusreserveBillSitem> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusreserveBillSitem> qw);
+
+    IPage<AsBusreserveBillSitemVo> selectPageVo(IPage<AsBusreserveBillSitem> page, @Param(Constants.WRAPPER) Wrapper<AsBusreserveBillSitem> qw);
+
+    List<AsBusreserveBillSitemVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsBusreserveBillSitem> qw);
+
+    @Select("select * from as_busreserve_bill_sitem")
+    List<AsBusreserveBillSitemVo> selectListVo();
+
+    @Select("select * from as_busreserve_bill_sitem where billSid =#{sid}")
+    List<AsBusreserveBillSitem> fetchByMainSid(@Param("sid") String sid);
+
+    @Delete("delete from as_busreserve_bill_sitem where billSid = #{sid}")
+    int delByMainSid(@Param("sid") String sid);
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebillsitem/AsBusreserveBillSitemMapper.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.asbusreservebillsitem.AsBusreserveBillSitemMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asbusreservebillsitem.AsBusreserveBillSitemVo">
+		SELECT * FROM as_busreserve_bill_sitem <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asbusreservebillsitem.AsBusreserveBillSitemVo">
+		SELECT * FROM as_busreserve_bill_sitem <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebillsitem/AsBusreserveBillSitemRest.java

@@ -0,0 +1,98 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asbusreservebillsitem;
+
+import com.yxt.anrui.as.api.asbusreservebillsitem.AsBusreserveBillSitemDetailsVo;
+import com.yxt.anrui.as.api.asbusreservebillsitem.AsBusreserveBillSitemDto;
+import com.yxt.anrui.as.api.asbusreservebillsitem.AsBusreserveBillSitemQuery;
+import com.yxt.anrui.as.api.asbusreservebillsitem.AsBusreserveBillSitemVo;
+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 java.util.List;
+
+/**
+ * Project: as(as) <br/>
+ * File: AsBusreserveBillSitemFeignFallback.java <br/>
+ * Class: as.biz.asbusreservebillsitem.AsBusreserveBillSitemRest <br/>
+ * Description: 预约单-服务项目. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-09 17:01:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "预约单-服务项目")
+@RestController
+@RequestMapping("v1/asbusreservebillsitem")
+public class AsBusreserveBillSitemRest {
+
+	@Autowired
+	private AsBusreserveBillSitemService asBusreserveBillSitemService;
+
+
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<AsBusreserveBillSitemVo>> listPage(@RequestBody PagerQuery<AsBusreserveBillSitemQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<AsBusreserveBillSitemVo> pv = asBusreserveBillSitemService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody AsBusreserveBillSitemDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		asBusreserveBillSitemService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		asBusreserveBillSitemService.delBySids(sids);
+		return rb.success();
+	}
+
+
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<AsBusreserveBillSitemDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		AsBusreserveBillSitemDetailsVo vo = asBusreserveBillSitemService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebillsitem/AsBusreserveBillSitemService.java

@@ -0,0 +1,113 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asbusreservebillsitem;
+
+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.asbusreservebillsitem.*;
+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.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: as(as) <br/>
+ * File: AsBusreserveBillSitemService.java <br/>
+ * Class: as.biz.asbusreservebillsitem.AsBusreserveBillSitemService <br/>
+ * Description: 预约单-服务项目 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-09 17:01:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AsBusreserveBillSitemService extends MybatisBaseService<AsBusreserveBillSitemMapper, AsBusreserveBillSitem> {
+	private QueryWrapper<AsBusreserveBillSitem> createQueryWrapper(AsBusreserveBillSitemQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<AsBusreserveBillSitem> qw = new QueryWrapper<>();
+		return qw;
+	}
+
+	public List<AsBusreserveBillSitem> fetchByMainSid(String sid) {
+		return baseMapper.fetchByMainSid(sid);
+	}
+
+	public int delByMainSid(String sid) {
+		return baseMapper.delByMainSid(sid);
+	}
+
+	public PagerVo<AsBusreserveBillSitemVo> listPageVo(PagerQuery<AsBusreserveBillSitemQuery> pq) {
+		AsBusreserveBillSitemQuery query = pq.getParams();
+		QueryWrapper<AsBusreserveBillSitem> qw = createQueryWrapper(query);
+		IPage<AsBusreserveBillSitem> page = PagerUtil.queryToPage(pq);
+		IPage<AsBusreserveBillSitemVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<AsBusreserveBillSitemVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(AsBusreserveBillSitemDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(AsBusreserveBillSitemDto dto){
+		AsBusreserveBillSitem entity = new AsBusreserveBillSitem();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(AsBusreserveBillSitemDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		AsBusreserveBillSitem entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public AsBusreserveBillSitemDetailsVo fetchDetailsVoBySid(String sid){
+		AsBusreserveBillSitem entity = fetchBySid(sid);
+		AsBusreserveBillSitemDetailsVo vo = new AsBusreserveBillSitemDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}