工单回访

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java

@@ -263,7 +263,7 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
         String mainSid = dto.getMainSid();
         BaseManufacturerRetware baseManufacturerRetware = fetchBySid(mainSid);
         BaseVehicle baseVehicle = baseVehicleService.selectByVinNoAndOrgSid(vinNo, baseManufacturerRetware.getCreateOrgSid());
-        String s = baseManufacturerRetwareVehService.fetchByVinNo(vinNo);
+        String s = baseManufacturerRetwareVehService.fetchByVinNo(vinNo, baseManufacturerRetware.getCreateOrgSid());
         if (StringUtils.isNotBlank(s)) {
             return rb.setMsg("该车辆已确认");
         }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehMapper.java

@@ -71,8 +71,7 @@ public interface BaseManufacturerRetwareVehMapper extends BaseMapper<BaseManufac
 	@Update("update base_manufacturer_retware_veh set manApprovalType = #{manApprovalType},refundMoney = #{refundMoney},manDeduRemarks = #{manDeduRemarks} where vinNo = #{vinNo}")
     int updateByVinNo(@Param("manApprovalType") String manApprovalType,@Param("refundMoney") String refundMoney,@Param("vinNo") String vinNo,@Param("manDeduRemarks") String manDeduRemarks);
 
-	@Select("select manApprovalType from base_manufacturer_retware_veh where vinNo = #{vinNo}")
-	String fetchByVinNo(String vinNo);
+	String fetchByVinNo(@Param("vinNo") String vinNo,@Param("createOrgSid") String createOrgSid);
 
 	int fetchUNConfirmCountByMainSid(String mainSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehMapper.xml

@@ -26,4 +26,15 @@
           AND ISNULL(manApprovalType) = 0
           AND LENGTH(TRIM(manApprovalType)) = 0
     </select>
+
+    <select id="fetchByVinNo" resultType="java.lang.String">
+        SELECT
+                mrv.manApprovalType
+        FROM
+                base_manufacturer_retware_veh mrv
+                        LEFT JOIN base_manufacturer_retware mr
+                        ON mrv.`mainSid` = mr.sid
+        WHERE mrv.vinNo = #{vinNo}
+          AND mr.`createOrgSid` = #{createOrgSid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehService.java

@@ -143,8 +143,8 @@ public class BaseManufacturerRetwareVehService extends MybatisBaseService<BaseMa
 		return baseMapper.updateByVinNo(manApprovalType,refundMoney,vinNo,manDeduRemarks);
 	}
 
-	public String fetchByVinNo(String vinNo) {
-		return baseMapper.fetchByVinNo(vinNo);
+	public String fetchByVinNo(String vinNo,String createOrgSid) {
+		return baseMapper.fetchByVinNo(vinNo,createOrgSid);
 	}
 
 	public int fetchUNConfirmCountByMainSid(String mainSid) {

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

@@ -103,5 +103,8 @@ public class AsBusrepairBill extends BaseEntity {
     private BigDecimal subsidyAmount;
     @ApiModelProperty("其他费用")
     private BigDecimal otherAmount;
-
+    @ApiModelProperty("附加费")
+    private BigDecimal addAmount;
+    @ApiModelProperty("税额")
+    private BigDecimal taxAmount;
 }

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

@@ -26,6 +26,10 @@ public class AsBusrepairBillDetailsVo implements Vo {
     private String goodsAmount;
     @ApiModelProperty("外出费")
     private String outAmount;
+    @ApiModelProperty("附加费")
+    private String addAmount;
+    @ApiModelProperty("税额")
+    private String taxAmount;
     @ApiModelProperty("厂家补助")
     private String subsidyAmount;
     @ApiModelProperty("其他费用")

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

@@ -0,0 +1,47 @@
+package com.yxt.anrui.as.api.asbusrepairbill;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/4/18 9:09
+ */
+@Data
+public class AsBusrepairBillInitVo implements Vo {
+
+    @ApiModelProperty("工单编号")
+    private String billNo;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("结算时间")
+    private Date settleDate;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("联系电话")
+    private String mobile;
+    @ApiModelProperty("科目")
+    private String subject;
+    @ApiModelProperty("工时费")
+    private String hourAmount;
+    @ApiModelProperty("材料费")
+    private String goodsAmount;
+    @ApiModelProperty("附加费")
+    private BigDecimal addAmount;
+    @ApiModelProperty("税额")
+    private BigDecimal taxAmount;
+    @ApiModelProperty("合计")
+    private BigDecimal total;
+
+    private List<SitemInitVo> sitemVos = new ArrayList<>();// 服务项目
+    private List<GoodsDetailsInitVo> goodsDetailsVos = new ArrayList<>(); //商品信息
+}

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

@@ -0,0 +1,23 @@
+package com.yxt.anrui.as.api.asbusrepairbill;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/4/18 9:12
+ */
+@Data
+public class GoodsDetailsInitVo implements Vo {
+
+    //商品名称
+    private String goodsSpuName;
+    @ApiModelProperty("出/退库数量")
+    private String count;
+    @ApiModelProperty("科目")
+    private String subject;
+    //金额（销售价-优惠金额）
+    private String amount;
+}

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

@@ -0,0 +1,25 @@
+package com.yxt.anrui.as.api.asbusrepairbill;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/4/18 9:02
+ */
+@Data
+public class SitemInitVo {
+
+    @ApiModelProperty("项目名称")
+    private String serviceItem;
+    @ApiModelProperty("科目（自费、保内等）")
+    private String subject;
+    @ApiModelProperty("金额（销售价-优惠金额）")
+    private String amount;
+
+    private List<String> staffNameList = new ArrayList<>(); //维修人员姓名信息
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbilltrack/AsBusrepairBillTrackDetailsVo.java

@@ -26,12 +26,15 @@
 package com.yxt.anrui.as.api.asbusrepairbilltrack;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * Project: anrui-as(工单回访记录) <br/>
  * File: AsBusrepairBillTrackVo.java <br/>
@@ -51,8 +54,13 @@ public class AsBusrepairBillTrackDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
 	@ApiModelProperty("回访人")
-    private String createByName; // 回访人
+    private String createByName;
+    @ApiModelProperty("备注")
+    private String remarks;
 	@ApiModelProperty("工单sid")
     private String billSid; // 工单sid
 	@ApiModelProperty("客户sid")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbilltrack/AsBusrepairBillTrackDto.java

@@ -51,6 +51,8 @@ public class AsBusrepairBillTrackDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("回访人sid")
+    private String createBySid;
 	@ApiModelProperty("回访人")
     private String createByName; // 回访人
 	@ApiModelProperty("工单sid")

yxt-as/src/main/java/com/yxt/anrui/as/api/astrackbill/AsTrackBill.java

@@ -0,0 +1,89 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.astrackbill;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+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;
+
+/**
+ * Project: yxt-4sas(工单回访) <br/>
+ * File: AsTrackBill.java <br/>
+ * Class: com.yxt.anrui.as.api.astrackbill.AsTrackBill <br/>
+ * Description: 回访单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-06-05 16:31:03 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回访单", description = "回访单")
+@TableName("as_track_bill")
+public class AsTrackBill extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("来源单sid")
+    private String sourceBillSid; // 来源单sid
+	@ApiModelProperty("来源单编号")
+    private String sourceBillNo; // 来源单编号
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@ApiModelProperty("结算日期")
+    private Date settleDate; // 结算日期
+	@ApiModelProperty("回访单编号")
+    private String billNo; // 回访单编号
+	@ApiModelProperty("回访原因（维修回访01/销售回访02）")
+    private String reason; // 回访原因（维修回访01/销售回访02）
+	@ApiModelProperty("服务顾问sid（来源单中的服务顾问）")
+    private String waitorSid; // 服务顾问sid（来源单中的服务顾问）
+	@ApiModelProperty("服务顾问姓名")
+    private String waitorName; // 服务顾问姓名
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@ApiModelProperty("预定回访日期")
+    private Date reserveDate; // 预定回访日期
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@ApiModelProperty("完成回访日期")
+    private Date finishDate; // 完成回访日期
+	@ApiModelProperty("部门sid")
+    private String deptSid; // 部门sid
+	@ApiModelProperty("部门名称")
+    private String deptName; // 部门名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName;
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName;
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/astrackbill/AsTrackBillDetailsVo.java

@@ -0,0 +1,102 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.astrackbill;
+
+
+import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillInitVo;
+import com.yxt.anrui.as.api.asbusrepairbilltrack.AsBusrepairBillTrackDetailsVo;
+import com.yxt.anrui.as.api.astrackbillquestion.AsTrackBillQuestionDetailsVo;
+import com.yxt.anrui.as.api.astrackquestion.AsTrackQuestionDetailsVo;
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-4sas(工单回访) <br/>
+ * File: AsTrackBillVo.java <br/>
+ * Class: com.yxt.anrui.as.api.astrackbill.AsTrackBillVo <br/>
+ * Description: 回访单 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-06-05 16:31:03 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回访单 视图数据详情", description = "回访单 视图数据详情")
+public class AsTrackBillDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("来源单sid")
+    private String sourceBillSid; // 来源单sid
+    @ApiModelProperty("来源单编号")
+    private String sourceBillNo; // 来源单编号
+    @ApiModelProperty("结算日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date settleDate; // 结算日期
+    @ApiModelProperty("回访单编号")
+    private String billNo; // 回访单编号
+    @ApiModelProperty("回访原因（维修回访01/销售回访02）")
+    private String reason; // 回访原因（维修回访01/销售回访02）
+    @ApiModelProperty("服务顾问sid（来源单中的服务顾问）")
+    private String waitorSid; // 服务顾问sid（来源单中的服务顾问）
+    @ApiModelProperty("服务顾问姓名")
+    private String waitorName; // 服务顾问姓名
+    @ApiModelProperty("预定回访日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date reserveDate; // 预定回访日期
+    @ApiModelProperty("完成回访日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date finishDate; // 完成回访日期
+    @ApiModelProperty("部门sid")
+    private String deptSid; // 部门sid
+    @ApiModelProperty("部门名称")
+    private String deptName; // 部门名称
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName;
+
+    @ApiModelProperty("工单信息")
+    private AsBusrepairBillInitVo asBusrepairBillInit;
+    @ApiModelProperty("工单问题")
+    private List<AsTrackBillQuestionDetailsVo> asTrackBillQuestionDetailsList;
+    @ApiModelProperty("跟踪记录")
+    private List<AsBusrepairBillTrackDetailsVo> asBusrepairBillTrackDetailsList;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/astrackbill/AsTrackBillDto.java

@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.astrackbill;
+
+
+import com.yxt.anrui.as.api.astrackbillquestion.AsTrackBillQuestionDetailsVo;
+import com.yxt.common.core.dto.Dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-4sas(工单回访) <br/>
+ * File: AsTrackBillDto.java <br/>
+ * Class: com.yxt.anrui.as.api.astrackbill.AsTrackBillDto <br/>
+ * Description: 回访单 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-06-05 16:31:03 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回访单 数据传输对象", description = "回访单 数据传输对象")
+public class AsTrackBillDto implements Dto {
+
+    private String sid; // sid
+
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
+	@ApiModelProperty("来源单sid")
+    private String sourceBillSid; // 来源单sid
+	@ApiModelProperty("来源单编号")
+    private String sourceBillNo; // 来源单编号
+	@ApiModelProperty("结算日期")
+    private String settleDate; // 结算日期
+	@ApiModelProperty("回访单编号")
+    private String billNo; // 回访单编号
+	@ApiModelProperty("回访原因（维修回访01/销售回访02）")
+    private String reason; // 回访原因（维修回访01/销售回访02）
+	@ApiModelProperty("服务顾问sid（来源单中的服务顾问）")
+    private String waitorSid; // 服务顾问sid（来源单中的服务顾问）
+	@ApiModelProperty("服务顾问姓名")
+    private String waitorName; // 服务顾问姓名
+	@ApiModelProperty("预定回访日期")
+    private String reserveDate; // 预定回访日期
+	@ApiModelProperty("完成回访日期")
+    private String finishDate; // 完成回访日期
+	@ApiModelProperty("部门sid")
+    private String deptSid; // 部门sid
+	@ApiModelProperty("部门名称")
+    private String deptName; // 部门名称
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName;
+
+    @ApiModelProperty("工单问题")
+    private List<AsTrackBillQuestionDetailsVo> asTrackBillQuestionDetailsList;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/astrackbill/AsTrackBillQuery.java

@@ -0,0 +1,88 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.astrackbill;
+
+
+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: yxt-4sas(工单回访) <br/>
+ * File: AsTrackBillQuery.java <br/>
+ * Class: com.yxt.anrui.as.api.astrackbill.AsTrackBillQuery <br/>
+ * Description: 回访单 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-06-05 16:31:03 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回访单 查询条件", description = "回访单 查询条件")
+public class AsTrackBillQuery implements Query {
+
+    private String state;
+    @ApiModelProperty("分公司")
+    private String createOrgName;
+    @ApiModelProperty("部门名称")
+    private String deptName;
+    @ApiModelProperty("来源单编号")
+    private String sourceBillNo;
+    @ApiModelProperty("结算日期")
+    private String settleDateStart;
+    private String settleDateEnd;
+    @ApiModelProperty("科目")
+    private String subject;
+    @ApiModelProperty("客户姓名")
+    private String customerName;
+    @ApiModelProperty("客户联系电话")
+    private String customerMobile;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("回访单编号")
+    private String billNo;
+    @ApiModelProperty("预定回访日期")
+    private String reserveDateStart;
+    private String reserveDateEnd;
+    @ApiModelProperty("完成回访日期")
+    private String finishDateStart;
+    private String finishDateEnd;
+    @ApiModelProperty("回访原因（维修回访01/销售回访02）")
+    private String reason;
+    @ApiModelProperty("服务顾问姓名")
+    private String waitorName;
+
+    private String userSid;
+    private String orgPath;
+    private String menuUrl;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/astrackbill/AsTrackBillVo.java

@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.astrackbill;
+
+
+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: yxt-4sas(工单回访) <br/>
+ * File: AsTrackBillVo.java <br/>
+ * Class: com.yxt.anrui.as.api.astrackbill.AsTrackBillVo <br/>
+ * Description: 回访单 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-06-05 16:31:03 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回访单 视图数据对象", description = "回访单 视图数据对象")
+public class AsTrackBillVo implements Vo {
+
+    private String sid; // sid
+
+    private String state;
+    @ApiModelProperty("来源单编号")
+    private String sourceBillNo;
+    @ApiModelProperty("科目")
+    private String subject;
+    @ApiModelProperty("客户姓名")
+    private String customerName;
+    @ApiModelProperty("客户联系电话")
+    private String customerMobile;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("回访单编号")
+    private String billNo;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("预定回访日期")
+    private Date reserveDate;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("完成回访日期")
+    private Date finishDate;
+    @ApiModelProperty("回访原因（维修回访01/销售回访02）")
+    private String reason;
+    @ApiModelProperty("服务顾问姓名")
+    private String waitorName;
+    @ApiModelProperty("分公司")
+    private String createOrgName;
+    @ApiModelProperty("部门名称")
+    private String deptName;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/astrackbill/DailyParameterVo.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.as.api.astrackbill;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/11/7
+ **/
+@Data
+public class DailyParameterVo {
+
+    private String colName;
+
+    private String colText;
+    @JsonIgnore
+    private String tableNameKey;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebilltrack/AsBusreserveBillTrack.java → yxt-as/src/main/java/com/yxt/anrui/as/api/astrackbillquestion/AsTrackBillQuestion.java

@@ -23,37 +23,38 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.anrui.as.api.asbusreservebilltrack;
+package com.yxt.anrui.as.api.astrackbillquestion;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
- * Project: as(as) <br/>
- * File: AsBusreserveBill.java <br/>
- * Class: as.api.asbusreservebill.AsBusreserveBill <br/>
- * Description: 预约单. <br/>
+ * Project: yxt-4sas(工单回访) <br/>
+ * File: AsTrackBillQuestion.java <br/>
+ * Class: com.yxt.anrui.as.api.astrackbillquestion.AsTrackBillQuestion <br/>
+ * Description: 回访单-问题表. <br/>
  * Copyright: Copyright (c) 2011 <br/>
  * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-04-09 17:01:49 <br/>
+ * Makedate: 2024-06-05 16:31:03 <br/>
  *
  * @author liupopo
  * @version 1.0
  * @since 1.0
  */
 @Data
-@ApiModel(value = "预约单-跟踪记录", description = "预约单-跟踪记录")
-@TableName("as_busreserve_bill_track")
-public class AsBusreserveBillTrack extends BaseEntity {
+@ApiModel(value = "回访单-问题表", description = "回访单-问题表")
+@TableName("as_track_bill_question")
+public class AsTrackBillQuestion extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty("预约单sid")
-    private String billSid; // 预约单sid
+	@ApiModelProperty("回访单sid")
+    private String billSid; // 回访单sid
+	@ApiModelProperty("问题")
+    private String question; // 问题
+	@ApiModelProperty("分数")
+    private Integer score; // 分数
 
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/astrackbillquestion/AsTrackBillQuestionDetailsVo.java

@@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.astrackbillquestion;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-4sas(工单回访) <br/>
+ * File: AsTrackBillQuestionVo.java <br/>
+ * Class: com.yxt.anrui.as.api.astrackbillquestion.AsTrackBillQuestionVo <br/>
+ * Description: 回访单-问题表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-06-05 16:31:03 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回访单-问题表 视图数据详情", description = "回访单-问题表 视图数据详情")
+public class AsTrackBillQuestionDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("回访单sid")
+    private String billSid; // 回访单sid
+	@ApiModelProperty("问题")
+    private String question; // 问题
+	@ApiModelProperty("分数")
+    private Integer score; // 分数
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/astrackbillquestion/AsTrackBillQuestionDto.java

@@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.astrackbillquestion;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-4sas(工单回访) <br/>
+ * File: AsTrackBillQuestionDto.java <br/>
+ * Class: com.yxt.anrui.as.api.astrackbillquestion.AsTrackBillQuestionDto <br/>
+ * Description: 回访单-问题表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-06-05 16:31:03 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回访单-问题表 数据传输对象", description = "回访单-问题表 数据传输对象")
+public class AsTrackBillQuestionDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("回访单sid")
+    private String billSid; // 回访单sid
+	@ApiModelProperty("问题")
+    private String question; // 问题
+	@ApiModelProperty("分数")
+    private Integer score; // 分数
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/astrackquestion/AsTrackQuestion.java

@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.astrackquestion;
+
+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-4sas(工单回访) <br/>
+ * File: AsTrackQuestion.java <br/>
+ * Class: com.yxt.anrui.as.api.astrackquestion.AsTrackQuestion <br/>
+ * Description: 回访单问题设置表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-06-05 16:31:03 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回访单问题设置表", description = "回访单问题设置表")
+@TableName("as_track_question")
+public class AsTrackQuestion extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("问题")
+    private String question; // 问题
+	@ApiModelProperty("排序")
+    private String sortNo; // 排序
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/astrackquestion/AsTrackQuestionDetailsVo.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.astrackquestion;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-4sas(工单回访) <br/>
+ * File: AsTrackQuestionVo.java <br/>
+ * Class: com.yxt.anrui.as.api.astrackquestion.AsTrackQuestionVo <br/>
+ * Description: 回访单问题设置表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-06-05 16:31:03 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回访单问题设置表 视图数据详情", description = "回访单问题设置表 视图数据详情")
+public class AsTrackQuestionDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("问题")
+    private String question; // 问题
+	@ApiModelProperty("排序")
+    private String sortNo; // 排序
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/astrackquestion/AsTrackQuestionDto.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.astrackquestion;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-4sas(工单回访) <br/>
+ * File: AsTrackQuestionDto.java <br/>
+ * Class: com.yxt.anrui.as.api.astrackquestion.AsTrackQuestionDto <br/>
+ * Description: 回访单问题设置表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-06-05 16:31:03 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回访单问题设置表 数据传输对象", description = "回访单问题设置表 数据传输对象")
+public class AsTrackQuestionDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("问题")
+    private String question; // 问题
+	@ApiModelProperty("排序")
+    private String sortNo; // 排序
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+
+}

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

@@ -17,6 +17,7 @@ import com.yxt.anrui.as.api.asbusrepairbillsitemrepairer.AsBusrepairBillSitemRep
 import com.yxt.anrui.as.api.asbusrepairbillvech.AsBusrepairBillVech;
 import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail;
 import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo;
+import com.yxt.anrui.as.api.astrackbill.AsTrackBillDto;
 import com.yxt.anrui.as.api.enums.AsBillTypeEnum;
 import com.yxt.anrui.as.api.utils.AsRule;
 import com.yxt.anrui.as.api.utils.domain.AsBillNo;
@@ -30,6 +31,7 @@ import com.yxt.anrui.as.biz.asbusrepairbillsitem.AsBusrepairBillSitemService;
 import com.yxt.anrui.as.biz.asbusrepairbillsitemrepairer.AsBusrepairBillSitemRepairerService;
 import com.yxt.anrui.as.biz.asbusrepairbillvech.AsBusrepairBillVechService;
 import com.yxt.anrui.as.biz.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailService;
+import com.yxt.anrui.as.biz.astrackbill.AsTrackBillService;
 import com.yxt.anrui.as.feign.fin.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto;
 import com.yxt.anrui.as.feign.fin.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
 import com.yxt.anrui.as.feign.fms.FmsReceivesettle;
@@ -94,6 +96,8 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
     private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
     @Autowired
     private AsBusclaimBillService asBusclaimBillService;
+    @Autowired
+    private AsTrackBillService asTrackBillService;
 
     /**
      * 维修领料获取派工单
@@ -775,6 +779,26 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
 
             }
         }
+        AsTrackBillDto asTrackBillDto = new AsTrackBillDto();
+        asTrackBillDto.setCreateBySid(asBusrepairBill.getCreateBySid());
+        asTrackBillDto.setSourceBillSid(asBusrepairBill.getSid());
+        asTrackBillDto.setSourceBillNo(asBusrepairBill.getBillNo());
+        FmsReceivesettle fmsReceivesettle = fmsReceivesettleFeign.fetchBySourceSid(asBusrepairBill.getSid()).getData();
+        asTrackBillDto.setSettleDate(DateUtil.formatDate(fmsReceivesettle.getSettleTime()));
+        asTrackBillDto.setWaitorSid(asBusrepairBill.getWaitorSid());
+        asTrackBillDto.setWaitorName(asBusrepairBill.getWaitorName());
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(fmsReceivesettle.getSettleTime());
+        calendar.add(Calendar.DAY_OF_MONTH, 3);
+        asTrackBillDto.setReserveDate(DateUtil.formatDate(calendar.getTime()));
+        asTrackBillDto.setDeptSid(asBusrepairBill.getDeptSid());
+        asTrackBillDto.setDeptName(asBusrepairBill.getDeptName());
+        asTrackBillDto.setUseOrgSid(asBusrepairBill.getUseOrgSid());
+        asTrackBillDto.setUseOrgName(asBusrepairBill.getUseOrgName());
+        asTrackBillDto.setCreateOrgSid(asBusrepairBill.getCreateOrgSid());
+        asTrackBillDto.setCreateOrgName(asBusrepairBill.getCreateOrgName());
+        asTrackBillDto.setReason("01");
+        asTrackBillService.saveOrUpdateDto(asTrackBillDto);
         return rb.success();
     }
 

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbilltrack/AsBusrepairBillTrackMapper.java

@@ -29,6 +29,7 @@ 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.asbusrepairbilltrack.AsBusrepairBillTrackDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -53,10 +54,9 @@ import java.util.List;
 @Mapper
 public interface AsBusrepairBillTrackMapper extends BaseMapper<AsBusrepairBillTrack> {
 
-	IPage<AsBusrepairBillTrackVo> selectPageVo(IPage<AsBusrepairBillTrack> page, @Param(Constants.WRAPPER) Wrapper<AsBusrepairBillTrack> qw);
-	
-	List<AsBusrepairBillTrackVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsBusrepairBillTrack> qw);
-	
 	@Select("select * from as_busrepair_bill_track")
 	List<AsBusrepairBillTrackVo> selectListVo();
+
+	@Select("select * from as_busrepair_bill_track where billSid = #{billSid}")
+    List<AsBusrepairBillTrackDetailsVo> selectByBillSid(String billSid);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbilltrack/AsBusrepairBillTrackMapper.xml

@@ -3,11 +3,4 @@
 <mapper namespace="com.yxt.anrui.as.biz.asbusrepairbilltrack.AsBusrepairBillTrackMapper">
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asbusrepairbilltrack.AsBusrepairBillTrackVo">
-		SELECT * FROM as_busrepair_bill_track <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asbusrepairbilltrack.AsBusrepairBillTrackVo">
-		SELECT * FROM as_busrepair_bill_track <where> ${ew.sqlSegment} </where>
-	</select>
 </mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbilltrack/AsBusrepairBillTrackRest.java

@@ -59,14 +59,6 @@ public class AsBusrepairBillTrackRest {
 	@Autowired
 	private AsBusrepairBillTrackService asBusrepairBillTrackService;
 
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<AsBusrepairBillTrackVo>> listPage(@RequestBody PagerQuery<AsBusrepairBillTrackQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<AsBusrepairBillTrackVo> pv = asBusrepairBillTrackService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
-
 	@ApiOperation("新增或修改")
 	@PostMapping("/save")
 	public ResultBean save(@RequestBody AsBusrepairBillTrackDto dto){
@@ -75,14 +67,6 @@ public class AsBusrepairBillTrackRest {
 		return rb.success();
 	}
 
-	@ApiOperation("根据sid批量删除")
-    @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		asBusrepairBillTrackService.delBySids(sids);
-		return rb.success();
-	}
-
 	@ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     public ResultBean<AsBusrepairBillTrackDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbilltrack/AsBusrepairBillTrackService.java

@@ -41,6 +41,8 @@ import com.yxt.anrui.as.api.asbusrepairbilltrack.AsBusrepairBillTrackDto;
 
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * Project: anrui-as(工单回访记录) <br/>
  * File: AsBusrepairBillTrackService.java <br/>
@@ -56,16 +58,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class AsBusrepairBillTrackService extends MybatisBaseService<AsBusrepairBillTrackMapper, AsBusrepairBillTrack> {
-	
-	public PagerVo<AsBusrepairBillTrackVo> listPageVo(PagerQuery<AsBusrepairBillTrackQuery> pq) {
-		AsBusrepairBillTrackQuery query = pq.getParams();
-		QueryWrapper<AsBusrepairBillTrack> qw = new QueryWrapper<>();
-		IPage<AsBusrepairBillTrack> page = PagerUtil.queryToPage(pq);
-		IPage<AsBusrepairBillTrackVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<AsBusrepairBillTrackVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	
+
 	public void saveOrUpdateDto(AsBusrepairBillTrackDto dto){
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
@@ -97,4 +90,8 @@ public class AsBusrepairBillTrackService extends MybatisBaseService<AsBusrepairB
 		BeanUtil.copyProperties(entity, vo);
 		return vo;
 	}
+
+	public List<AsBusrepairBillTrackDetailsVo> selectByBillSid(String billSid) {
+		return baseMapper.selectByBillSid(billSid);
+	}
 }

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

@@ -31,15 +31,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillDto;
 import com.yxt.anrui.as.api.asbusrepairbill.SitemVo;
+import com.yxt.anrui.as.api.asbusrepairbilltrack.AsBusrepairBillTrack;
+import com.yxt.anrui.as.api.asbusrepairbilltrack.AsBusrepairBillTrackDetailsVo;
 import com.yxt.anrui.as.api.asbusreservebill.*;
 import com.yxt.anrui.as.api.asbusreservebillsitem.AsBusreserveBillSitem;
-import com.yxt.anrui.as.api.asbusreservebilltrack.AsBusreserveBillTrack;
 import com.yxt.anrui.as.api.enums.AsBillTypeEnum;
 import com.yxt.anrui.as.api.utils.AsRule;
 import com.yxt.anrui.as.api.utils.domain.AsBillNo;
 import com.yxt.anrui.as.biz.asbusrepairbill.AsBusrepairBillService;
+import com.yxt.anrui.as.biz.asbusrepairbilltrack.AsBusrepairBillTrackService;
 import com.yxt.anrui.as.biz.asbusreservebillsitem.AsBusreserveBillSitemService;
-import com.yxt.anrui.as.biz.asbusreservebilltrack.AsBusreserveBillTrackService;
 import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery;
 import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
@@ -86,7 +87,7 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
-    private AsBusreserveBillTrackService asBusreserveBillTrackService;
+    private AsBusrepairBillTrackService asBusrepairBillTrackService;
 
     private QueryWrapper<AsBusreserveBill> createQueryWrapper(AsBusreserveBillQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -322,15 +323,15 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
                 }
                 vo.setSitemVos(sitemVos);
             }
-            List<AsBusreserveBillTrack> asBusreserveBillTracks = asBusreserveBillTrackService.fetchByMainSid(sid);
-            if (!asBusreserveBillTracks.isEmpty()) {
+            List<AsBusrepairBillTrackDetailsVo> asBusrepairBillTrackDetailsVos = asBusrepairBillTrackService.selectByBillSid(sid);
+            if (!asBusrepairBillTrackDetailsVos.isEmpty()) {
                 List<TrackLogsVo> list = new ArrayList<>();
-                for (AsBusreserveBillTrack asBusreserveBillTrack : asBusreserveBillTracks) {
+                for (AsBusrepairBillTrackDetailsVo asBusrepairBillTrackDetailsVo : asBusrepairBillTrackDetailsVos) {
                     TrackLogsVo logsVo = new TrackLogsVo();
-                    if (StringUtils.isNotBlank(asBusreserveBillTrack.getRemarks())) {
-                        logsVo.setRemarks(asBusreserveBillTrack.getRemarks());
+                    if (StringUtils.isNotBlank(asBusrepairBillTrackDetailsVo.getRemarks())) {
+                        logsVo.setRemarks(asBusrepairBillTrackDetailsVo.getRemarks());
                     }
-                    logsVo.setCreateTime(sdf.format(asBusreserveBillTrack.getCreateTime()));
+                    logsVo.setCreateTime(sdf.format(asBusrepairBillTrackDetailsVo.getCreateTime()));
                     list.add(logsVo);
                 }
                 vo.setTrackLogs(list);
@@ -352,12 +353,12 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
             AsBusreserveBill bill = fetchBySid(dto.getSid());
             if (null != bill) {
                 if (StringUtils.isNotBlank(dto.getTrackLog())) {
-                    AsBusreserveBillTrack billTrack = new AsBusreserveBillTrack();
+                    AsBusrepairBillTrack billTrack = new AsBusrepairBillTrack();
                     billTrack.setRemarks(dto.getTrackLog());
                     billTrack.setBillSid(dto.getSid());
                     billTrack.setCreateBySid(dto.getUserSid());
                     billTrack.setUpdateBySid(dto.getUserSid());
-                    asBusreserveBillTrackService.insert(billTrack);
+                    asBusrepairBillTrackService.insert(billTrack);
                 }
             }
         }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebilltrack/AsBusreserveBillTrackService.java → yxt-as/src/main/java/com/yxt/anrui/as/biz/astrackbill/AsTrackBillMapper.java

@@ -23,44 +23,41 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.anrui.as.biz.asbusreservebilltrack;
+package com.yxt.anrui.as.biz.astrackbill;
 
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.as.api.asbusreservebillsitem.*;
-import com.yxt.anrui.as.api.asbusreservebilltrack.AsBusreserveBillTrack;
-import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.vo.PagerVo;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
+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.astrackbill.AsTrackBill;
+import com.yxt.anrui.as.api.astrackbill.AsTrackBillVo;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
 /**
- * Project: as(as) <br/>
- * File: AsBusreserveBillSitemService.java <br/>
- * Class: as.biz.asbusreservebillsitem.AsBusreserveBillSitemService <br/>
- * Description: 预约单-服务项目 业务逻辑. <br/>
+ * Project: yxt-4sas(工单回访) <br/>
+ * File: AsTrackBillMapper.java <br/>
+ * Class: com.yxt.anrui.as.biz.astrackbill.AsTrackBillMapper <br/>
+ * Description: 回访单. <br/>
  * Copyright: Copyright (c) 2011 <br/>
  * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-04-09 17:01:49 <br/>
+ * Makedate: 2024-06-05 16:31:03 <br/>
  *
  * @author liupopo
  * @version 1.0
  * @since 1.0
  */
-@Service
-public class AsBusreserveBillTrackService extends MybatisBaseService<AsBusreserveBillTrackMapper, AsBusreserveBillTrack> {
+@Mapper
+public interface AsTrackBillMapper extends BaseMapper<AsTrackBill> {
 
-	public List<AsBusreserveBillTrack> fetchByMainSid(String sid) {
-		return baseMapper.fetchByMainSid(sid);
-	}
+	IPage<AsTrackBillVo> selectPageVo(IPage<AsTrackBill> page, @Param(Constants.WRAPPER) Wrapper<AsTrackBill> qw);
 
-	public int delByMainSid(String sid) {
-		return baseMapper.delByMainSid(sid);
-	}
+    String selectNum(String billNo);
 
-}
+    @Update("update as_track_bill set state = '1' where sid = #{sid} and finishDate = NOW()")
+    void complete(String sid);
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/astrackbill/AsTrackBillMapper.xml

@@ -0,0 +1,40 @@
+<?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.astrackbill.AsTrackBillMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.as.api.astrackbill.AsTrackBillVo">
+        SELECT
+        atb.sid,
+        atb.sourceBillNo,
+        abb.subject,
+        abb.customerName,
+        abb.mobile AS customerMobile,
+        abbv.vehMark,
+        atb.billNo,
+        atb.reserveDate,
+        atb.finishDate,
+        IF(atb.reason = 01,'维修回访','销售回访') AS reason,
+        atb.waitorName,
+        atb.createOrgName,
+        IF(atb.state = 0,'未完成','已完成') AS 'state'
+        FROM
+        as_track_bill atb
+        LEFT JOIN as_busrepair_bill abb
+        ON atb.`sourceBillSid` = abb.`sid`
+        LEFT JOIN as_busrepair_bill_vech abbv
+        ON abbv.billSid = abb.sid
+        LEFT JOIN anrui_portal.sys_organization as s ON atb.deptSid = s.sid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectNum" resultType="java.lang.String">
+        select RIGHT (billNo, 4)
+        from as_track_bill
+        where billNo LIKE concat(#{billNo}, '%')
+        order by billNo desc
+                limit 1
+    </select>
+</mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/astrackbill/AsTrackBillRest.java

@@ -0,0 +1,101 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.astrackbill;
+
+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.astrackbill.AsTrackBillQuery;
+import com.yxt.anrui.as.api.astrackbill.AsTrackBillVo;
+import com.yxt.anrui.as.api.astrackbill.AsTrackBillDetailsVo;
+import com.yxt.anrui.as.api.astrackbill.AsTrackBillDto;
+
+/**
+ * Project: yxt-4sas(工单回访) <br/>
+ * File: AsTrackBillFeignFallback.java <br/>
+ * Class: com.yxt.anrui.as.biz.astrackbill.AsTrackBillRest <br/>
+ * Description: 回访单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-06-05 16:31:03 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "回访单")
+@RestController
+@RequestMapping("v1/astrackbill")
+public class AsTrackBillRest {
+
+	@Autowired
+	private AsTrackBillService asTrackBillService;
+
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<AsTrackBillVo>> listPage(@RequestBody PagerQuery<AsTrackBillQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<AsTrackBillVo> pv = asTrackBillService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody AsTrackBillDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		asTrackBillService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@ApiOperation("完成")
+	@PostMapping("/complete")
+	public ResultBean complete(@RequestBody AsTrackBillDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		asTrackBillService.complete(dto);
+		return rb.success();
+	}
+
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		asTrackBillService.delBySids(sids);
+		return rb.success();
+	}
+
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<AsTrackBillDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		AsTrackBillDetailsVo vo = asTrackBillService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/astrackbill/AsTrackBillService.java

@@ -0,0 +1,283 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.astrackbill;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill;
+import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillDetailsVo;
+import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillInitVo;
+import com.yxt.anrui.as.api.asbusrepairbilltrack.AsBusrepairBillTrackDetailsVo;
+import com.yxt.anrui.as.api.astrackbill.*;
+import com.yxt.anrui.as.api.astrackbillquestion.AsTrackBillQuestionDetailsVo;
+import com.yxt.anrui.as.api.astrackbillquestion.AsTrackBillQuestionDto;
+import com.yxt.anrui.as.api.astrackquestion.AsTrackQuestionDetailsVo;
+import com.yxt.anrui.as.biz.asbusrepairbill.AsBusrepairBillService;
+import com.yxt.anrui.as.biz.asbusrepairbilltrack.AsBusrepairBillTrackService;
+import com.yxt.anrui.as.biz.astrackbillquestion.AsTrackBillQuestionService;
+import com.yxt.anrui.as.biz.astrackquestion.AsTrackQuestionService;
+import com.yxt.anrui.as.feign.base.billno.Rule;
+import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign;
+import com.yxt.common.core.result.ResultBean;
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: yxt-4sas(工单回访) <br/>
+ * File: AsTrackBillService.java <br/>
+ * Class: com.yxt.anrui.as.biz.astrackbill.AsTrackBillService <br/>
+ * Description: 回访单 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-06-05 16:31:03 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AsTrackBillService extends MybatisBaseService<AsTrackBillMapper, AsTrackBill> {
+
+    @Autowired
+    private SysUserFeign sysUserFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private AsBusrepairBillService asBusrepairBillService;
+    @Autowired
+    private AsTrackQuestionService asTrackQuestionService;
+    @Autowired
+    private AsBusrepairBillTrackService asBusrepairBillTrackService;
+    @Autowired
+    private AsTrackBillQuestionService asTrackBillQuestionService;
+
+    public PagerVo<AsTrackBillVo> listPageVo(PagerQuery<AsTrackBillQuery> pq) {
+        AsTrackBillQuery query = pq.getParams();
+        QueryWrapper<AsTrackBill> qw = new QueryWrapper<>();
+        //========================================数据授权开始
+        if (StringUtils.isNotBlank(query.getMenuUrl())) {
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuUrl(query.getMenuUrl());
+            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("s.orgSidPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("5".equals(orgLevelKey)) {
+                    qw.eq("atb.createBySid", query.getUserSid());
+                } else {
+                    PagerVo<AsTrackBillVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<AsTrackBillVo> p = new PagerVo<>();
+                return p;
+            }
+        }
+        if (StringUtils.isNotBlank(query.getCreateOrgName())) {
+            qw.like("atb.createOrgName", query.getCreateOrgName());
+        }
+        if (StringUtils.isNotBlank(query.getDeptName())) {
+            qw.like("atb.deptName", query.getDeptName());
+        }
+        if (StringUtils.isNotBlank(query.getSourceBillNo())) {
+            qw.like("atb.sourceBillNo", query.getSourceBillNo());
+        }
+        if (StringUtils.isNotBlank(query.getSubject())) {
+            qw.like("abb.subject", query.getSubject());
+        }
+        if (StringUtils.isNotBlank(query.getCustomerName())) {
+            qw.like("abb.customerName", query.getCustomerName());
+        }
+        if (StringUtils.isNotBlank(query.getCustomerMobile())) {
+            qw.like("abb.mobile", query.getCustomerMobile());
+        }
+        if (StringUtils.isNotBlank(query.getVehMark())) {
+            qw.like("abbv.vehMark", query.getVehMark());
+        }
+        if (StringUtils.isNotBlank(query.getBillNo())) {
+            qw.like("atb.billNo", query.getBillNo());
+        }
+        if (StringUtils.isNotBlank(query.getReason())) {
+            qw.eq("atb.reason", query.getReason());
+        }
+        if (StringUtils.isNotBlank(query.getWaitorName())) {
+            qw.like("atb.waitorName", query.getWaitorName());
+        }
+        if (StringUtils.isNotBlank(query.getState())) {
+            qw.like("atb.state", query.getState());
+        }
+        String settleDateStart = query.getSettleDateStart();
+        String settleDateEnd = query.getSettleDateEnd();
+        qw.apply(StringUtils.isNotEmpty(settleDateStart), "date_format (atb.settleDate,'%Y-%m-%d') >= date_format('" + settleDateStart + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(settleDateEnd), "date_format (atb.settleDate,'%Y-%m-%d') <= date_format('" + settleDateEnd + "','%Y-%m-%d')"
+                );
+        String reserveDateStart = query.getReserveDateStart();
+        String reserveDateEnd = query.getReserveDateEnd();
+        qw.apply(StringUtils.isNotEmpty(reserveDateStart), "date_format (atb.reserveDate,'%Y-%m-%d') >= date_format('" + reserveDateStart + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(reserveDateEnd), "date_format (atb.reserveDate,'%Y-%m-%d') <= date_format('" + reserveDateEnd + "','%Y-%m-%d')"
+                );
+        String finishDateStart = query.getFinishDateStart();
+        String finishDateEnd = query.getFinishDateEnd();
+        qw.apply(StringUtils.isNotEmpty(finishDateStart), "date_format (atb.finishDate,'%Y-%m-%d') >= date_format('" + finishDateStart + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(finishDateEnd), "date_format (atb.finishDate,'%Y-%m-%d') <= date_format('" + finishDateEnd + "','%Y-%m-%d')"
+                );
+        IPage<AsTrackBill> page = PagerUtil.queryToPage(pq);
+        IPage<AsTrackBillVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<AsTrackBillVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void saveOrUpdateDto(AsTrackBillDto dto) {
+        String dtoSid = dto.getSid();
+        List<AsTrackBillQuestionDetailsVo> asTrackBillQuestionDetailsList = dto.getAsTrackBillQuestionDetailsList();
+        if (StringUtils.isBlank(dtoSid)) {
+            String deptSid = dto.getDeptSid();
+            SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
+            String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData();
+            SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+            dto.setUseOrgSid(useOrgSid);
+            dto.setUseOrgName(organizationVo.getName());
+            dto.setCreateOrgSid(useOrgSid);
+            dto.setCreateOrgName(organizationVo.getName());
+            //生成单据编号
+            String billNo = "";
+            String date = DateUtil.format(DateUtil.date(), "yyyyMM");
+            billNo = "GDHF" + organizationVo.getOrgCode() + date;
+            String i = baseMapper.selectNum(billNo);
+            if (StringUtils.isNotBlank(i)) {
+                billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
+            } else {
+                billNo = Rule.getBillNo(billNo, 0);
+            }
+            dto.setBillNo(billNo);
+            String sid = this.insertByDto(dto);
+            List<AsTrackQuestionDetailsVo> asTrackQuestionDetailsVos = asTrackQuestionService.selectAll();
+            for (AsTrackQuestionDetailsVo asTrackQuestionDetailsVo : asTrackQuestionDetailsVos) {
+                AsTrackBillQuestionDto asTrackBillQuestionDto = new AsTrackBillQuestionDto();
+                asTrackBillQuestionDto.setQuestion(asTrackQuestionDetailsVo.getQuestion());
+                asTrackBillQuestionDto.setBillSid(sid);
+                asTrackBillQuestionService.saveOrUpdateDto(asTrackBillQuestionDto);
+            }
+            return;
+        }
+        asTrackBillQuestionService.delByBillSid(dtoSid);
+        for (AsTrackBillQuestionDetailsVo asTrackBillQuestionDetailsVo : asTrackBillQuestionDetailsList) {
+            AsTrackBillQuestionDto asTrackBillQuestionDto = new AsTrackBillQuestionDto();
+            asTrackBillQuestionDto.setQuestion(asTrackBillQuestionDetailsVo.getQuestion());
+            asTrackBillQuestionDto.setBillSid(dtoSid);
+            asTrackBillQuestionDto.setScore(asTrackBillQuestionDetailsVo.getScore());
+            asTrackBillQuestionService.saveOrUpdateDto(asTrackBillQuestionDto);
+        }
+    }
+
+    public void complete(AsTrackBillDto dto) {
+        String dtoSid = dto.getSid();
+        List<AsTrackBillQuestionDetailsVo> asTrackBillQuestionDetailsList = dto.getAsTrackBillQuestionDetailsList();
+        asTrackBillQuestionService.delByBillSid(dtoSid);
+        for (AsTrackBillQuestionDetailsVo asTrackBillQuestionDetailsVo : asTrackBillQuestionDetailsList) {
+            AsTrackBillQuestionDto asTrackBillQuestionDto = new AsTrackBillQuestionDto();
+            asTrackBillQuestionDto.setQuestion(asTrackBillQuestionDetailsVo.getQuestion());
+            asTrackBillQuestionDto.setBillSid(dtoSid);
+            asTrackBillQuestionDto.setScore(asTrackBillQuestionDetailsVo.getScore());
+            asTrackBillQuestionService.saveOrUpdateDto(asTrackBillQuestionDto);
+        }
+        baseMapper.complete(dtoSid);
+    }
+
+    public String insertByDto(AsTrackBillDto dto) {
+        AsTrackBill entity = new AsTrackBill();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+        return entity.getSid();
+    }
+
+    public void updateByDto(AsTrackBillDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        }
+        AsTrackBill entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public AsTrackBillDetailsVo fetchDetailsVoBySid(String sid) {
+        AsTrackBill entity = fetchBySid(sid);
+        AsTrackBillDetailsVo vo = new AsTrackBillDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        //工单信息
+        AsBusrepairBillDetailsVo asBusrepairBillDetailsVo = asBusrepairBillService.fetchDetailsBySid(entity.getSourceBillSid()).getData();
+        AsBusrepairBillInitVo asBusrepairBillInitVo = new AsBusrepairBillInitVo();
+        BeanUtil.copyProperties(asBusrepairBillDetailsVo, asBusrepairBillInitVo);
+        asBusrepairBillInitVo.setTotal(new BigDecimal(asBusrepairBillDetailsVo.getHourAmount()).add(new BigDecimal(asBusrepairBillDetailsVo.getGoodsAmount())).add(new BigDecimal(asBusrepairBillDetailsVo.getAddAmount())).add(new BigDecimal(asBusrepairBillDetailsVo.getTaxAmount())));
+        vo.setAsBusrepairBillInit(asBusrepairBillInitVo);
+        //回访问题
+        List<AsTrackBillQuestionDetailsVo> asTrackBillQuestionDetailsVos = asTrackBillQuestionService.selectByBillSid(entity.getSid());
+        vo.setAsTrackBillQuestionDetailsList(asTrackBillQuestionDetailsVos);
+        //跟踪记录
+        List<AsBusrepairBillTrackDetailsVo> asBusrepairBillTrackDetailsVos = asBusrepairBillTrackService.selectByBillSid(entity.getSid());
+        vo.setAsBusrepairBillTrackDetailsList(asBusrepairBillTrackDetailsVos);
+        return vo;
+    }
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebilltrack/AsBusreserveBillTrackMapper.java → yxt-as/src/main/java/com/yxt/anrui/as/biz/astrackbillquestion/AsTrackBillQuestionMapper.java

@@ -23,41 +23,40 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.anrui.as.biz.asbusreservebilltrack;
+package com.yxt.anrui.as.biz.astrackbillquestion;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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 com.yxt.anrui.as.api.asbusreservebilltrack.AsBusreserveBillTrack;
+import com.yxt.anrui.as.api.astrackbillquestion.AsTrackBillQuestionDetailsVo;
 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 com.yxt.anrui.as.api.astrackbillquestion.AsTrackBillQuestion;
 
 import java.util.List;
 
 /**
- * Project: as(as) <br/>
- * File: AsBusreserveBillSitemMapper.java <br/>
- * Class: as.biz.asbusreservebillsitem.AsBusreserveBillSitemMapper <br/>
- * Description: 预约单-服务项目. <br/>
+ * Project: yxt-4sas(工单回访) <br/>
+ * File: AsTrackBillQuestionMapper.java <br/>
+ * Class: com.yxt.anrui.as.biz.astrackbillquestion.AsTrackBillQuestionMapper <br/>
+ * Description: 回访单-问题表. <br/>
  * Copyright: Copyright (c) 2011 <br/>
  * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-04-09 17:01:49 <br/>
+ * Makedate: 2024-06-05 16:31:03 <br/>
  *
  * @author liupopo
  * @version 1.0
  * @since 1.0
  */
 @Mapper
-public interface AsBusreserveBillTrackMapper extends BaseMapper<AsBusreserveBillTrack> {
+public interface AsTrackBillQuestionMapper extends BaseMapper<AsTrackBillQuestion> {
 
-    @Select("select * from as_busreserve_bill_track where billSid =#{sid}")
-    List<AsBusreserveBillTrack> fetchByMainSid(@Param("sid") String sid);
+    @Select("select * from as_track_bill_question where billSid = #{billSid}")
+    List<AsTrackBillQuestionDetailsVo> selectByBillSid(String billSid);
 
-    @Delete("delete from as_busreserve_bill_track where billSid = #{sid}")
-    int delByMainSid(@Param("sid") String sid);
-}
+    @Delete("delete from as_track_bill_question where billSid = #{dtoSid}")
+    void delByBillSid(String dtoSid);
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/astrackbillquestion/AsTrackBillQuestionMapper.xml

@@ -0,0 +1,6 @@
+<?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.astrackbillquestion.AsTrackBillQuestionMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+</mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/astrackbillquestion/AsTrackBillQuestionRest.java

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.astrackbillquestion;
+
+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.astrackbillquestion.AsTrackBillQuestionDetailsVo;
+import com.yxt.anrui.as.api.astrackbillquestion.AsTrackBillQuestionDto;
+
+/**
+ * Project: yxt-4sas(工单回访) <br/>
+ * File: AsTrackBillQuestionFeignFallback.java <br/>
+ * Class: com.yxt.anrui.as.biz.astrackbillquestion.AsTrackBillQuestionRest <br/>
+ * Description: 回访单-问题表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-06-05 16:31:03 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "回访单-问题表")
+@RestController
+@RequestMapping("v1/astrackbillquestion")
+public class AsTrackBillQuestionRest {
+
+	@Autowired
+	private AsTrackBillQuestionService asTrackBillQuestionService;
+
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody AsTrackBillQuestionDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		asTrackBillQuestionService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<AsTrackBillQuestionDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		AsTrackBillQuestionDetailsVo vo = asTrackBillQuestionService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/astrackbillquestion/AsTrackBillQuestionService.java

@@ -0,0 +1,95 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.astrackbillquestion;
+
+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.astrackbillquestion.AsTrackBillQuestion;
+import com.yxt.anrui.as.api.astrackbillquestion.AsTrackBillQuestionDetailsVo;
+import com.yxt.anrui.as.api.astrackbillquestion.AsTrackBillQuestionDto;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: yxt-4sas(工单回访) <br/>
+ * File: AsTrackBillQuestionService.java <br/>
+ * Class: com.yxt.anrui.as.biz.astrackbillquestion.AsTrackBillQuestionService <br/>
+ * Description: 回访单-问题表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-06-05 16:31:03 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AsTrackBillQuestionService extends MybatisBaseService<AsTrackBillQuestionMapper, AsTrackBillQuestion> {
+
+    public void saveOrUpdateDto(AsTrackBillQuestionDto dto) {
+        this.insertByDto(dto);
+        return;
+    }
+
+    public void insertByDto(AsTrackBillQuestionDto dto) {
+        AsTrackBillQuestion entity = new AsTrackBillQuestion();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void updateByDto(AsTrackBillQuestionDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        }
+        AsTrackBillQuestion entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public AsTrackBillQuestionDetailsVo fetchDetailsVoBySid(String sid) {
+        AsTrackBillQuestion entity = fetchBySid(sid);
+        AsTrackBillQuestionDetailsVo vo = new AsTrackBillQuestionDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    public List<AsTrackBillQuestionDetailsVo> selectByBillSid(String billSid) {
+        return baseMapper.selectByBillSid(billSid);
+    }
+
+    public void delByBillSid(String dtoSid) {
+        baseMapper.delByBillSid(dtoSid);
+    }
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/astrackquestion/AsTrackQuestionMapper.java

@@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.astrackquestion;
+
+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.astrackquestion.AsTrackQuestionDetailsVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.as.api.astrackquestion.AsTrackQuestion;
+
+import java.util.List;
+
+/**
+ * Project: yxt-4sas(工单回访) <br/>
+ * File: AsTrackQuestionMapper.java <br/>
+ * Class: com.yxt.anrui.as.biz.astrackquestion.AsTrackQuestionMapper <br/>
+ * Description: 回访单问题设置表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-06-05 16:31:03 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface AsTrackQuestionMapper extends BaseMapper<AsTrackQuestion> {
+
+    @Select("select * from as_track_question")
+    List<AsTrackQuestionDetailsVo> selectAll();
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/astrackquestion/AsTrackQuestionMapper.xml

@@ -0,0 +1,6 @@
+<?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.astrackquestion.AsTrackQuestionMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+</mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebilltrack/AsBusreserveBillTrackRest.java → yxt-as/src/main/java/com/yxt/anrui/as/biz/astrackquestion/AsTrackQuestionRest.java

@@ -23,12 +23,8 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.anrui.as.biz.asbusreservebilltrack;
+package com.yxt.anrui.as.biz.astrackquestion;
 
-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;
@@ -37,22 +33,43 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import com.yxt.anrui.as.api.astrackquestion.AsTrackQuestionDetailsVo;
+import com.yxt.anrui.as.api.astrackquestion.AsTrackQuestionDto;
+
 /**
- * Project: as(as) <br/>
- * File: AsBusreserveBillSitemFeignFallback.java <br/>
- * Class: as.biz.asbusreservebillsitem.AsBusreserveBillSitemRest <br/>
- * Description: 预约单-服务项目. <br/>
+ * Project: yxt-4sas(工单回访) <br/>
+ * File: AsTrackQuestionFeignFallback.java <br/>
+ * Class: com.yxt.anrui.as.biz.astrackquestion.AsTrackQuestionRest <br/>
+ * Description: 回访单问题设置表. <br/>
  * Copyright: Copyright (c) 2011 <br/>
  * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-04-09 17:01:49 <br/>
+ * Makedate: 2024-06-05 16:31:03 <br/>
  *
  * @author liupopo
  * @version 1.0
  * @since 1.0
  */
-@Api(tags = "预约单-跟踪记录")
+@Api(tags = "回访单问题设置表")
 @RestController
-@RequestMapping("v1/AsBusreserveBillTrack")
-public class AsBusreserveBillTrackRest {
+@RequestMapping("v1/astrackquestion")
+public class AsTrackQuestionRest {
+
+	@Autowired
+	private AsTrackQuestionService asTrackQuestionService;
+
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody AsTrackQuestionDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		asTrackQuestionService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
 
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<AsTrackQuestionDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		AsTrackQuestionDetailsVo vo = asTrackQuestionService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/astrackquestion/AsTrackQuestionService.java

@@ -0,0 +1,95 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.astrackquestion;
+
+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.astrackquestion.AsTrackQuestion;
+import com.yxt.anrui.as.api.astrackquestion.AsTrackQuestionDetailsVo;
+import com.yxt.anrui.as.api.astrackquestion.AsTrackQuestionDto;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: yxt-4sas(工单回访) <br/>
+ * File: AsTrackQuestionService.java <br/>
+ * Class: com.yxt.anrui.as.biz.astrackquestion.AsTrackQuestionService <br/>
+ * Description: 回访单问题设置表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-06-05 16:31:03 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AsTrackQuestionService extends MybatisBaseService<AsTrackQuestionMapper, AsTrackQuestion> {
+
+	public void saveOrUpdateDto(AsTrackQuestionDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(AsTrackQuestionDto dto){
+		AsTrackQuestion entity = new AsTrackQuestion();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(AsTrackQuestionDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		AsTrackQuestion entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public AsTrackQuestionDetailsVo fetchDetailsVoBySid(String sid){
+		AsTrackQuestion entity = fetchBySid(sid);
+		AsTrackQuestionDetailsVo vo = new AsTrackQuestionDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+
+	public List<AsTrackQuestionDetailsVo> selectAll() {
+		return baseMapper.selectAll();
+	}
+}