Merge remote-tracking branch 'origin/master'

# Conflicts:
#	yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -2968,7 +2968,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             finBillApplication.setTotalBillMoney(totalBillMoney);
             String allDownloadUrl = createContractNo(dto);
             downloanVoUrl.setAllDownloadUrl(allDownloadUrl);
-            downloanVoUrl.setSid(dto.getSid());
+            downloanVoUrl.setSid(finBillApplication.getSid());
             finBillApplication.setFileUrl(allDownloadUrl);
             save(finBillApplication);
             //主车开票信息

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -374,7 +374,8 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 for (LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo : loanBePadsincereVehDetailsVos) {
                     log.info("车辆sid++++++++++++++++++++++++++++++++++++++++++" + loanBePadsincereVehDetailsVo.getBusVinSid());
                     log.info("期数++++++++++++++++++++++++++++++++++++++++++" + loanBePadsincereVehDetailsVo.getPeriod());
-                    LoanRepaymentPlanMoneyVo loanRepaymentPlanMoneyVo = loanRepaymentPlanDetailsFeign.selVehSidAndPeriod(loanBePadsincereVehDetailsVo.getBusVinSid(), loanBePadsincereVehDetailsVo.getPeriod()).getData();
+                    log.info("资方合同号++++++++++++++++++++++++++++++++++++++++++" + loanBePadsincereVehDetailsVo.getBankContractNo());
+                    LoanRepaymentPlanMoneyVo loanRepaymentPlanMoneyVo = loanRepaymentPlanDetailsFeign.selVehSidAndPeriod(loanBePadsincereVehDetailsVo.getBusVinSid(), loanBePadsincereVehDetailsVo.getPeriod(),loanBePadsincereVehDetailsVo.getBankContractNo()).getData();
                     LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsFeign.fetchDetails(loanRepaymentPlanMoneyVo.getSid()).getData();
                     String paymentMoney = loanRepaymentPlanMoneyVo.getPaymentMoney().add(new BigDecimal(loanBePadsincereVehDetailsVo.getPadMoney())).toString();
                     String paymentInterest = loanRepaymentPlanMoneyVo.getPaymentInterest().add(new BigDecimal(loanBePadsincereVehDetailsVo.getBankBeInter())).toString();
@@ -400,7 +401,6 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                     finUncollectedReceivablesDetailedJRService.insert(jr);
                 }
             }
-
             FinPaymentrecord finPaymentrecordOne = null;
             if (new BigDecimal(dto.getCost()).compareTo(finPaymentrecord.getAccountsReceive()) < 0) {//实收金额小于应收金额
                 finPaymentrecordOne = new FinPaymentrecord();

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeign.java

@@ -56,7 +56,7 @@ public interface LoanRepaymentPlanDetailsFeign {
     @ApiOperation("根据销售订单车辆sid及期数查询")
     @GetMapping("/selVehSidAndPeriod")
     @ResponseBody
-    ResultBean<LoanRepaymentPlanMoneyVo> selVehSidAndPeriod(@RequestParam("busVinSid") String busVinSid,@RequestParam("period") String period);
+    ResultBean<LoanRepaymentPlanMoneyVo> selVehSidAndPeriod(@RequestParam("busVinSid") String busVinSid,@RequestParam("period") String period,@RequestParam("bankContractNo") String bankContractNo);
 
     @ApiOperation("根据销售订单车辆sid及期数修改")
     @PostMapping("/updateVehSidAndPeriod")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeignFallback.java

@@ -48,7 +48,7 @@ public class LoanRepaymentPlanDetailsFeignFallback implements LoanRepaymentPlanD
     }
 
     @Override
-    public ResultBean<LoanRepaymentPlanMoneyVo> selVehSidAndPeriod(String busVinSid, String period) {
+    public ResultBean<LoanRepaymentPlanMoneyVo> selVehSidAndPeriod(String busVinSid, String period, String bankContractNo) {
         return null;
     }
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

@@ -1645,6 +1645,17 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
                 financeForm70.setValue("实际经营地址：" + loanHomevisitInvestigateCustomerDetailsVo.getAccCompxAddress());
                 financeForm70.setSpanSize(2);
                 otherInfo.add(financeForm70);
+                if ("0".equals(loanHomevisitInvestigateCustomerDetailsVo.getIsCompBuy())) {
+                    FinanceForm financeForm74 = new FinanceForm();
+                    financeForm74.setValue("挂车或上装是否公司采购：是");
+                    financeForm74.setSpanSize(2);
+                    otherInfo.add(financeForm74);
+                } else if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getIsCompBuy())) {
+                    FinanceForm financeForm74 = new FinanceForm();
+                    financeForm74.setValue("挂车或上装是否公司采购：否");
+                    financeForm74.setSpanSize(2);
+                    otherInfo.add(financeForm74);
+                }
             }
         }
         LoanHomevisitInvestigateOperationsDetailsVo loanHomevisitInvestigateOperationsDetailsVo = loanHomevisitInvestigateOperationsService.selByMainSid(sid);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java

@@ -60,7 +60,7 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper<LoanRepayment
 
     LoanRepaymentPlanDetailsForOverDue checkOverDue(@Param("sid") String sid);
 
-    LoanRepaymentPlanMoneyVo selVehSidAndPeriod(@Param("busVinSid") String busVinSid,@Param("period") String period);
+    LoanRepaymentPlanMoneyVo selVehSidAndPeriod(@Param("busVinSid") String busVinSid,@Param("period") String period,@Param("bankContractNo") String bankContractNo);
 
     void updateVehSidAndPeriod(@Param("busVinSid") String busVinSid,@Param("period") String period,@Param("paymentMoney") String paymentMoney,@Param("paymentInterest") String paymentInterest);
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml

@@ -537,6 +537,7 @@
         FROM loan_repayment_plan_details lrpd
         WHERE lrpd.busVinSid = #{busVinSid}
           AND lrpd.period = #{period}
+          AND lrpd.bankContractNo = #{bankContractNo}
     </select>
     <select id="selUseOrgSidListForFundVoucher" resultType="java.lang.String">
         SELECT p.useOrgSid

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsRest.java

@@ -58,9 +58,9 @@ public class LoanRepaymentPlanDetailsRest implements LoanRepaymentPlanDetailsFei
     }
 
     @Override
-    public ResultBean<LoanRepaymentPlanMoneyVo> selVehSidAndPeriod(String busVinSid, String period) {
+    public ResultBean<LoanRepaymentPlanMoneyVo> selVehSidAndPeriod(String busVinSid, String period,String bankContractNo) {
         ResultBean rb = ResultBean.fireFail();
-        LoanRepaymentPlanMoneyVo loanRepaymentPlanMoneyVo = loanRepaymentPlanDetailsService.selVehSidAndPeriod(busVinSid, period);
+        LoanRepaymentPlanMoneyVo loanRepaymentPlanMoneyVo = loanRepaymentPlanDetailsService.selVehSidAndPeriod(busVinSid, period,bankContractNo);
         return rb.success().setData(loanRepaymentPlanMoneyVo);
     }
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java

@@ -176,8 +176,8 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
     }
 
 
-    public LoanRepaymentPlanMoneyVo selVehSidAndPeriod(String busVinSid, String period) {
-        return baseMapper.selVehSidAndPeriod(busVinSid, period);
+    public LoanRepaymentPlanMoneyVo selVehSidAndPeriod(String busVinSid, String period,String bankContractNo) {
+        return baseMapper.selVehSidAndPeriod(busVinSid, period, bankContractNo);
     }
 
     public void updateVehSidAndPeriod(String busVinSid, String period, String paymentMoney, String paymentInterest) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.xml

@@ -43,14 +43,14 @@
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleDetailsVo">
         SELECT DISTINCT lrs.loanContractNo,
                         lrpd.vinNo,
-                        lrs.bankName,
+                        lrpd.bankName,
                         lrs.borrowerName,
                         lrs.salesOrderSid,
                         lrpd.busVinSid
         FROM loan_repayment_schedule lrs
-                 LEFT JOIN loan_repayment_plan_details lrpd
-                           ON lrpd.scheduleSid = lrs.sid
-        WHERE lrs.bankContractNo = #{bankContractNo}
+                     LEFT JOIN loan_repayment_plan_details lrpd
+                ON lrpd.scheduleSid = lrs.sid
+        WHERE lrpd.bankContractNo = #{bankContractNo}
     </select>
     <select id="selByLoanContractSid"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule">

yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApply.java

@@ -0,0 +1,111 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asarrearsoutapply;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(欠款出厂申请) <br/>
+ * File: AsArrearsoutApply.java <br/>
+ * Class: com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApply <br/>
+ * Description: 欠款出厂申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-08 17:43:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "欠款出厂申请", description = "欠款出厂申请")
+@TableName("as_arrearsout_apply")
+public class AsArrearsoutApply extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+	@ApiModelProperty("发起部门sid")
+    private String createDeptSid; // 发起部门sid
+	@ApiModelProperty("发起部门名称")
+    private String createDeptName; // 发起部门名称
+	@ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+	@ApiModelProperty("工单sid")
+    private String pairBillSid; // 工单sid
+	@ApiModelProperty("工单编号")
+    private String pairBillNo; // 工单编号
+	@ApiModelProperty("工单类型")
+    private String billType; // 工单类型
+	@ApiModelProperty("科目sid")
+    private String subjectSid; // 科目sid
+	@ApiModelProperty("科目名称")
+    private String subject; // 科目名称
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+	@ApiModelProperty("客户姓名")
+    private String customerName; // 客户姓名
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("车牌号")
+    private String vehMark; // 车牌号
+	@ApiModelProperty("工单应收金额")
+    private BigDecimal pairReceivableMoney; // 工单应收金额
+	@ApiModelProperty("工单已交金额")
+    private BigDecimal pairReceivedMoney; // 工单已交金额
+	@ApiModelProperty("工单欠款金额")
+    private BigDecimal pairArrearsMoney; // 工单欠款金额
+	@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")
+    private String filePath; // 附件路径(多个附件之间英文逗号隔开)
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+	@ApiModelProperty("组织全路径")
+    private String orgSidPath; // 组织全路径
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeId; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("任务id")
+    private String taskId; // 任务id
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("办结时间")
+    private Date finishTime; // 办结时间
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyDetailsVo.java

@@ -0,0 +1,112 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asarrearsoutapply;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(欠款出厂申请) <br/>
+ * File: AsArrearsoutApplyVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyVo <br/>
+ * Description: 欠款出厂申请 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-08 17:43:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "欠款出厂申请 视图数据详情", description = "欠款出厂申请 视图数据详情")
+public class AsArrearsoutApplyDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+	@ApiModelProperty("发起部门sid")
+    private String createDeptSid; // 发起部门sid
+	@ApiModelProperty("发起部门名称")
+    private String createDeptName; // 发起部门名称
+	@ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+	@ApiModelProperty("工单sid")
+    private String pairBillSid; // 工单sid
+	@ApiModelProperty("工单编号")
+    private String pairBillNo; // 工单编号
+	@ApiModelProperty("工单类型")
+    private String billType; // 工单类型
+	@ApiModelProperty("科目sid")
+    private String subjectSid; // 科目sid
+	@ApiModelProperty("科目名称")
+    private String subject; // 科目名称
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+	@ApiModelProperty("客户姓名")
+    private String customerName; // 客户姓名
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("车牌号")
+    private String vehMark; // 车牌号
+	@ApiModelProperty("工单应收金额")
+    private BigDecimal pairReceivableMoney; // 工单应收金额
+	@ApiModelProperty("工单已交金额")
+    private BigDecimal pairReceivedMoney; // 工单已交金额
+	@ApiModelProperty("工单欠款金额")
+    private BigDecimal pairArrearsMoney; // 工单欠款金额
+	@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")
+    private String filePath; // 附件路径(多个附件之间英文逗号隔开)
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+	@ApiModelProperty("组织全路径")
+    private String orgSidPath; // 组织全路径
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeId; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("任务id")
+    private String taskId; // 任务id
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("办结时间")
+    private Date finishTime; // 办结时间
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyDto.java

@@ -0,0 +1,112 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asarrearsoutapply;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(欠款出厂申请) <br/>
+ * File: AsArrearsoutApplyDto.java <br/>
+ * Class: com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyDto <br/>
+ * Description: 欠款出厂申请 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-08 17:43:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "欠款出厂申请 数据传输对象", description = "欠款出厂申请 数据传输对象")
+public class AsArrearsoutApplyDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+	@ApiModelProperty("发起部门sid")
+    private String createDeptSid; // 发起部门sid
+	@ApiModelProperty("发起部门名称")
+    private String createDeptName; // 发起部门名称
+	@ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+	@ApiModelProperty("工单sid")
+    private String pairBillSid; // 工单sid
+	@ApiModelProperty("工单编号")
+    private String pairBillNo; // 工单编号
+	@ApiModelProperty("工单类型")
+    private String billType; // 工单类型
+	@ApiModelProperty("科目sid")
+    private String subjectSid; // 科目sid
+	@ApiModelProperty("科目名称")
+    private String subject; // 科目名称
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+	@ApiModelProperty("客户姓名")
+    private String customerName; // 客户姓名
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("车牌号")
+    private String vehMark; // 车牌号
+	@ApiModelProperty("工单应收金额")
+    private BigDecimal pairReceivableMoney; // 工单应收金额
+	@ApiModelProperty("工单已交金额")
+    private BigDecimal pairReceivedMoney; // 工单已交金额
+	@ApiModelProperty("工单欠款金额")
+    private BigDecimal pairArrearsMoney; // 工单欠款金额
+	@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")
+    private String filePath; // 附件路径(多个附件之间英文逗号隔开)
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+	@ApiModelProperty("组织全路径")
+    private String orgSidPath; // 组织全路径
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeId; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("任务id")
+    private String taskId; // 任务id
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("办结时间")
+    private Date finishTime; // 办结时间
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyQuery.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asarrearsoutapply;
+
+
+import com.yxt.common.core.query.Query;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(欠款出厂申请) <br/>
+ * File: AsArrearsoutApplyQuery.java <br/>
+ * Class: com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyQuery <br/>
+ * Description: 欠款出厂申请 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-08 17:43:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "欠款出厂申请 查询条件", description = "欠款出厂申请 查询条件")
+public class AsArrearsoutApplyQuery implements Query {
+
+    @ApiModelProperty("工单编号")
+    private String pairBillNo;
+    @ApiModelProperty("工单类型")
+    private String billType;
+    @ApiModelProperty("科目名称")
+    private String subject;
+    @ApiModelProperty("客户姓名")
+    private String customerName;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+
+    private String userSid;
+    private String orgPath;
+    private String menuUrl;
+    private String menuSid;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyVo.java

@@ -0,0 +1,86 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asarrearsoutapply;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(欠款出厂申请) <br/>
+ * File: AsArrearsoutApplyVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyVo <br/>
+ * Description: 欠款出厂申请 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-08 17:43:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "欠款出厂申请 视图数据对象", description = "欠款出厂申请 视图数据对象")
+public class AsArrearsoutApplyVo implements Vo {
+
+    private String sid;
+
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("工单编号")
+    private String pairBillNo;
+    @ApiModelProperty("工单类型")
+    private String billType;
+    @ApiModelProperty("科目名称")
+    private String subject;
+    @ApiModelProperty("客户姓名")
+    private String customerName;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("工单应收金额")
+    private BigDecimal pairReceivableMoney;
+    @ApiModelProperty("工单欠款金额")
+    private BigDecimal pairArrearsMoney;
+    @ApiModelProperty("制单人姓名")
+    private String createByName;
+	@ApiModelProperty("发起日期")
+    private String createTime;
+    @ApiModelProperty("流程定义的id")
+    private String procDefId;
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/flowable/AsArrearsoutApplyCompleteDto.java

@@ -0,0 +1,37 @@
+package com.yxt.anrui.as.api.asarrearsoutapply.flowable;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/6 14:57
+ * @Description
+ */
+@Data
+public class AsArrearsoutApplyCompleteDto implements Dto {
+    private static final long serialVersionUID = 6378752532534735663L;
+
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+    @ApiModelProperty(value = "节点id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+    @ApiModelProperty(value = "任务id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    @ApiModelProperty(value = "流程id(PC)")
+    private String instanceId;
+    @ApiModelProperty(value = "流程id(移动)")
+    private String procInsId;
+    @ApiModelProperty(value = "意见")
+    private String comment;
+    @ApiModelProperty(value = "业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+
+    private String orgPath;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/flowable/AsArrearsoutApplyDelegateQuery.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.as.api.asarrearsoutapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/9/28 9:28
+ */
+@Data
+public class AsArrearsoutApplyDelegateQuery {
+    @ApiModelProperty
+    private String userSid;
+    @ApiModelProperty("流程实例id")
+//    @JsonProperty("procInsId")
+    private String instanceId;
+    @ApiModelProperty("任务Id")
+    private String taskId;
+    @ApiModelProperty("审批人sid")
+    private String assignee;
+    @ApiModelProperty("填写意见")
+    private String views;
+
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/flowable/AsArrearsoutApplyNodeQuery.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.as.api.asarrearsoutapply.flowable;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/6 15:04
+ * @Description
+ */
+@Data
+public class AsArrearsoutApplyNodeQuery implements Query {
+    private static final long serialVersionUID = 9117613683840483366L;
+
+    @ApiModelProperty(value = "环节定义id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+    @ApiModelProperty(value = "业务sid")
+    private String businessSid;
+    @ApiModelProperty(value = "0 上一环节  1下一环节")
+    private Integer next;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/flowable/AsArrearsoutApplyNodeVo.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.as.api.asarrearsoutapply.flowable;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/6 15:03
+ * @Description
+ */
+@Data
+public class AsArrearsoutApplyNodeVo implements Vo {
+    private static final long serialVersionUID = -833419512294877848L;
+
+    @ApiModelProperty(value = "节点名称")
+    private String name;
+    @ApiModelProperty(value = "节点id")
+    private String id;
+    @ApiModelProperty(value = "审批组")
+    private List<String> candidateGroups;
+    @ApiModelProperty(value = "是否是最后环节")
+    private String endTask;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/flowable/AsArrearsoutApplyTaskQuery.java

@@ -0,0 +1,48 @@
+package com.yxt.anrui.as.api.asarrearsoutapply.flowable;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/6 15:06
+ * @Description
+ */
+@Data
+public class AsArrearsoutApplyTaskQuery implements Query {
+    private static final long serialVersionUID = 1288615499873178778L;
+
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("任务Id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    /**
+     * 终止、驳回
+     */
+    @ApiModelProperty("任务意见")
+    private String comment;
+    /**
+     * 终止、撤回、驳回
+     */
+    @ApiModelProperty("用户Sid")
+    private String userSid;
+    /**
+     * 终止
+     */
+    @ApiModelProperty("流程实例Id(PC)")
+    private String instanceId;
+
+    @ApiModelProperty("流程实例Id(移动)")
+    private String procInsId;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/flowable/SubmitAsArrearsoutApplyDto.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.as.api.asarrearsoutapply.flowable;
+
+import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author liuguohui
+ * @version 1.0
+ * @description
+ * @date 2022/04/13
+ */
+@ApiModel("提交")
+@Data
+public class SubmitAsArrearsoutApplyDto extends AsArrearsoutApplyDto {
+
+    @ApiModelProperty("意见")
+    private String comment;
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java

@@ -47,12 +47,16 @@ public class AsBusrepairBill extends BaseEntity {
     private BigDecimal coupon;
     @ApiModelProperty("积分抵扣")
     private BigDecimal scoreDeduct;
-    @ApiModelProperty("当前环节编码（登记1、派工2、竣工3、结算4）")
+    @ApiModelProperty("当前环节编码(登记1、派工2、维修3、竣工4、结算5、出厂6)")
     private int nodeCode;
     @ApiModelProperty("当前环节")
     private String nodeName;
     @ApiModelProperty("进入当前环节时间")
     private Date nodeTime;
+    @ApiModelProperty("出厂状态 (0未出厂，1已出厂)")
+    private String outDoorState;
+    @ApiModelProperty("出厂时间")
+    private Date outDoorTime;
     @ApiModelProperty("使用组织sid")
     private String useOrgSid;
     @ApiModelProperty("创建组织sid")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillListQuery.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.as.api.asbusrepairbill;
 
 import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -11,4 +12,7 @@ import lombok.Data;
 @Data
 public class AsBusrepairBillListQuery implements Query {
     private static final long serialVersionUID = -8064420711405073914L;
+
+    @ApiModelProperty("当前环节编码")
+    private String nodeCode;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillnode/AsBusrepairBillNode.java

@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asbusrepairbillnode;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(维修工单-环节) <br/>
+ * File: AsBusrepairBillNode.java <br/>
+ * Class: com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNode <br/>
+ * Description: 维修工单-环节记录. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-08 15:20:11 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "维修工单-环节记录", description = "维修工单-环节记录")
+@TableName("as_busrepair_bill_node")
+public class AsBusrepairBillNode extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("操作人姓名")
+    private String createByName; // 操作人姓名
+	@ApiModelProperty("工单sid")
+    private String billSid; // 工单sid
+	@ApiModelProperty("环节编码")
+    private String nodeCode; // 环节编码
+	@ApiModelProperty("环节名称")
+    private String nodeName; // 环节名称
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillnode/AsBusrepairBillNodeDetailsVo.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asbusrepairbillnode;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(维修工单-环节) <br/>
+ * File: AsBusrepairBillNodeVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNodeVo <br/>
+ * Description: 维修工单-环节记录 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-08 15:20:11 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "维修工单-环节记录 视图数据详情", description = "维修工单-环节记录 视图数据详情")
+public class AsBusrepairBillNodeDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("操作人姓名")
+    private String createByName; // 操作人姓名
+	@ApiModelProperty("工单sid")
+    private String billSid; // 工单sid
+	@ApiModelProperty("环节编码")
+    private String nodeCode; // 环节编码
+	@ApiModelProperty("环节名称")
+    private String nodeName; // 环节名称
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillnode/AsBusrepairBillNodeDto.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asbusrepairbillnode;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(维修工单-环节) <br/>
+ * File: AsBusrepairBillNodeDto.java <br/>
+ * Class: com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNodeDto <br/>
+ * Description: 维修工单-环节记录 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-08 15:20:11 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "维修工单-环节记录 数据传输对象", description = "维修工单-环节记录 数据传输对象")
+public class AsBusrepairBillNodeDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("操作人姓名")
+    private String createByName; // 操作人姓名
+	@ApiModelProperty("工单sid")
+    private String billSid; // 工单sid
+	@ApiModelProperty("环节编码")
+    private String nodeCode; // 环节编码
+	@ApiModelProperty("环节名称")
+    private String nodeName; // 环节名称
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillnode/AsBusrepairBillNodeQuery.java

@@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asbusrepairbillnode;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(维修工单-环节) <br/>
+ * File: AsBusrepairBillNodeQuery.java <br/>
+ * Class: com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNodeQuery <br/>
+ * Description: 维修工单-环节记录 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-08 15:20:11 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "维修工单-环节记录 查询条件", description = "维修工单-环节记录 查询条件")
+public class AsBusrepairBillNodeQuery implements Query {
+
+	@ApiModelProperty("操作人姓名")
+    private String createByName; // 操作人姓名
+	@ApiModelProperty("工单sid")
+    private String billSid; // 工单sid
+	@ApiModelProperty("环节编码")
+    private String nodeCode; // 环节编码
+	@ApiModelProperty("环节名称")
+    private String nodeName; // 环节名称
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillnode/AsBusrepairBillNodeVo.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asbusrepairbillnode;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(维修工单-环节) <br/>
+ * File: AsBusrepairBillNodeVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNodeVo <br/>
+ * Description: 维修工单-环节记录 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-08 15:20:11 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "维修工单-环节记录 视图数据对象", description = "维修工单-环节记录 视图数据对象")
+public class AsBusrepairBillNodeVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("操作人姓名")
+    private String createByName; // 操作人姓名
+	@ApiModelProperty("工单sid")
+    private String billSid; // 工单sid
+	@ApiModelProperty("环节编码")
+    private String nodeCode; // 环节编码
+	@ApiModelProperty("环节名称")
+    private String nodeName; // 环节名称
+
+}

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/asarrearsoutapply/AsArrearsoutApplyMapper.java

@@ -0,0 +1,68 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asarrearsoutapply;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApply;
+import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyVo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Project: yxt-as(欠款出厂申请) <br/>
+ * File: AsArrearsoutApplyMapper.java <br/>
+ * Class: com.yxt.anrui.as.biz.asarrearsoutapply.AsArrearsoutApplyMapper <br/>
+ * Description: 欠款出厂申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-08 17:43:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface AsArrearsoutApplyMapper extends BaseMapper<AsArrearsoutApply> {
+
+	//@Update("update as_arrearsout_apply set name=#{msg} where id=#{id}")
+	//IPage<AsArrearsoutApplyVo> voPage(IPage<AsArrearsoutApply> page, @Param(Constants.WRAPPER) QueryWrapper<AsArrearsoutApply> qw);
+	
+	IPage<AsArrearsoutApplyVo> selectPageVo(IPage<AsArrearsoutApply> page, @Param(Constants.WRAPPER) Wrapper<AsArrearsoutApply> qw);
+	
+	List<AsArrearsoutApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsArrearsoutApply> qw);
+	
+	@Select("select * from as_arrearsout_apply")
+	List<AsArrearsoutApplyVo> selectListVo();
+
+    int updateFlowFiled(Map<String, Object> map);
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml

@@ -0,0 +1,28 @@
+<?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.asarrearsoutapply.AsArrearsoutApplyMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyVo">
+		SELECT * FROM as_arrearsout_apply <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyVo">
+		SELECT * FROM as_arrearsout_apply <where> ${ew.sqlSegment} </where>
+	</select>
+
+	<update id="updateFlowFiled">
+		UPDATE as_arrearsout_apply
+		SET nodeState=#{nodeState}, nodeId=#{taskDefKey}, finishTime = NOW()
+		<if test="procDefId != null and procDefId != ''">
+			, procDefId=#{procDefId}
+		</if>
+		<if test="procInsId != null and procInsId != ''">
+			, procInstId=#{procInsId}
+		</if>
+		<if test="taskId != null and taskId != ''">
+			, taskId=#{taskId}
+		</if>
+		WHERE sid=#{sid}
+    </update>
+</mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyRest.java

@@ -0,0 +1,152 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asarrearsoutapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.as.api.asarrearsoutapply.flowable.*;
+import com.yxt.anrui.as.feign.flowable.flow.BusinessVariables;
+import com.yxt.anrui.as.feign.flowable.flow.ProcDefEnum;
+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.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyQuery;
+import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyVo;
+import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyDetailsVo;
+import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyDto;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * Project: yxt-as(欠款出厂申请) <br/>
+ * File: AsArrearsoutApplyFeignFallback.java <br/>
+ * Class: com.yxt.anrui.as.biz.asarrearsoutapply.AsArrearsoutApplyRest <br/>
+ * Description: 欠款出厂申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-08 17:43:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "欠款出厂申请")
+@RestController
+@RequestMapping("v1/asarrearsoutapply")
+public class AsArrearsoutApplyRest {
+
+	@Autowired
+	private AsArrearsoutApplyService asArrearsoutApplyService;
+
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<AsArrearsoutApplyVo>> listPage(@RequestBody PagerQuery<AsArrearsoutApplyQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<AsArrearsoutApplyVo> pv = asArrearsoutApplyService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody AsArrearsoutApplyDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		asArrearsoutApplyService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		asArrearsoutApplyService.delBySids(sids);
+		return rb.success();
+	}
+
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<AsArrearsoutApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		AsArrearsoutApplyDetailsVo vo = asArrearsoutApplyService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+
+	@ApiOperation("提交审批流程")
+	@PostMapping("/submit")
+	public ResultBean submit(@RequestBody @Valid SubmitAsArrearsoutApplyDto dto) {
+		return asArrearsoutApplyService.submit(dto);
+	}
+
+	@ApiOperation(value = "办理（同意）")
+	@PostMapping("/complete")
+	public ResultBean complete(@Valid @RequestBody AsArrearsoutApplyCompleteDto query) {
+		BusinessVariables bv = new BusinessVariables();
+		BeanUtil.copyProperties(query, bv);
+		bv.setModelId(ProcDefEnum.ASARREARSOUTAPPLY.getProDefId());
+		return asArrearsoutApplyService.complete(bv);
+	}
+
+	@ApiOperation(value = "获取上一个环节")
+	@GetMapping(value = "/getPreviousNodesForReject")
+	public ResultBean<List<AsArrearsoutApplyNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap AsArrearsoutApplyNodeQuery query) {
+		return asArrearsoutApplyService.getPreviousNodesForReject(query);
+	}
+
+	@ApiOperation(value = "获取下一个环节")
+	@GetMapping(value = "/getNextNodesForSubmit")
+	public ResultBean<List<AsArrearsoutApplyNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap AsArrearsoutApplyNodeQuery query) {
+		return asArrearsoutApplyService.getNextNodesForSubmit(query);
+	}
+
+	@ApiOperation(value = "驳回任务")
+	@PostMapping(value = "/reject")
+	public ResultBean reject(@Valid @RequestBody AsArrearsoutApplyTaskQuery query) {
+		return asArrearsoutApplyService.reject(query);
+	}
+
+	@ApiOperation(value = "撤回流程")
+	@PostMapping(value = "/revokeProcess")
+	public ResultBean revokeProcess(@Valid @RequestBody AsArrearsoutApplyTaskQuery query) {
+		return asArrearsoutApplyService.revokeProcess(query);
+	}
+
+	@ApiOperation(value = "终止任务")
+	@PostMapping(value = "/breakProcess")
+	public ResultBean breakProcess(@Valid @RequestBody AsArrearsoutApplyTaskQuery query) {
+		return asArrearsoutApplyService.breakProcess(query);
+	}
+
+	@ApiOperation(value = "加签")
+	@PostMapping(value = "/delegate")
+	public ResultBean delegate(@RequestBody AsArrearsoutApplyDelegateQuery query) {
+		return asArrearsoutApplyService.delegate(query);
+	}
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java

@@ -0,0 +1,484 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asarrearsoutapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.as.api.asarrearsoutapply.flowable.*;
+import com.yxt.anrui.as.feign.flowable.flow.*;
+import com.yxt.anrui.as.feign.flowable.flow2.FlowDelegateQuery;
+import com.yxt.anrui.as.feign.flowable.flow2.FlowFeign;
+import com.yxt.anrui.as.feign.flowable.flowtask.FlowTaskFeign;
+import com.yxt.anrui.as.feign.flowable.flowtask.FlowTaskVo;
+import com.yxt.anrui.as.feign.flowable.flowtask.LatestTaskVo;
+import com.yxt.anrui.as.feign.message.MessageFeign;
+import com.yxt.anrui.as.feign.message.MessageFlowVo;
+import com.yxt.anrui.as.feign.message.MessageFlowableQuery;
+import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery;
+import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign;
+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 com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApply;
+import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyQuery;
+import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyVo;
+import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyDetailsVo;
+import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyDto;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * Project: yxt-as(欠款出厂申请) <br/>
+ * File: AsArrearsoutApplyService.java <br/>
+ * Class: com.yxt.anrui.as.biz.asarrearsoutapply.AsArrearsoutApplyService <br/>
+ * Description: 欠款出厂申请 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-08 17:43:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApplyMapper, AsArrearsoutApply> {
+
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private SysUserFeign sysUserFeign;
+    @Autowired
+    private FlowableFeign flowableFeign;
+    @Autowired
+    private FlowTaskFeign flowTaskFeign;
+    @Autowired
+    private FlowFeign flowFeign;
+    @Autowired
+    private MessageFeign messageFeign;
+
+    public PagerVo<AsArrearsoutApplyVo> listPageVo(PagerQuery<AsArrearsoutApplyQuery> pq) {
+        AsArrearsoutApplyQuery query = pq.getParams();
+        QueryWrapper<AsArrearsoutApply> qw = new QueryWrapper<>();
+        //========================================数据授权开始
+        if (StringUtils.isNotBlank(query.getMenuUrl())) {
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuUrl(query.getMenuUrl());
+            privilegeQuery.setMenuSid(query.getMenuSid());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                orgSidPath = orgSidPath + "/";
+                int i1 = orgSidPath.indexOf("/");
+                int i2 = orgSidPath.indexOf("/", i1 + 1);
+                int i3 = orgSidPath.indexOf("/", i2 + 1);
+                int i4 = orgSidPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i1);
+                    qw.like("orgSidPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("orgSidPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("orgSidPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("orgSidPath", orgSidPath);
+                } else if ("5".equals(orgLevelKey)) {
+                    qw.eq("createBySid", query.getUserSid());
+                } else {
+                    PagerVo<AsArrearsoutApplyVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<AsArrearsoutApplyVo> p = new PagerVo<>();
+                return p;
+            }
+        }
+        if (StringUtils.isNotBlank(query.getPairBillNo())){
+            qw.like("pairBillNo",query.getPairBillNo());
+        }
+        if (StringUtils.isNotBlank(query.getBillType())){
+            qw.like("billType",query.getBillType());
+        }
+        if (StringUtils.isNotBlank(query.getSubject())){
+            qw.like("subject",query.getSubject());
+        }
+        if (StringUtils.isNotBlank(query.getCustomerName())){
+            qw.like("customerName",query.getCustomerName());
+        }
+        if (StringUtils.isNotBlank(query.getVinNo())){
+            qw.like("vinNo",query.getVinNo());
+        }
+        if (StringUtils.isNotBlank(query.getVehMark())){
+            qw.like("vehMark",query.getVehMark());
+        }
+        IPage<AsArrearsoutApply> page = PagerUtil.queryToPage(pq);
+        IPage<AsArrearsoutApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<AsArrearsoutApplyVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public String saveOrUpdateDto(AsArrearsoutApplyDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            String sid = this.insertByDto(dto);
+            return sid;
+        }
+        this.updateByDto(dto);
+        return dtoSid;
+    }
+
+    public String insertByDto(AsArrearsoutApplyDto dto) {
+        AsArrearsoutApply entity = new AsArrearsoutApply();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+        return entity.getSid();
+    }
+
+    public void updateByDto(AsArrearsoutApplyDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        }
+        AsArrearsoutApply entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public AsArrearsoutApplyDetailsVo fetchDetailsVoBySid(String sid) {
+        AsArrearsoutApply entity = fetchBySid(sid);
+        AsArrearsoutApplyDetailsVo vo = new AsArrearsoutApplyDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    public ResultBean submit(SubmitAsArrearsoutApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        AsArrearsoutApply asArrearsoutApply = fetchBySid(dto.getSid());
+        int r = submitBusinessData(dto, asArrearsoutApply);
+        if (r == 3) {
+            return rb.setMsg("该申请不存在");
+        }
+        if (r == 0) {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+        //新增修改保存
+        String businessSid = saveOrUpdateDto(dto);
+        asArrearsoutApply = fetchBySid(businessSid);
+        //创建BusinessVariables实体对象
+        BusinessVariables bv = new BusinessVariables();
+        //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
+        Map<String, Object> variables = new HashMap<>();
+        //用户的部门全路径sid
+        bv.setOrgSidPath(asArrearsoutApply.getOrgSidPath());
+        //业务sid
+        bv.setBusinessSid(businessSid);
+        //用户sid
+        bv.setUserSid(asArrearsoutApply.getCreateBySid());
+        //若app移动端有此功能，则传递appMap参数
+        Map<String, Object> appMap = new HashMap<>();
+        appMap.put("sid", businessSid);
+        //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
+        variables.put("app", appMap);
+        //流程定义id
+        bv.setModelId(ProcDefEnum.ASARREARSOUTAPPLY.getProDefId());
+        bv.setFormVariables(variables);
+        if (r == 1) {
+            ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            UpdateFlowFieldVo ufVo = voResultBean.getData();
+            updateFlowFiled(BeanUtil.beanToMap(ufVo));
+            //极光推送
+            asArrearsoutApply = fetchBySid(businessSid);
+            MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+            MessageFlowVo messageFlowVo = new MessageFlowVo();
+            BeanUtil.copyProperties(ufVo, messageFlowVo);
+            messageFlowableQuery.setUfVo(messageFlowVo);
+            messageFlowableQuery.setAppMap(appMap);
+            messageFlowableQuery.setBusinessSid(businessSid);
+            messageFlowableQuery.setModuleName("案件上诉申请");
+            messageFlowableQuery.setMsgContent(asArrearsoutApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+            messageFlowableQuery.setMsgTitle("案件上诉申请");
+            messageFeign.pushMessage(messageFlowableQuery);
+            return voResultBean;
+        }
+        if (r == 2) {
+            // ToDo:驳回到发起人后再次提交
+            if (StringUtils.isBlank(dto.getInstanceId())) {
+                return rb.setMsg("参数错误：instanceId");
+            }
+            bv.setTaskId(asArrearsoutApply.getTaskId());
+            bv.setTaskDefKey(asArrearsoutApply.getNodeId());
+            bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
+            bv.setInstanceId(dto.getInstanceId());
+            return complete(bv);
+        }
+        return rb;
+    }
+
+    private synchronized int submitBusinessData(SubmitAsArrearsoutApplyDto dto, AsArrearsoutApply asArrearsoutApply) {
+        int r = 0;
+        if (StringUtils.isBlank(dto.getSid())) {
+            r = 1;
+        } else {
+            if (asArrearsoutApply != null) {
+                String businessTaskId = asArrearsoutApply.getTaskId();
+                if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
+                    //新提交
+                    r = 1;
+                } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
+                    //二次提交//只有数据一致的时候才能进行下一步
+                    r = 2;
+                }
+            } else {
+                r = 3;
+            }
+
+        }
+        return r;
+    }
+
+    private int updateFlowFiled(Map<String, Object> map) {
+        return baseMapper.updateFlowFiled(map);
+    }
+
+    public ResultBean complete(BusinessVariables bv) {
+        ResultBean rb = ResultBean.fireFail();
+        String businessSid = bv.getBusinessSid();
+        AsArrearsoutApply asArrearsoutApply = fetchBySid(businessSid);
+        Map<String, Object> variables = new HashMap<>();
+        Map<String, Object> appMap = new HashMap<>();
+        appMap.put("sid", businessSid);
+        variables.put("app", appMap);
+        FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
+        if (StringUtils.isBlank(asArrearsoutApply.getProcDefId())) {
+            flowProcessMapQuery.setProDefKey(bv.getModelId());
+        } else {
+            flowProcessMapQuery.setProDefKey(asArrearsoutApply.getProcDefId());
+        }
+        flowProcessMapQuery.setVariables(variables);
+        variables = flowableFeign.getMap(flowProcessMapQuery).getData();
+        //=======================================
+        bv.setFormVariables(variables);
+        bv.setOrgSidPath(asArrearsoutApply.getOrgSidPath());
+        if (bv.getTaskId().equals(asArrearsoutApply.getTaskId())) {
+            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+            if (!resultBean.getSuccess()) {
+                return rb.setMsg(resultBean.getMsg());
+            }
+            UpdateFlowFieldVo ufVo = resultBean.getData();
+            updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+            if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+
+            } else {
+                //极光推送
+                asArrearsoutApply = fetchBySid(businessSid);
+                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                MessageFlowVo messageFlowVo = new MessageFlowVo();
+                BeanUtil.copyProperties(ufVo, messageFlowVo);
+                ufVo.setProcDefId(asArrearsoutApply.getProcDefId());
+                ufVo.setProcInsId(asArrearsoutApply.getProcInstId());
+                messageFlowableQuery.setUfVo(messageFlowVo);
+                messageFlowableQuery.setAppMap(appMap);
+                messageFlowableQuery.setBusinessSid(businessSid);
+                messageFlowableQuery.setModuleName("案件上诉申请");
+                messageFlowableQuery.setMsgContent(asArrearsoutApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                messageFlowableQuery.setMsgTitle("案件上诉申请");
+                messageFeign.pushMessage(messageFlowableQuery);
+            }
+            return rb.success().setData(resultBean.getData());
+        } else {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+    }
+
+    public ResultBean<List<AsArrearsoutApplyNodeVo>> getPreviousNodesForReject(AsArrearsoutApplyNodeQuery query) {
+        ResultBean<List<AsArrearsoutApplyNodeVo>> rb = ResultBean.fireFail();
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        bv.setModelId(ProcDefEnum.ASARREARSOUTAPPLY.getProDefId());
+        ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
+        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+        List<AsArrearsoutApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AsArrearsoutApplyNodeVo.class)).collect(Collectors.toList());
+        return rb.success().setData(voList);
+    }
+
+    public ResultBean<List<AsArrearsoutApplyNodeVo>> getNextNodesForSubmit(AsArrearsoutApplyNodeQuery query) {
+        ResultBean<List<AsArrearsoutApplyNodeVo>> rb = ResultBean.fireFail();
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        bv.setModelId(ProcDefEnum.ASARREARSOUTAPPLY.getProDefId());
+        ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
+        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+        List<AsArrearsoutApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AsArrearsoutApplyNodeVo.class)).collect(Collectors.toList());
+        return rb.success().setData(voList);
+    }
+
+    public ResultBean reject(AsArrearsoutApplyTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        String businessSid = query.getBusinessSid();
+        AsArrearsoutApply asArrearsoutApply = fetchBySid(businessSid);
+        if (asArrearsoutApply == null) {
+            return rb.setMsg("该申请不存在");
+        }
+        String businessTaskId = asArrearsoutApply.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                if (StringUtils.isBlank(query.getComment())) {
+                    return rb.setMsg("请填写意见");
+                }
+                if (StringUtils.isBlank(query.getUserSid())) {
+                    return rb.setMsg("参数错误：userSid");
+                }
+                FlowTaskVo flowTaskVo = new FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                Map<String, Object> variables = new HashMap<>();
+                Map<String, Object> appMap = new HashMap<>();
+                appMap.put("sid", businessSid);
+                variables.put("app", appMap);
+                flowTaskVo.setValues(variables);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                UpdateFlowFieldVo ufVo = resultBean.getData();
+                Map<String, Object> map = BeanUtil.beanToMap(ufVo);
+                //更新业务中的流程相关的参数
+                updateFlowFiled(map);
+                //极光推送
+                asArrearsoutApply = fetchBySid(businessSid);
+                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                MessageFlowVo messageFlowVo = new MessageFlowVo();
+                BeanUtil.copyProperties(ufVo, messageFlowVo);
+                String procId = asArrearsoutApply.getProcInstId();
+                ufVo.setProcInsId(procId);
+                ufVo.setProcDefId(asArrearsoutApply.getProcDefId());
+                messageFlowableQuery.setUfVo(messageFlowVo);
+                messageFlowableQuery.setAppMap(appMap);
+                messageFlowableQuery.setBusinessSid(businessSid);
+                messageFlowableQuery.setModuleName("案件上诉申请");
+                ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
+                String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+                List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
+                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(asArrearsoutApply.getCreateBySid())) {
+                    messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
+                } else {
+                    messageFlowableQuery.setMsgContent(asArrearsoutApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                }
+                messageFlowableQuery.setMsgTitle("案件上诉申请");
+                messageFeign.pushMessage(messageFlowableQuery);
+                return rb.success();
+            }
+        }
+        return rb.setMsg("操作失败!提交的数据不一致!");
+    }
+
+    public ResultBean revokeProcess(AsArrearsoutApplyTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(query.getUserSid())) {
+            return rb.setMsg("参数错误：userSid");
+        }
+        AsArrearsoutApply asArrearsoutApply = fetchBySid(query.getBusinessSid());
+        String businessTaskId = asArrearsoutApply.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                FlowTaskVo flowTaskVo = new FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                return rb.success().setData(resultBean.getData());
+            }
+        }
+        return rb.setMsg("操作失败，提交的数据不一致!");
+    }
+
+    public ResultBean breakProcess(AsArrearsoutApplyTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(query.getInstanceId())) {
+            return rb.setMsg("参数错误：instanceId");
+        }
+        if (StringUtils.isBlank(query.getUserSid())) {
+            return rb.setMsg("参数错误：userSid");
+        }
+        if (StringUtils.isBlank(query.getComment())) {
+            return rb.setMsg("请填写意见");
+        }
+        AsArrearsoutApply asArrearsoutApply = fetchBySid(query.getBusinessSid());
+        String businessTaskId = asArrearsoutApply.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (query.getUserSid().equals(asArrearsoutApply.getCreateBySid())) {
+                FlowTaskVo flowTaskVo = new FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+                updateFlowFiled(map);
+                return rb.success().setData(resultBean.getData());
+            } else {
+                if (businessTaskId.equals(query.getTaskId())) {
+                    FlowTaskVo flowTaskVo = new FlowTaskVo();
+                    BeanUtil.copyProperties(query, flowTaskVo);
+                    ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+                    if (!resultBean.getSuccess()) {
+                        return rb.setMsg(resultBean.getMsg());
+                    }
+                    Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+                    updateFlowFiled(map);
+                    return rb.success().setData(resultBean.getData());
+                }
+            }
+
+        }
+        return rb.setMsg("操作失败!提交的数据不一致!");
+    }
+
+    public ResultBean delegate(AsArrearsoutApplyDelegateQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        FlowDelegateQuery delegateQuery = new FlowDelegateQuery();
+        BeanUtil.copyProperties(query, delegateQuery);
+        flowFeign.delegate(delegateQuery);
+        return rb.success();
+    }
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java

@@ -8,6 +8,7 @@ import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill;
 import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillListVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * @description:
@@ -17,4 +18,9 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface AsBusrepairBillMapper extends BaseMapper<AsBusrepairBill> {
     IPage<AsBusrepairBillListVo> getList(IPage<AsBusrepairBill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusrepairBill> qw);
+
+    IPage<AsBusrepairBillListVo> carOutFactory(IPage<AsBusrepairBill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusrepairBill> qw);
+
+    @Update("update as_busrepair_bill set outDoorState = '1' where sid = #{sid}")
+    void updateOutDoorState(String sid);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml

@@ -7,4 +7,8 @@
         where nodeCode = 2
           and billType = 1
     </select>
+
+    <select id="carOutFactory" resultType="com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillListVo">
+        select * from as_busrepair_bill <where> ${ew.sqlSegment} </where>
+    </select>
 </mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java

@@ -33,6 +33,22 @@ public class AsBusrepairBillRest {
         return rb.success().setData(pv);
     }
 
+    @PostMapping("carOutFactory")
+    @ApiOperation("维修工单-车辆出厂")
+    ResultBean<PagerVo<AsBusrepairBillListVo>> carOutFactory(@RequestBody PagerQuery<AsBusrepairBillListQuery> pagerQuery){
+        ResultBean<PagerVo<AsBusrepairBillListVo>> rb = ResultBean.fireFail();
+        PagerVo<AsBusrepairBillListVo> pv = asBusrepairBillService.carOutFactory(pagerQuery);
+        return rb.success().setData(pv);
+    }
+
+    @PostMapping("confirmOut")
+    @ApiOperation("维修工单-车辆出厂-确认出厂")
+    ResultBean confirmOut(@RequestParam String sid){
+        ResultBean rb = ResultBean.fireFail();
+        asBusrepairBillService.confirmOut(sid);
+        return rb.success();
+    }
+
     @PostMapping("getList1")
     @ApiOperation("维修领料获取派工维修单")
     ResultBean<PagerVo<AsBusrepairBillListVo>> getList1(@RequestBody PagerQuery<AsBusrepairBillListQuery> pagerQuery){

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -5,12 +5,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill;
 import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillListQuery;
 import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillListVo;
+import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNodeDto;
+import com.yxt.anrui.as.biz.asbusrepairbillnode.AsBusrepairBillNodeService;
 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.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Collections;
@@ -23,6 +26,9 @@ import java.util.Collections;
 @Service
 public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMapper, AsBusrepairBill> {
 
+    @Autowired
+    private AsBusrepairBillNodeService asBusrepairBillNodeService;
+
     /**
      * 维修领料获取派工单
      *
@@ -40,4 +46,30 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         PagerVo<AsBusrepairBillListVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
+    public PagerVo<AsBusrepairBillListVo> carOutFactory(PagerQuery<AsBusrepairBillListQuery> pagerQuery) {
+        AsBusrepairBillListQuery query = pagerQuery.getParams();
+        QueryWrapper<AsBusrepairBill> qw = new QueryWrapper<>();
+        qw.eq("nodeCode", query.getNodeCode());
+        if (query != null) {
+
+        }
+        IPage<AsBusrepairBill> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<AsBusrepairBillListVo> pagging = baseMapper.carOutFactory(page, qw);
+        PagerVo<AsBusrepairBillListVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void confirmOut(String sid) {
+        AsBusrepairBill asBusrepairBill = fetchBySid(sid);
+        //修改维修工单出厂状态为已出厂
+        baseMapper.updateOutDoorState(sid);
+        //新增工单环节信息
+        AsBusrepairBillNodeDto asBusrepairBillNodeDto = new AsBusrepairBillNodeDto();
+        asBusrepairBillNodeDto.setBillSid(sid);
+        asBusrepairBillNodeDto.setCreateByName(asBusrepairBill.getCreateByName());
+        asBusrepairBillNodeDto.setNodeName("出厂");
+        asBusrepairBillNodeDto.setNodeCode("6");
+        asBusrepairBillNodeService.saveOrUpdateDto(asBusrepairBillNodeDto);
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillnode/AsBusrepairBillNodeMapper.java

@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asbusrepairbillnode;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNode;
+import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNodeVo;
+
+import java.util.List;
+
+/**
+ * Project: yxt-as(维修工单-环节) <br/>
+ * File: AsBusrepairBillNodeMapper.java <br/>
+ * Class: com.yxt.anrui.as.biz.asbusrepairbillnode.AsBusrepairBillNodeMapper <br/>
+ * Description: 维修工单-环节记录. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-08 15:20:11 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface AsBusrepairBillNodeMapper extends BaseMapper<AsBusrepairBillNode> {
+
+	IPage<AsBusrepairBillNodeVo> selectPageVo(IPage<AsBusrepairBillNode> page, @Param(Constants.WRAPPER) Wrapper<AsBusrepairBillNode> qw);
+	
+	List<AsBusrepairBillNodeVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsBusrepairBillNode> qw);
+	
+	@Select("select * from as_busrepair_bill_node")
+	List<AsBusrepairBillNodeVo> selectListVo();
+}

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

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillnode/AsBusrepairBillNodeRest.java

@@ -0,0 +1,93 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asbusrepairbillnode;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNodeQuery;
+import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNodeVo;
+import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNodeDetailsVo;
+import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNodeDto;
+
+/**
+ * Project: yxt-as(维修工单-环节) <br/>
+ * File: AsBusrepairBillNodeFeignFallback.java <br/>
+ * Class: com.yxt.anrui.as.biz.asbusrepairbillnode.AsBusrepairBillNodeRest <br/>
+ * Description: 维修工单-环节记录. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-08 15:20:11 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "维修工单-环节记录")
+@RestController
+@RequestMapping("v1/asbusrepairbillnode")
+public class AsBusrepairBillNodeRest {
+
+	@Autowired
+	private AsBusrepairBillNodeService asBusrepairBillNodeService;
+
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<AsBusrepairBillNodeVo>> listPage(@RequestBody PagerQuery<AsBusrepairBillNodeQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<AsBusrepairBillNodeVo> pv = asBusrepairBillNodeService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody AsBusrepairBillNodeDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		asBusrepairBillNodeService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		asBusrepairBillNodeService.delBySids(sids);
+		return rb.success();
+	}
+
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<AsBusrepairBillNodeDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		AsBusrepairBillNodeDetailsVo vo = asBusrepairBillNodeService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillnode/AsBusrepairBillNodeService.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asbusrepairbillnode;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNode;
+import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNodeQuery;
+import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNodeVo;
+import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNodeDetailsVo;
+import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNodeDto;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * Project: yxt-as(维修工单-环节) <br/>
+ * File: AsBusrepairBillNodeService.java <br/>
+ * Class: com.yxt.anrui.as.biz.asbusrepairbillnode.AsBusrepairBillNodeService <br/>
+ * Description: 维修工单-环节记录 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-08 15:20:11 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AsBusrepairBillNodeService extends MybatisBaseService<AsBusrepairBillNodeMapper, AsBusrepairBillNode> {
+	
+	public PagerVo<AsBusrepairBillNodeVo> listPageVo(PagerQuery<AsBusrepairBillNodeQuery> pq) {
+		AsBusrepairBillNodeQuery query = pq.getParams();
+		QueryWrapper<AsBusrepairBillNode> qw = new QueryWrapper<>();
+		IPage<AsBusrepairBillNode> page = PagerUtil.queryToPage(pq);
+		IPage<AsBusrepairBillNodeVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<AsBusrepairBillNodeVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(AsBusrepairBillNodeDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(AsBusrepairBillNodeDto dto){
+		AsBusrepairBillNode entity = new AsBusrepairBillNode();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(AsBusrepairBillNodeDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		AsBusrepairBillNode entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public AsBusrepairBillNodeDetailsVo fetchDetailsVoBySid(String sid){
+		AsBusrepairBillNode entity = fetchBySid(sid);
+		AsBusrepairBillNodeDetailsVo vo = new AsBusrepairBillNodeDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}

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

yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/BusinessVariables.java

@@ -0,0 +1,65 @@
+package com.yxt.anrui.as.feign.flowable.flow;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 业务系统调用flowable流程传递参数的格式
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class BusinessVariables {
+    /**
+     * 分公司sid
+     */
+    public  static final String ORGPATH="orgPath";
+    /**
+     * 流程定义的id
+     */
+    private String modelId;
+    /**
+     * 审批意见
+     */
+    private String comment;
+    /**
+     * 流程实例的id
+     */
+    private String instanceId;
+    /**
+     * taskId
+     */
+    private String taskId;
+    /**
+     * 当前用户的id
+     */
+    private String userSid;
+    /**
+     * 当前用户部门的全路径
+     */
+    private String orgSidPath;
+    /**
+     * 业务sid
+     */
+    private String businessSid;
+    /**
+     * 环节定义的ID
+     */
+    private String taskDefKey;
+    /**
+     * nextNodeUserSids 下一环节的用户sid
+     */
+    private String nextNodeUserSids;
+    /**
+     * 业务参数，按需传递
+     */
+    private Map<String, Object> formVariables =new HashMap<>();
+  /*  @ApiModelProperty("机构sid:切换结构使用")
+    private String orgPath;*/
+}

yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/FlowProcessMapQuery.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.as.feign.flowable.flow;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * @description: 流程获取map
+ * @author: dimengzhe
+ * @date: 2023/5/26
+ **/
+@Data
+public class FlowProcessMapQuery {
+
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("变量")
+    private Map<String, Object> variables;
+    @ApiModelProperty("流程id")
+    private String proDefKey;
+
+    @ApiModelProperty("是否领票（欠款开票使用）")
+    private String isLP;
+    @ApiModelProperty("贷款人姓名")
+    private String dkrName;
+}

yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/FlowableFeign.java

@@ -0,0 +1,48 @@
+package com.yxt.anrui.as.feign.flowable.flow;
+
+import com.yxt.anrui.as.feign.flowable.flowtask.FlowTaskVo;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.Map;
+
+@FeignClient(
+        contextId = "anrui-flowable-Flowable",
+        name = "anrui-flowable",
+        path = "v1/flow")
+public interface FlowableFeign {
+
+    @ApiOperation(value = "启动流程")
+    @PostMapping(value = "/startProcess")
+    @ResponseBody
+    ResultBean<UpdateFlowFieldVo> startProcess(@RequestBody BusinessVariables dto);
+
+    @ApiOperation(value = "获取map")
+    @PostMapping(value = "/getMap")
+    @ResponseBody
+    ResultBean<Map<String,Object>> getMap(@RequestBody FlowProcessMapQuery query);
+
+    @ApiOperation(value = "处理流程")
+    @PostMapping(value = "/handleProsess")
+    @ResponseBody
+    ResultBean<UpdateFlowFieldVo> handleProsess(@RequestBody BusinessVariables bv);
+
+    @ApiOperation(value = "驳回流程")
+    @PostMapping(value = "/taskReject")
+    @ResponseBody
+    ResultBean<UpdateFlowFieldVo> taskReject(@RequestBody FlowTaskVo fl);
+
+    @ApiOperation(value = "撤回流程")
+    @PostMapping(value = "/revokeProcess")
+    @ResponseBody
+    ResultBean<UpdateFlowFieldVo> revokeProcess(@RequestBody FlowTaskVo fl);
+
+    @ApiOperation(value = "终止流程")
+    @PostMapping(value = "/breakProcess")
+    @ResponseBody
+    ResultBean<UpdateFlowFieldVo> breakProcess(@RequestBody FlowTaskVo fl);
+}

yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java

@@ -0,0 +1,147 @@
+package com.yxt.anrui.as.feign.flowable.flow;
+
+/**
+ * 流程定义：流程名称与代号枚举类
+ */
+public enum ProcDefEnum {
+
+
+    /***************************正式流程id***********************************/
+
+    DEFAUL_TADMIN_SID("默认的管理员sid", "427a2fb0-60c5-409f-bea4-4eb441041ae6"),
+
+    ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_60lvxwuh:1:960004"),
+    ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
+    ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
+    SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"),
+    FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:7:8387504"),
+    QKFINBILLAPPLICATION("欠款开票申请流程", "process_q4evu61h:5:8387508"),
+    QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:7:7265008"),
+    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:5:4975004"),
+    VEHICLEAPPLY("排产申请流程", "process_9egcg169:14:3120004"),
+    SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:9:1865007"),
+    //    BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),
+    BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:9:4087504"),
+    FINCOSTAPPLY("费用申请", "process_u0pahv0s:6:725016"),
+    FINPAYAPPLY("付款申请", "process_gin2tntb:4:725020"),
+    RECORDAPPLICATION("入库申请", "process_xbwq2c7p:5:1742504"),
+    SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"),
+    SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"),
+    SALESORDER("销售订单审批流程", "process_p5ils2rn:10:1250008"),
+    BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:7:3100008"),
+    //    BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:8:1865012"),
+    BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:10:4035008"),
+    BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"),
+    BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:4:1362508"),
+    //    BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:10:1700004"),
+    BUSDELIVEREDAPPLY("出库申请", "process_30ixry76:2:5357504"),
+    QKBUSDELIVEREDAPPLY("欠款出库申请", "process_161otrwo:3:7192504"),
+    BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"),
+    BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"),
+    SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:1:535004"),
+    SCMVEHREBATECHECKAPPLY("单车返利核对申请", "process_3xtbbru8:1:560004"),
+    SCMSPECIALREBATEWITHAPPLY("专项返利预提申请", "process_l0yxpgs2:1:590004"),
+    SCMSPECIALREBATECHECKAPPLY("专项返利核对申请", "process_qw22vupn:1:590008"),
+    SCMSPECIALREBATECHEDISTRIBUTE("专项返利分配申请", "process_h3w1aval:1:615004"),
+    SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"),
+    SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"),
+    CONTRACTAPPLY("合同审核", "process_gd8c9xd5:2:932504"),
+    BASEDISPACKAGEAPPLY("优惠包申请流程", "process_ncifet6k:4:1747504"),
+    BUSSALESORDERRETURNVEHAPPLY("销售订单退车申请", "process_tzjjs03y:1:1012504"),
+    BASETRAILEROUTAPPLY("挂车出库申请", "process_tkw6vhfw:1:1705004"),
+    FINFUNDSAPPLY("款项结转申请", "process_ypafrrvg:1:2257504"),
+    BUSHANDOVER("交车确认", "process_e8feloik:6:2675004"),
+    LOANFINPOLICYRECORDAPPLY("金融产品政策备案", "process_u45lo7qc:1:2272516"),
+    LOANOTHERPOLICYRECORDAPPLY("其它融产品备案", "process_7pptyzfc:1:2272524"),
+    LOANCREDITAPPEALAPPLY("信用审核申诉", "process_gygvxw8k:2:5212504"),
+    DEALERFILINGAPPLY("经销商备案", "process_jdu35cog:9:6652504"),
+    LOANTEMPLATEAPPLY("定制金融方案", "process_9q5omebi:2:2685008"),
+    LOANDIFFAPPLY("放款差额确认", "process_f70x5q33:1:6845004"),
+    LOANHOMEVISITAPPEALAPPLY("家访考察申诉", "process_8ujil3h3:1:3665004"),
+    BUSVALCUSTFILING("价值客户备案申请", "process_n8fwpitk:2:5085004"),
+    LOANCUSTOMERRECORD("欠款客户备案", "process_x6o0chx9:4:6055004"),
+    BUSSOLUTIONSCHANGE("金融方案变更", "process_x6edjfoj:2:6055008"),
+    LOANBUCKLEAPPLLY("划扣申请", "process_50xtaucg:1:6757504"),
+    COLLECTIONPAYMENT("代收代付申请", "process_6upfyv8i:1:6972504"),
+    BEPADSINCEREAPPLY("逾期垫款申请", "process_h1mcb548:1:6712504"),
+    BECOLLECTIONAPPLY("催收措施申请", "process_7xz17xva:1:7417504"),
+    MONTHLYACCRUAL("当月应收计提申请", "process_7zpo52qj:1:7367504"),
+    LOANOVERDUEFIN("逾期对账申请（财务）", "process_b0i03acl:1:7672504"),
+    LOANOVERDUEBANK("逾期对账申请（资方）", "process_wwb7q95x:1:7672508"),
+    LOANVEHCLEARANCEAPPLY("车辆远程解控申请", "process_zbzenr9b:2:7782504"),
+    LOANRESTOREREPORTAPPLY("车辆交回事前报备申请", "process_w796wtt7:1:7822504"),
+    LOANREDEMPTIONAPPLY("车辆交回赎回申请", "process_qu4fq4r6:1:7820004"),
+    LOANRETUENINBOUNDAPPLY("交回车辆入库申请", "process_h0i1vnn8:1:7945004"),
+    LOANSUBLETAPPLY("交回车辆二次转租申请", "process_lu7pdwzs:1:7940004"),
+    LOANOUTBOUNDVEHAPPLY("交回车辆出库申请", "process_14spbdx8:1:7982504"),
+    LOANSECONDSALEAPPLY("交车车辆二次销售申请", "process_6kb1z0pe:4:8110004"),
+    LOANSETTLEAPPLY("结清申请", "process_ob34xgz2:1:8222504"),
+    LOANREPURCHASEAPPLY("回购申请", "process_1ozjarxl:1:8207504"),
+    LOANCASEAPPEALAPPLY("案件上诉申请", "process_0r2ruoxm:1:8215004"),
+    LOANCASEEXECUTEAPPLY("案件执行立案申请", "process_aeho48ap:1:8220004"),
+    LOANCASECLOSEAPPLY("案件结案申请", "process_llaxpwkd:1:8220008"),
+    LOANLAWSUITAPPLY("诉讼申请", "process_xc4lp97d:1:8380004"),
+    LOANCASEENTRUSTLAWYERAPPLY("案件委托律师", "process_oe3nvzgn:1:8525004"),
+    ASARREARSOUTAPPLY("欠款出厂申请", ""),
+
+    /******************************测试流程id*********************************************/
+
+    /*ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_rlj1kzfi:1:952504"),
+    ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
+    ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
+    SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"),
+    FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:1:1180004"),
+    BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
+    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),
+    VEHICLEAPPLY("排产申请流程", "process_9egcg169:12:735004"),
+    SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:725008"),
+    BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),
+    FINCOSTAPPLY("费用申请", "process_u0pahv0s:6:725016"),
+    FINPAYAPPLY("付款申请", "process_gin2tntb:4:725020"),
+    RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),
+    SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"),
+    SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"),
+    SALESORDER("销售订单审批流程", "process_p5ils2rn:8:1070004"),
+    BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:722504"),
+    BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:722512"),
+    BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"),
+    BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:722520"),
+    BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:3:770004"),
+    BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"),
+    BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"),
+    SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:1:535004"),
+    SCMVEHREBATECHECKAPPLY("单车返利核对申请", "process_3xtbbru8:1:560004"),
+    SCMSPECIALREBATEWITHAPPLY("专项返利预提申请", "process_l0yxpgs2:1:590004"),
+    SCMSPECIALREBATECHECKAPPLY("专项返利核对申请", "process_qw22vupn:1:590008"),
+    SCMSPECIALREBATECHEDISTRIBUTE("专项返利分配申请", "process_h3w1aval:1:615004"),
+    SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"),
+    SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"),
+    CONTRACTAPPLY("合同审核", "process_gd8c9xd5:2:932504"),
+    BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),*/;
+
+
+    ProcDefEnum(String proDefName, String proDefId) {
+        this.proDefName = proDefName;
+        this.proDefId = proDefId;
+
+    }
+
+    /**
+     * 流程类型名称
+     */
+    private final String proDefName;
+
+    /**
+     * 流程代号
+     */
+    private final String proDefId;
+
+    public String getProDefName() {
+        return proDefName;
+    }
+
+    public String getProDefId() {
+        return proDefId;
+    }
+}
+

yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/UpdateFlowFieldVo.java

@@ -0,0 +1,68 @@
+package com.yxt.anrui.as.feign.flowable.flow;
+
+public class UpdateFlowFieldVo {
+
+    private String sid;
+    private String procDefId;
+    private String nodeState;
+    private String procInsId;
+    private String taskDefKey;
+    private String taskId;
+    private String nextNodeUserSids;
+
+    public String getNextNodeUserSids() {
+        return nextNodeUserSids;
+    }
+
+    public void setNextNodeUserSids(String nextNodeUserSids) {
+        this.nextNodeUserSids = nextNodeUserSids;
+    }
+
+    public String getSid() {
+        return sid;
+    }
+
+    public void setSid(String sid) {
+        this.sid = sid;
+    }
+
+    public String getProcDefId() {
+        return procDefId;
+    }
+
+    public void setProcDefId(String procDefId) {
+        this.procDefId = procDefId;
+    }
+
+    public String getNodeState() {
+        return nodeState;
+    }
+
+    public void setNodeState(String nodeState) {
+        this.nodeState = nodeState;
+    }
+
+    public String getProcInsId() {
+        return procInsId;
+    }
+
+    public void setProcInsId(String procInsId) {
+        this.procInsId = procInsId;
+    }
+
+    public String getTaskDefKey() {
+        return taskDefKey;
+    }
+
+    public void setTaskDefKey(String taskDefKey) {
+        this.taskDefKey = taskDefKey;
+    }
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+}

yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow2/FlowDelegateQuery.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.as.feign.flowable.flow2;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/10/8 15:58
+ */
+@Data
+public class FlowDelegateQuery {
+    @ApiModelProperty
+    private String userSid;
+    @ApiModelProperty("流程实例id")
+//    @JsonProperty("procInsId")
+    private String instanceId;
+    @ApiModelProperty("任务Id")
+    private String taskId;
+    @ApiModelProperty("审批人sid")
+    private String assignee;
+    @ApiModelProperty("填写意见")
+    private String views;
+}

yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow2/FlowFeign.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.as.feign.flowable.flow2;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@FeignClient(
+        contextId = "anrui-flowable-Flow",
+        name = "anrui-flowable",
+        path = "v2/flow")
+public interface FlowFeign {
+
+    @ApiOperation(value = "加签")
+    @PostMapping(value = "/delegate")
+    public ResultBean delegate(@RequestBody FlowDelegateQuery flowDelegateQuery);
+}

yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flowtask/FlowTaskFeign.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.as.feign.flowable.flowtask;
+
+import com.yxt.anrui.as.feign.flowable.flow.BusinessVariables;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+@FeignClient(
+        contextId = "anrui-flowable-FlowTask",
+        name = "anrui-flowable",
+        path = "v1/flowable/task")
+public interface FlowTaskFeign {
+
+    @ApiOperation(value = "获取下一个环节")
+    @PostMapping(value = "/getNextNodesForSubmit")
+    ResultBean getNextNodesForSubmit(@RequestBody BusinessVariables bv);
+
+    @ApiOperation(value = "根据流程实例的id获取最新待办环节")
+    @PostMapping(value = "/获取上一个环节")
+    ResultBean getPreviousNodesForReject(@RequestBody BusinessVariables bv);
+
+    @ApiOperation(value = "根据流程实例的id获取最新待办环节")
+    @PostMapping(value = "/getLatestTasks/{procId}")
+    ResultBean<List<LatestTaskVo>>  getLatestTasks(@PathVariable(value = "procId") String procId);
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flowtask/FlowTaskVo.java

@@ -0,0 +1,53 @@
+package com.yxt.anrui.as.feign.flowable.flowtask;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>流程任务<p>
+ *
+ * @author XuanXuan
+ * @date 2021-04-03
+ */
+@ApiModel("工作流任务相关--请求参数")
+@Data
+public class FlowTaskVo {
+
+    @ApiModelProperty("任务Id")
+    private String taskId;
+    @ApiModelProperty("业务sid")
+    private String  businessSid;
+    @ApiModelProperty("用户Id")
+    private String userId;
+    @ApiModelProperty("用户Sid")
+    private String userSid;
+
+    @ApiModelProperty("任务意见")
+    private String comment;
+
+    @ApiModelProperty("流程实例Id")
+    private String instanceId;
+
+    @ApiModelProperty("节点")
+    private String targetKey;
+
+    @ApiModelProperty("流程变量信息")
+    private Map<String, Object> values=new HashMap<>();
+
+    @ApiModelProperty("审批人")
+    private String assignee;
+
+    @ApiModelProperty("候选人")
+    private List<String> candidateUsers;
+
+    @ApiModelProperty("审批组")
+    private List<String> candidateGroups;
+
+
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flowtask/LatestTaskVo.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.as.feign.flowable.flowtask;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author liuguohui
+ * @Date 2022/1/11
+ */
+@ApiModel("最近环节")
+@Data
+public class LatestTaskVo implements Vo {
+
+    @ApiModelProperty(value = "name_")
+    private String name_;
+
+    @ApiModelProperty(value = "task_def_key_")
+    private String task_def_key_;
+
+    @ApiModelProperty(value = "id_")
+    private String id_;
+
+    @ApiModelProperty(value = "name_")
+    private String ASSIGNEE_;
+
+    @ApiModelProperty(value = "orgPath")
+    private String orgPath;
+
+    @ApiModelProperty(value = "incomingSourceRef")
+    private String incomingSourceRef;
+}

yxt-as/src/main/java/com/yxt/anrui/as/feign/message/MessageFeign.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.as.feign.message;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@Api(tags = "消息体")
+@FeignClient(
+        contextId = "message-center-Message",
+        name = "message-center",
+        path = "v1/message")
+public interface MessageFeign {
+
+    /**
+     * 流程审批推送消息
+     *
+     * @param query
+     * @return
+     */
+    @ApiOperation("流程审批推送消息")
+    @PostMapping("/pushMessage")
+    ResultBean<String> pushMessage(@RequestBody MessageFlowableQuery query);
+}

yxt-as/src/main/java/com/yxt/anrui/as/feign/message/MessageFlowVo.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.as.feign.message;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/25 15:58
+ * @Description
+ */
+@Data
+public class MessageFlowVo implements Vo {
+
+    private String sid;
+    private String procDefId;
+    private String nodeState;
+    private String procInsId;
+    private String taskDefKey;
+    private String taskId;
+    private String nextNodeUserSids;
+}

yxt-as/src/main/java/com/yxt/anrui/as/feign/message/MessageFlowableQuery.java

@@ -0,0 +1,32 @@
+package com.yxt.anrui.as.feign.message;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/25 15:12
+ * @Description
+ */
+@Data
+public class MessageFlowableQuery implements Query {
+    private static final long serialVersionUID = 3618558867479892211L;
+    @ApiModelProperty("业务sid")
+    private String businessSid;
+    @ApiModelProperty("模块名称")
+    private String moduleName;
+    @ApiModelProperty("消息内容")
+    private String msgContent;
+    @ApiModelProperty("消息标题")
+    private String msgTitle;
+    @ApiModelProperty("流程相关参数")
+    private MessageFlowVo ufVo;
+    @ApiModelProperty("app所需参数")
+    private Map<String,Object> appMap;
+    @ApiModelProperty("申请人")
+    private String applicationName;
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/feign/portal/privilege/PrivilegeQuery.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.as.feign.portal.privilege;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 权限角色层级
+ * @author: dimengzhe
+ * @date: 2023/5/23
+ **/
+@Data
+public class PrivilegeQuery {
+
+    @ApiModelProperty("菜单路由")
+    private String menuUrl;
+    @ApiModelProperty("组织全路径sid")
+    private String orgPath;
+    @ApiModelProperty("菜单sid")
+    private String menuSid;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+}

yxt-as/src/main/java/com/yxt/anrui/as/feign/portal/sysuser/SysUserFeign.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.as.feign.portal.sysuser;
+
+import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@Api(tags = "用户表")
+@FeignClient(
+        contextId = "anrui-portal-SysUser",
+        name = "anrui-portal",
+        path = "v1/sysuser")
+public interface SysUserFeign {
+
+    @ApiOperation(value = "查询角色权限的层级获取权限id")
+    @PostMapping(value = "/selectPrivilegeLevel")
+    ResultBean<String> selectPrivilegeLevel(@RequestBody PrivilegeQuery query);
+}

yxt-as/target/classes/banner.txt

@@ -0,0 +1,13 @@
+  ,----..                     ____
+ /   /   \                  ,'  , `.
+|   :     :  ,---.       ,-+-,.' _ |                   ,---.        ,---,
+.   |  ;. / '   ,'\   ,-+-. ;   , ||                  '   ,'\   ,-+-. /  |
+.   ; /--` /   /   | ,--.'|'   |  || ,---.           /   /   | ,--.'|'   |
+;   | ;   .   ; ,. :|   |  ,', |  |,/     \         .   ; ,. :|   |  ,"' |
+|   : |   '   | |: :|   | /  | |--'/    /  |        '   | |: :|   | /  | |
+.   | '___'   | .; :|   : |  | ,  .    ' / |        '   | .; :|   | |  | |
+'   ; : .'|   :    ||   : |  |/   '   ;   /|        |   :    ||   | |  |/
+'   | '/  :\   \  / |   | |`-'    '   |  / |         \   \  / |   | |--'
+|   :    /  `----'  |   ;/        |   :    |          `----'  |   |/
+ \   \ .'           '---'          \   \  /                   '---'
+  `---`                             `----'