From dfd05fbcd88ba89b6492c1b7428731338189b706 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 9 Apr 2024 10:10:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/customerrepayment/customerrepayment.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-riskcenter-ui/src/views/customerrepayment/customerrepayment.vue b/anrui-riskcenter-ui/src/views/customerrepayment/customerrepayment.vue index db6cdee432..b9e9adcd3d 100644 --- a/anrui-riskcenter-ui/src/views/customerrepayment/customerrepayment.vue +++ b/anrui-riskcenter-ui/src/views/customerrepayment/customerrepayment.vue @@ -78,7 +78,7 @@
- + From 86f374e9095e4db7bd05dfe79a94551b352690d4 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 9 Apr 2024 10:41:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=AC=E5=85=B1?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/tab-search/index.vue | 2 +- .../src/styles/element-table.scss | 31 +++++++++++++++---- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/anrui-riskcenter-ui/src/components/tab-search/index.vue b/anrui-riskcenter-ui/src/components/tab-search/index.vue index 0ad9150257..0f82ff6dac 100644 --- a/anrui-riskcenter-ui/src/components/tab-search/index.vue +++ b/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; } diff --git a/anrui-riskcenter-ui/src/styles/element-table.scss b/anrui-riskcenter-ui/src/styles/element-table.scss index 727938ca3b..e79ae7512d 100644 --- a/anrui-riskcenter-ui/src/styles/element-table.scss +++ b/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; } } From 3719eb6536ed26cd0a83babdcbfce49c3f7f2849 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 9 Apr 2024 17:38:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=BC=80=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asbusreservebill/AsBusreserveBill.java | 106 ++++++++---- .../AsBusreserveBillDetailsVo.java | 90 ++++++++++ .../asbusreservebill/AsBusreserveBillDto.java | 91 ++++++++++ .../AsBusreserveBillQuery.java | 69 ++++++++ .../asbusreservebill/AsBusreserveBillVo.java | 78 +++++++++ .../api/asbusreservebill/AsbillSitemVo.java | 27 +++ .../AsBusreserveBillSitem.java | 68 ++++++++ .../AsBusreserveBillSitemDetailsVo.java | 69 ++++++++ .../AsBusreserveBillSitemDto.java | 69 ++++++++ .../AsBusreserveBillSitemQuery.java | 67 ++++++++ .../AsBusreserveBillSitemVo.java | 69 ++++++++ .../AsBusreserveBillMapper.java | 58 ++++++- .../AsBusreserveBillMapper.xml | 13 +- .../AsBusreserveBillRest.java | 92 +++++++++- .../AsBusreserveBillService.java | 159 +++++++++++++++++- .../AsBusreserveBillSitemMapper.java | 72 ++++++++ .../AsBusreserveBillSitemMapper.xml | 13 ++ .../AsBusreserveBillSitemRest.java | 98 +++++++++++ .../AsBusreserveBillSitemService.java | 113 +++++++++++++ 19 files changed, 1368 insertions(+), 53 deletions(-) create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDetailsVo.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillQuery.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillVo.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsbillSitemVo.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebillsitem/AsBusreserveBillSitem.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebillsitem/AsBusreserveBillSitemDetailsVo.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebillsitem/AsBusreserveBillSitemDto.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebillsitem/AsBusreserveBillSitemQuery.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebillsitem/AsBusreserveBillSitemVo.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebillsitem/AsBusreserveBillSitemMapper.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebillsitem/AsBusreserveBillSitemMapper.xml create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebillsitem/AsBusreserveBillSitemRest.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebillsitem/AsBusreserveBillSitemService.java diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBill.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBill.java index fe58ba64e4..ebc46fc8e4 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBill.java +++ b/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)
+ * File: AsBusreserveBill.java
+ * Class: as.api.asbusreservebill.AsBusreserveBill
+ * Description: 预约单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 17:01:49
+ * + * @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 } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDetailsVo.java new file mode 100644 index 0000000000..c67e066aac --- /dev/null +++ b/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)
+ * File: AsBusreserveBillVo.java
+ * Class: as.api.asbusreservebill.AsBusreserveBillVo
+ * Description: 预约单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 17:01:49
+ * + * @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 sitemVos = new ArrayList<>(); + +} \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java new file mode 100644 index 0000000000..6712bfa16b --- /dev/null +++ b/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)
+ * File: AsBusreserveBillDto.java
+ * Class: as.api.asbusreservebill.AsBusreserveBillDto
+ * Description: 预约单 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 17:01:49
+ * + * @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 sitemVos = new ArrayList<>(); + + +} \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillQuery.java new file mode 100644 index 0000000000..255d02d0e1 --- /dev/null +++ b/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)
+ * File: AsBusreserveBillQuery.java
+ * Class: as.api.asbusreservebill.AsBusreserveBillQuery
+ * Description: 预约单 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 17:01:49
+ * + * @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; + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillVo.java new file mode 100644 index 0000000000..df9dcba1a5 --- /dev/null +++ b/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)
+ * File: AsBusreserveBillVo.java
+ * Class: as.api.asbusreservebill.AsBusreserveBillVo
+ * Description: 预约单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 17:01:49
+ * + * @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已完成 + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsbillSitemVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsbillSitemVo.java new file mode 100644 index 0000000000..371a92d599 --- /dev/null +++ b/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; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebillsitem/AsBusreserveBillSitem.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebillsitem/AsBusreserveBillSitem.java new file mode 100644 index 0000000000..75f99cc9a6 --- /dev/null +++ b/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)
+ * File: AsBusreserveBillSitem.java
+ * Class: as.api.asbusreservebillsitem.AsBusreserveBillSitem
+ * Description: 预约单-服务项目.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 17:01:49
+ * + * @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; // 销售价(工时费)=工时单价*工时数 + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebillsitem/AsBusreserveBillSitemDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebillsitem/AsBusreserveBillSitemDetailsVo.java new file mode 100644 index 0000000000..22a733f1e8 --- /dev/null +++ b/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)
+ * File: AsBusreserveBillSitemVo.java
+ * Class: as.api.asbusreservebillsitem.AsBusreserveBillSitemVo
+ * Description: 预约单-服务项目 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 17:01:49
+ * + * @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; // 销售价(工时费)=工时单价*工时数 + +} \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebillsitem/AsBusreserveBillSitemDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebillsitem/AsBusreserveBillSitemDto.java new file mode 100644 index 0000000000..fe0ce3c99f --- /dev/null +++ b/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)
+ * File: AsBusreserveBillSitemDto.java
+ * Class: as.api.asbusreservebillsitem.AsBusreserveBillSitemDto
+ * Description: 预约单-服务项目 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 17:01:49
+ * + * @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; // 销售价(工时费)=工时单价*工时数 + +} \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebillsitem/AsBusreserveBillSitemQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebillsitem/AsBusreserveBillSitemQuery.java new file mode 100644 index 0000000000..b983b8c17f --- /dev/null +++ b/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)
+ * File: AsBusreserveBillSitemQuery.java
+ * Class: as.api.asbusreservebillsitem.AsBusreserveBillSitemQuery
+ * Description: 预约单-服务项目 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 17:01:49
+ * + * @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; // 销售价(工时费)=工时单价*工时数 + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebillsitem/AsBusreserveBillSitemVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebillsitem/AsBusreserveBillSitemVo.java new file mode 100644 index 0000000000..5898b91029 --- /dev/null +++ b/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)
+ * File: AsBusreserveBillSitemVo.java
+ * Class: as.api.asbusreservebillsitem.AsBusreserveBillSitemVo
+ * Description: 预约单-服务项目 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 17:01:49
+ * + * @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; // 销售价(工时费)=工时单价*工时数 + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.java index 5ad1e7b1a3..8b84cffed0 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.java +++ b/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)
+ * File: AsBusreserveBillMapper.java
+ * Class: as.biz.asbusreservebill.AsBusreserveBillMapper
+ * Description: 预约单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 17:01:49
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ @Mapper public interface AsBusreserveBillMapper extends BaseMapper { - - -} + //@Update("update as_busreserve_bill set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from as_busreserve_bill") + List selectListVo(); +} \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml index 6879b15473..ae7e722634 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml @@ -1,8 +1,13 @@ - - - - + + + + + \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillRest.java index 67e1c42a69..3af2a2f6d7 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillRest.java +++ b/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)
+ * File: AsBusreserveBillFeignFallback.java
+ * Class: as.biz.asbusreservebill.AsBusreserveBillRest
+ * Description: 预约单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 17:01:49
+ * + * @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> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo 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 fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + AsBusreserveBillDetailsVo vo = asBusreserveBillService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java index a4df4feda2..b904866afa 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java +++ b/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)
+ * File: AsBusreserveBillService.java
+ * Class: as.biz.asbusreservebill.AsBusreserveBillService
+ * Description: 预约单 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 17:01:49
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 */ @Service public class AsBusreserveBillService extends MybatisBaseService { -} + @Autowired + private AsBusreserveBillSitemService asBusreserveBillSitemService; + + private QueryWrapper createQueryWrapper(AsBusreserveBillQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper 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 listPageVo(PagerQuery pq) { + AsBusreserveBillQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(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 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 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 sitemVos = new ArrayList<>(); + List 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; + } +} \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebillsitem/AsBusreserveBillSitemMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebillsitem/AsBusreserveBillSitemMapper.java new file mode 100644 index 0000000000..421545bd32 --- /dev/null +++ b/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)
+ * File: AsBusreserveBillSitemMapper.java
+ * Class: as.biz.asbusreservebillsitem.AsBusreserveBillSitemMapper
+ * Description: 预约单-服务项目.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 17:01:49
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface AsBusreserveBillSitemMapper extends BaseMapper { + + //@Update("update as_busreserve_bill_sitem set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from as_busreserve_bill_sitem") + List selectListVo(); + + @Select("select * from as_busreserve_bill_sitem where billSid =#{sid}") + List fetchByMainSid(@Param("sid") String sid); + + @Delete("delete from as_busreserve_bill_sitem where billSid = #{sid}") + int delByMainSid(@Param("sid") String sid); +} \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebillsitem/AsBusreserveBillSitemMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebillsitem/AsBusreserveBillSitemMapper.xml new file mode 100644 index 0000000000..49e6430b88 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebillsitem/AsBusreserveBillSitemMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebillsitem/AsBusreserveBillSitemRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebillsitem/AsBusreserveBillSitemRest.java new file mode 100644 index 0000000000..cf8058f3ff --- /dev/null +++ b/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)
+ * File: AsBusreserveBillSitemFeignFallback.java
+ * Class: as.biz.asbusreservebillsitem.AsBusreserveBillSitemRest
+ * Description: 预约单-服务项目.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 17:01:49
+ * + * @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> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo 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 fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + AsBusreserveBillSitemDetailsVo vo = asBusreserveBillSitemService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebillsitem/AsBusreserveBillSitemService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebillsitem/AsBusreserveBillSitemService.java new file mode 100644 index 0000000000..be24dc5817 --- /dev/null +++ b/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)
+ * File: AsBusreserveBillSitemService.java
+ * Class: as.biz.asbusreservebillsitem.AsBusreserveBillSitemService
+ * Description: 预约单-服务项目 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 17:01:49
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class AsBusreserveBillSitemService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(AsBusreserveBillSitemQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public List fetchByMainSid(String sid) { + return baseMapper.fetchByMainSid(sid); + } + + public int delByMainSid(String sid) { + return baseMapper.delByMainSid(sid); + } + + public PagerVo listPageVo(PagerQuery pq) { + AsBusreserveBillSitemQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(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; + } +} \ No newline at end of file