修改财务凭证部门取值

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontract.java

@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * Project: anrui-buscenter(销售订单) <br/>
  * File: BusSalesOrderLoancontract.java <br/>
@@ -74,5 +76,7 @@ public class BusSalesOrderLoancontract extends BaseEntity {
     private String busState; // 业务状态码
     @ApiModelProperty("是否生成还款计划表（0否，1是）")
     private String repaymentState; // 是否生成还款计划表（0否，1是）
+    @ApiModelProperty("还款计划表生成时间")
+    private Date repaymentCreateTime; // 还款计划表生成时间
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java

@@ -34,6 +34,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -99,7 +100,7 @@ public interface BusSalesOrderLoancontractFeign {
 
     @ApiOperation("设置是否生成还款计划状态")
     @PostMapping("/setRepaymentState")
-    public ResultBean setRepaymentState(@RequestParam("sid") String sid);
+    public ResultBean setRepaymentState(@RequestParam("sid") String sid, @RequestParam("createTime")Date createTime);
 
     @ApiOperation("推送融资放款的应收")
     @PostMapping("/pushLoanOrder")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java

@@ -31,6 +31,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -92,7 +93,7 @@ public class BusSalesOrderLoancontractFeignFallback implements BusSalesOrderLoan
 	}
 
 	@Override
-	public ResultBean setRepaymentState(String sid) {
+	public ResultBean setRepaymentState(String sid, Date createTime) {
 		return null;
 	}
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java

@@ -92,6 +92,6 @@ public interface BusSalesOrderLoancontractMapper extends BaseMapper<BusSalesOrde
     @Delete("delete from bus_sales_order_loancontract where salesOrderSid = #{saleOrderSid} and borrowerSid = #{borrowerSid}")
     void delByOrderSidAndDkrSid(@Param("saleOrderSid") String saleOrderSid, @Param("borrowerSid") String borrowerSid);
 
-    @Update("update bus_sales_order_loancontract set repaymentState = 1 where sid=#{sid}")
+    @Update("update bus_sales_order_loancontract set repaymentState = 1,repaymentCreateTime =#{createTime} where sid=#{sid}")
-    int setRepaymentState(String sid);
+    int setRepaymentState(@Param("sid") String sid,@Param("createTime") String createTime);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java

@@ -35,6 +35,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -121,9 +122,9 @@ public class BusSalesOrderLoancontractRest implements BusSalesOrderLoancontractF
     }
 
     @Override
-    public ResultBean setRepaymentState(String sid) {
+    public ResultBean setRepaymentState(String sid, Date createTime) {
         ResultBean rb = ResultBean.fireFail();
-        int i = busSalesOrderLoancontractService.setRepaymentState(sid);
+        int i = busSalesOrderLoancontractService.setRepaymentState(sid, createTime);
         return rb.success();
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java

@@ -84,6 +84,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
@@ -1094,7 +1095,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
 
     }
 
-    public int setRepaymentState(String sid) {
+    public int setRepaymentState(String sid,Date createTime) {
-        return baseMapper.setRepaymentState(sid);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return baseMapper.setRepaymentState(sid,sdf.format(createTime));
     }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -104,6 +104,8 @@ import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoFo
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsFeign;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsForOverDue;
+import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule;
+import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleFeign;
 import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApply;
 import com.yxt.anrui.riskcenter.api.loansettlebankcost.LoanSettleBankCost;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
@@ -211,7 +213,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     private LoanPushFundHistoryFeign loanPushFundHistoryFeign;
     @Autowired
     private DocPdfComponent docPdfComponent;
-
+    @Autowired
+    private LoanRepaymentScheduleFeign loanRepaymentScheduleFeign;
     private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -4203,10 +4206,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsFeign.fetchDetails(planSid).getData();
         if (null != planDetails) {
             voucherDetail.setPayCostTitleValue(v.getReceivablesName());
-            String deptSid = planDetails.getDeptSid();
+            LoanRepaymentSchedule schedule = loanRepaymentScheduleFeign.fetchBySid(planDetails.getScheduleSid()).getData();
-            SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
+            if (null != schedule) {
-            if (null != organizationDeptVo) {
+                if (StringUtils.isNotBlank(schedule.getCwDeptNo())) {
-                voucherDetail.setDeptCode(organizationDeptVo.getOrgCode());
+                    voucherDetail.setDeptCode(schedule.getCwDeptNo());
+                }
             }
             String busVinSid = planDetails.getBusVinSid();
             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData();
@@ -4284,10 +4288,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         if (null != planDetails) {
             voucherDetail.setPayCostTitleValue(v.getReceivablesName());
-            String deptSid = planDetails.getDeptSid();
+            LoanRepaymentSchedule schedule = loanRepaymentScheduleFeign.fetchBySid(planDetails.getScheduleSid()).getData();
-            SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
+            if (null != schedule) {
-            if (null != organizationDeptVo) {
+                if (StringUtils.isNotBlank(schedule.getCwDeptNo())) {
-                voucherDetail.setDeptCode(organizationDeptVo.getOrgCode());
+                    voucherDetail.setDeptCode(schedule.getCwDeptNo());
+                }
             }
             String busVinSid = planDetails.getBusVinSid();
             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData();
@@ -4381,14 +4386,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
                 if (null != busSalesOrderVehicle) {
                     BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData();
-                    String deptSid = salesOrder.getOrgSid();
                     GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
                     voucherDetail.setSceneCode("借方");
                     voucherDetail.setTimeFlag("1");
                     voucherDetail.setDataTime(new DateTime());
-                    SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
+                    LoanRepaymentSchedule schedule = loanRepaymentScheduleFeign.fetchBySid(planDetails.getScheduleSid()).getData();
-                    if (null != organizationDeptVo) {
+                    if (null != schedule) {
-                        voucherDetail.setDeptCode(organizationDeptVo.getOrgCode());
+                        if (StringUtils.isNotBlank(schedule.getCwDeptNo())) {
+                            voucherDetail.setDeptCode(schedule.getCwDeptNo());
+                        }
                     }
                     if (null != salesOrder) {
                         if (null != busSalesOrderVehicle) {
@@ -4454,10 +4460,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsFeign.fetchDetails(planSid).getData();
         if (null != planDetails) {
             voucherDetail.setPayCostTitleValue(v.getReceivablesName());
-            String deptSid = planDetails.getDeptSid();
+            LoanRepaymentSchedule schedule = loanRepaymentScheduleFeign.fetchBySid(planDetails.getScheduleSid()).getData();
-            SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
+            if (null != schedule) {
-            if (null != organizationDeptVo) {
+                if (StringUtils.isNotBlank(schedule.getCwDeptNo())) {
-                voucherDetail.setDeptCode(organizationDeptVo.getOrgCode());
+                    voucherDetail.setDeptCode(schedule.getCwDeptNo());
+                }
             }
             String busVinSid = planDetails.getBusVinSid();
             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData();
@@ -4881,10 +4888,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     if (null != organizationVo) {
                         collectionVoucher.setUseOrgCode(organizationVo.getOrgCode());
                     }
-                    String deptSid = planDetails.getDeptSid();
+                    LoanRepaymentSchedule schedule = loanRepaymentScheduleFeign.fetchBySid(planDetails.getScheduleSid()).getData();
-                    SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
+                    if (null != schedule) {
-                    if (null != organizationDeptVo) {
+                        if (StringUtils.isNotBlank(schedule.getCwDeptNo())) {
-                        voucherDetail.setDeptCode(organizationDeptVo.getOrgCode());
+                            voucherDetail.setDeptCode(schedule.getCwDeptNo());
+                        }
                     }
                     String busVinSid = planDetails.getBusVinSid();
                     BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData();
@@ -4986,10 +4994,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 if (null != organizationVo) {
                     collectionVoucher.setUseOrgCode(organizationVo.getOrgCode());
                 }
-                String deptSid = planDetails.getDeptSid();
+                LoanRepaymentSchedule schedule = loanRepaymentScheduleFeign.fetchBySid(planDetails.getScheduleSid()).getData();
-                SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
+                if (null != schedule) {
-                if (null != organizationDeptVo) {
+                    if (StringUtils.isNotBlank(schedule.getCwDeptNo())) {
-                    voucherDetail.setDeptCode(organizationDeptVo.getOrgCode());
+                        voucherDetail.setDeptCode(schedule.getCwDeptNo());
+                    }
                 }
                 String busVinSid = planDetails.getBusVinSid();
                 BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData();
@@ -5094,10 +5103,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 if (null != organizationVo) {
                     collectionVoucher.setUseOrgCode(organizationVo.getOrgCode());
                 }
-                String deptSid = planDetails.getDeptSid();
+                LoanRepaymentSchedule schedule = loanRepaymentScheduleFeign.fetchBySid(planDetails.getScheduleSid()).getData();
-                SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
+                if (null != schedule) {
-                if (null != organizationDeptVo) {
+                    if (StringUtils.isNotBlank(schedule.getCwDeptNo())) {
-                    voucherDetail.setDeptCode(organizationDeptVo.getOrgCode());
+                        voucherDetail.setDeptCode(schedule.getCwDeptNo());
+                    }
                 }
                 String busVinSid = planDetails.getBusVinSid();
                 BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData();

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

@@ -17,4 +17,5 @@ public class LoanPlanDetailsVoForLateVoucher {
     private String busVinSid;
     private String salesOrderSid;
     private String loanContractNo;
+    private String scheduleSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentSchedule.java

@@ -72,6 +72,8 @@ public class LoanRepaymentSchedule extends BaseEntity {
     private String bankContractNo;
     @ApiModelProperty("其他融资方合同号")
     private String otherBankNo;
+    @ApiModelProperty("推送财务凭证部门编码")
+    private String cwDeptNo;
 
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java

@@ -33,6 +33,12 @@ public interface LoanRepaymentScheduleFeign {
     @ResponseBody
     public ResultBean<LoanCreateSchedulePdfVo> loanCreateSchedule(@RequestParam("salesOrderSid") String salesOrderSid);
 
+    @ApiOperation("根据sid查询实体")
+    @GetMapping("/fetchBySid")
+    @ResponseBody
+    public ResultBean<LoanRepaymentSchedule> fetchBySid(@RequestParam("sid") String sid);
+
+
     @ApiOperation("生成还款计划表")
     @PostMapping("/loanCreateSchedulePdf")
     @ResponseBody

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java

@@ -21,6 +21,11 @@ public class LoanRepaymentScheduleFeignFallback implements LoanRepaymentSchedule
         return null;
     }
 
+    @Override
+    public ResultBean<LoanRepaymentSchedule> fetchBySid(String sid) {
+        return null;
+    }
+
     @Override
     public ResultBean<String> loanCreateSchedulePdf(LoanCreateSchedulePdfVo dto) {
         return null;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java

@@ -81,6 +81,7 @@ import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoForFundVoucher;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanMoneyVo;
+import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule;
 import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleDetailsVo;
 import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.LoanTransferPaymentApply;
 import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.LoanTransferPaymentRecordVo;
@@ -1161,8 +1162,13 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
                 LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.selOneByBankNoAndBusVinSid(v.getBankContractNo(), v.getSaleVehSid());
                 if (null != planDetails) {
                     String bankName = loanRepaymentPlanDetailsService.getBankNameByMainOrOtherPolicy(planDetails);
-                    String deptSid = planDetails.getDeptSid();
+                    String orgCode = "";
-                    SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
+                    LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(planDetails.getScheduleSid());
+                    if (null != schedule) {
+                        if (StringUtils.isNotBlank(schedule.getCwDeptNo())) {
+                            orgCode = schedule.getCwDeptNo();
+                        }
+                    }
                     BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
                     BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(planDetails.getSalesOrderSid()).getData();
                     String customerNumber = "";
@@ -1213,9 +1219,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
                             if (StringUtils.isNotBlank(bankName)) {
                                 voucherDetail.setBankName(bankName);
                             }
-                            if (null != organizationDeptVo) {
+                            voucherDetail.setDeptCode(orgCode);
-                                voucherDetail.setDeptCode(organizationDeptVo.getOrgCode());
-                            }
                             if (StringUtils.isNotBlank(customerNumber)) {
                                 voucherDetail.setCustomerCode(customerNumber);
                             }
@@ -1232,9 +1236,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
                             if (StringUtils.isNotBlank(bankName)) {
                                 voucherDetail.setBankName(bankName);
                             }
-                            if (null != organizationDeptVo) {
+                            voucherDetail.setDeptCode(orgCode);
-                                voucherDetail.setDeptCode(organizationDeptVo.getOrgCode());
-                            }
                             if (StringUtils.isNotBlank(customerNumber)) {
                                 voucherDetail.setCustomerCode(customerNumber);
                             }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java

@@ -50,11 +50,13 @@ import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
 import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistoryRecordVo;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoForLateVoucher;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
+import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule;
 import com.yxt.anrui.riskcenter.biz.loanbuckleapplyrecord.LoanBuckleApplyRecordService;
 import com.yxt.anrui.riskcenter.biz.loanbuckleplanhistory.LoanBucklePlanHistoryService;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
+import com.yxt.anrui.riskcenter.biz.loanrepaymentschedule.LoanRepaymentScheduleService;
 import com.yxt.common.base.config.component.DocPdfComponent;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -135,6 +137,8 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
     private BasePurchaseSystemFeign basePurchaseSystemFeign;
     @Autowired
     private LoanBucklePlanHistoryService loanBucklePlanHistoryService;
+    @Autowired
+    private LoanRepaymentScheduleService loanRepaymentScheduleService;
 
     public PagerVo<LoanBuckleApplyVo> listPage(PagerQuery<LoanBuckleApplyQuery> pq) {
         IPage<LoanBuckleApply> page = PagerUtil.queryToPage(pq);
@@ -700,11 +704,12 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
                                 generalVoucher.setUseOrgCode(organizationVo.getOrgCode());
                             }
                         }
-                        if (StringUtils.isNotBlank(planDetails.getDeptSid())) {
+                        if (StringUtils.isNotBlank(planDetails.getScheduleSid())) {
-                            String deptSid = planDetails.getDeptSid();
+                            LoanRepaymentSchedule repaymentSchedule = loanRepaymentScheduleService.fetchBySid(planDetails.getScheduleSid());
-                            SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
+                            if (null != repaymentSchedule) {
-                            if (null != organizationDeptVo) {
+                                if (StringUtils.isNotBlank(repaymentSchedule.getCwDeptNo())) {
-                                voucherDetail.setDeptCode(organizationDeptVo.getOrgCode());
+                                    voucherDetail.setDeptCode(repaymentSchedule.getCwDeptNo());
+                                }
                             }
                         }
                         BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
@@ -799,10 +804,11 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
                     if (null != organizationVo) {
                         generalVoucher.setUseOrgCode(organizationVo.getOrgCode());
                     }
-                    String deptSid = planDetails.getDeptSid();
+                    LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(planDetails.getScheduleSid());
-                    SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
+                    if (null != schedule) {
-                    if (null != organizationDeptVo) {
+                        if (StringUtils.isNotBlank(schedule.getCwDeptNo())) {
-                        voucherDetail.setDeptCode(organizationDeptVo.getOrgCode());
+                            voucherDetail.setDeptCode(schedule.getCwDeptNo());
+                        }
                     }
                     BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
                     BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(planDetails.getSalesOrderSid()).getData();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java

@@ -44,10 +44,12 @@ import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.*;
 import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.flow.*;
 import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualrecord.LoanMonthlyAccrualRecord;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
+import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
 import com.yxt.anrui.riskcenter.biz.loanmonthlyaccrualrecord.LoanMonthlyAccrualRecordService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
+import com.yxt.anrui.riskcenter.biz.loanrepaymentschedule.LoanRepaymentScheduleService;
 import com.yxt.common.base.config.component.DocPdfComponent;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -123,7 +125,8 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService<LoanMonth
     private BasePurchaseSystemFeign basePurchaseSystemFeign;
     @Autowired
     private MessageListFeign messageListFeign;
-
+    @Autowired
+    private LoanRepaymentScheduleService loanRepaymentScheduleService;
     public ResultBean<LoanMonthlyAccrualApplyInit> accrualInit(String orgPath) {
         ResultBean<LoanMonthlyAccrualApplyInit> rb = ResultBean.fireFail();
         String orgSidPath = orgPath;
@@ -701,11 +704,13 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService<LoanMonth
                     if (null != organizationVo) {
                         generalVoucher.setUseOrgCode(organizationVo.getOrgCode());
                     }
-                    String deptSid = planDetails.getDeptSid();
                     GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
-                    SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
+                    String scheduleSid = planDetails.getScheduleSid();
-                    if (null != organizationDeptVo) {
+                    LoanRepaymentSchedule repaymentSchedule = loanRepaymentScheduleService.fetchBySid(scheduleSid);
-                        voucherDetail.setDeptCode(organizationDeptVo.getOrgCode());
+                    if (null != repaymentSchedule) {
+                        if (StringUtils.isNotBlank(repaymentSchedule.getCwDeptNo())) {
+                            voucherDetail.setDeptCode(repaymentSchedule.getCwDeptNo());
+                        }
                     }
                     BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
                     BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(planDetails.getSalesOrderSid()).getData();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java

@@ -49,8 +49,10 @@ import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.CheckPayStateVo;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoForLateVoucher;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsDto;
+import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule;
 import com.yxt.anrui.riskcenter.api.loantransferpaymentrecord.LoanTransferPaymentRecord;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
+import com.yxt.anrui.riskcenter.biz.loanrepaymentschedule.LoanRepaymentScheduleService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -116,7 +118,8 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
     private BasePurchaseSystemFeign basePurchaseSystemFeign;
     @Autowired
     private BusSalesOrderFeign busSalesOrderFeign;
-
+    @Autowired
+    private LoanRepaymentScheduleService loanRepaymentScheduleService;
     public ResultBean<String> saveHistory(LoanRepaymentHistoryDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         LoanRepaymentHistory entity = new LoanRepaymentHistory();
@@ -855,11 +858,12 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                             generalVoucher.setUseOrgCode(organizationVo.getOrgCode());
                         }
                     }
-                    if (StringUtils.isNotBlank(planDetails.getDeptSid())) {
+                    if (StringUtils.isNotBlank(planDetails.getScheduleSid())) {
-                        String deptSid = planDetails.getDeptSid();
+                        LoanRepaymentSchedule repaymentSchedule = loanRepaymentScheduleService.fetchBySid(planDetails.getScheduleSid());
-                        SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
+                        if (null != repaymentSchedule) {
-                        if (null != organizationDeptVo) {
+                            if (StringUtils.isNotBlank(repaymentSchedule.getCwDeptNo())) {
-                            voucherDetail.setDeptCode(organizationDeptVo.getOrgCode());
+                                voucherDetail.setDeptCode(repaymentSchedule.getCwDeptNo());
+                            }
                         }
                     }
                     BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();

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

@@ -79,4 +79,6 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper<LoanRepayment
     List<LoanPlanDetailsVoForLateVoucher> selPushLaterVoucherOnBuckle(@Param("planSids") List<String> planSids);
 
     LoanRepaymentPlanDetails fetchMainBankByBusVinSid(@Param("busVinSid") String busVinSid);
+
+    String fetchCwDeptCodeByBusVinSid(@Param("busVinSid") String busVinSid);
 }

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

@@ -267,7 +267,8 @@
                b.useOrgSid,
                b.deptSid,
                b.busVinSid,
-               b.salesOrderSid
+               b.salesOrderSid,
+               b.scheduleSid
         FROM (
                  SELECT a.*,
                         IFNULL((SELECT (fjj.reveivableMoney - fjj.m)
@@ -281,7 +282,8 @@
                                             WHERE j.payCostTitleKey = '006') as fj) as fjj
                                 WHERE fjj.busSid = a.sid), 0) as fund
                  FROM (
-                          SELECT pd.loanContractNo,
+                          SELECT pd.scheduleSid,
+                                 pd.loanContractNo,
                                  pd.oweState,
                                  pd.dueDate,
                                  pd.useOrgSid,
@@ -692,6 +694,7 @@
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoForLateVoucher">
         SELECT b.loanContractNo,
         b.sid   AS planSid,
+        b.scheduleSid,
         CASE
         WHEN (b.outstandingMoney + b.bankBeInter + b.fund) >
         0 THEN
@@ -719,6 +722,7 @@
         FROM (
         SELECT pd.loanContractNo,
         pd.oweState,
+        pd.scheduleSid,
         pd.dueDate,
         pd.useOrgSid,
         pd.deptSid,
@@ -774,4 +778,20 @@
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails">
         select * from loan_repayment_plan_details where busVinSid =#{busVinSid} and policyOrOther = '0' limit 1
     </select>
+    <select id="fetchCwDeptCodeByBusVinSid" resultType="java.lang.String">
+        SELECT
+            s.cwDeptNo
+        FROM
+            loan_repayment_schedule AS s
+        WHERE
+                s.sid = (
+                SELECT
+                    p.scheduleSid
+                FROM
+                    loan_repayment_plan_details AS p
+                WHERE
+                    p.busVinSid = #{busVinSid}
+            LIMIT 1
+            )
+    </select>
 </mapper>

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

@@ -29,6 +29,7 @@ import com.yxt.anrui.riskcenter.biz.loanrepaymentschedule.LoanRepaymentScheduleS
 
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.result.ResultBean;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -234,14 +235,15 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
                 BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
                 if (null != busSalesOrderVehicle) {
                     BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData();
-                    String deptSid = salesOrder.getOrgSid();
                     GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
                     voucherDetail.setSceneCode("借方");
                     voucherDetail.setTimeFlag("1");
                     voucherDetail.setDataTime(new DateTime());
-                    SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
+                    LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(planDetails.getScheduleSid());
-                    if (null != organizationDeptVo) {
+                    if (null != schedule) {
-                        voucherDetail.setDeptCode(organizationDeptVo.getOrgCode());
+                        if (StringUtils.isNotBlank(schedule.getCwDeptNo())) {
+                            voucherDetail.setDeptCode(schedule.getCwDeptNo());
+                        }
                     }
                     if (null != salesOrder) {
                         if (null != busSalesOrderVehicle) {
@@ -317,4 +319,8 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
     public LoanRepaymentPlanDetails fetchMainBankByBusVinSid(String busVinSid) {
         return baseMapper.fetchMainBankByBusVinSid(busVinSid);
     }
+
+    public String fetchCwDeptCodeByBusVinSid(String busVinSid) {
+        return baseMapper.fetchCwDeptCodeByBusVinSid(busVinSid);
+    }
 }

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

@@ -25,8 +25,10 @@ import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.utils.CollectorsUtil;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoForFundVoucher;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoForLateVoucher;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
+import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule;
 import com.yxt.anrui.riskcenter.biz.loanfundday.LoanFundDayService;
 import com.yxt.anrui.riskcenter.biz.loanpushfundhistory.LoanPushFundHistoryService;
+import com.yxt.anrui.riskcenter.biz.loanrepaymentschedule.LoanRepaymentScheduleService;
 import com.yxt.common.core.result.ResultBean;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -65,7 +67,8 @@ public class ScheduledRepaymentPlanDetailsService {
     private BasePurchaseSystemFeign basePurchaseSystemFeign;
     @Autowired
     private LoanPushFundHistoryService loanPushFundHistoryService;
-
+    @Autowired
+    private LoanRepaymentScheduleService loanRepaymentScheduleService;
 
     /**
      * 次月1日23点推送上月尚未转累欠的记录
@@ -92,11 +95,12 @@ public class ScheduledRepaymentPlanDetailsService {
                                     generalVoucher.setUseOrgCode(organizationVo.getOrgCode());
                                 }
                             }
-                            if (StringUtils.isNotBlank(planDetails.getDeptSid())) {
+                            if (StringUtils.isNotBlank(planDetails.getScheduleSid())) {
-                                String deptSid = planDetails.getDeptSid();
+                                LoanRepaymentSchedule repaymentSchedule = loanRepaymentScheduleService.fetchBySid(planDetails.getScheduleSid());
-                                SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
+                                if (null != repaymentSchedule) {
-                                if (null != organizationDeptVo) {
+                                    if (StringUtils.isNotBlank(repaymentSchedule.getCwDeptNo())) {
-                                    voucherDetail.setDeptCode(organizationDeptVo.getOrgCode());
+                                        voucherDetail.setDeptCode(repaymentSchedule.getCwDeptNo());
+                                    }
                                 }
                             }
                             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
@@ -206,9 +210,9 @@ public class ScheduledRepaymentPlanDetailsService {
                             voucherDetail.setSceneCode("借方");
                             voucherDetail.setTimeFlag("0");
                             voucherDetail.setDataTime(new DateTime());
-                            SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
+                           String cwDeptCode = loanRepaymentPlanDetailsService.fetchCwDeptCodeByBusVinSid(v.getBusVinSid());
-                            if (null != organizationDeptVo) {
+                            if (StringUtils.isNotBlank(cwDeptCode)) {
-                                voucherDetail.setDeptCode(organizationDeptVo.getOrgCode());
+                                voucherDetail.setDeptCode(cwDeptCode);
                             }
                             if (null != salesOrder) {
                                 if (null != busSalesOrderVehicle) {

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

@@ -32,6 +32,13 @@ public class LoanRepaymentScheduleRest implements LoanRepaymentScheduleFeign {
         return loanRepaymentScheduleService.loanCreateSchedule(salesOrderSid);
     }
 
+    @Override
+    public ResultBean<LoanRepaymentSchedule> fetchBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanRepaymentSchedule repaymentSchedule = loanRepaymentScheduleService.fetchBySid(sid);
+        return rb.success().setData(repaymentSchedule);
+    }
+
     @Override
     public ResultBean<String> loanCreateSchedulePdf(LoanCreateSchedulePdfVo dto) {
         return loanRepaymentScheduleService.loanCreateSchedulePdf(dto);

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

@@ -1,6 +1,7 @@
 package com.yxt.anrui.riskcenter.biz.loanrepaymentschedule;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -736,6 +737,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 if (StringUtils.isNotBlank(busSalesOrder.getStaffName())) {
                     entity.setStaffName(busSalesOrder.getStaffName());
                 }
+                //保存财务凭证部门编码
+                String deptSid = busSalesOrder.getOrgSid();
+                SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
+                if (null != organizationDeptVo) {
+                    entity.setCwDeptNo(organizationDeptVo.getOrgCode());
+                }
             }
             List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.selbyContractSid(dto.getSalesOrderSid()).getData();
             busSalesOrderVehicles.removeAll(Collections.singleton(null));
@@ -1226,7 +1233,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 });
                 //设置消贷合同是否生成还款计划状态
                 Future future3 = pool.submit(() -> {
-                    busSalesOrderLoancontractFeign.setRepaymentState(dto.getSalesOrderSid());
+                    busSalesOrderLoancontractFeign.setRepaymentState(dto.getSalesOrderSid(),new DateTime());
                 });
             } catch (Exception e) {
                 e.printStackTrace();
@@ -1334,14 +1341,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                         if (null != organizationVo) {
                             generalVoucher.setUseOrgCode(organizationVo.getOrgCode());
                         }
-                        String deptSid = salesOrder.getOrgSid();
                         GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
                         if (StringUtils.isNotBlank(bankName)) {
                             voucherDetail.setBankName(bankName);
                         }
-                        SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
+                        if (StringUtils.isNotBlank(schedule.getCwDeptNo())) {
-                        if (null != organizationDeptVo) {
+                            voucherDetail.setDeptCode(schedule.getCwDeptNo());
-                            voucherDetail.setDeptCode(organizationDeptVo.getOrgCode());
                         }
                         //   String busVinSid = vehicle.getSid();
                         // BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData();
@@ -1398,7 +1403,6 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                 if (null != organizationVo) {
                                     generalVoucher.setUseOrgCode(organizationVo.getOrgCode());
                                 }
-                                String deptSid = salesOrder.getOrgSid();
                                 GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
                                 if (i == 0) {
                                     if (StringUtils.isNotBlank(bankName)) {
@@ -1409,9 +1413,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                         voucherDetail.setBankName(otherBankName);
                                     }
                                 }
-                                SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
+                                if (StringUtils.isNotBlank(schedule.getCwDeptNo())) {
-                                if (null != organizationDeptVo) {
+                                    voucherDetail.setDeptCode(schedule.getCwDeptNo());
-                                    voucherDetail.setDeptCode(organizationDeptVo.getOrgCode());
                                 }
                                 //   String busVinSid = vehicle.getSid();
                                 // BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData();
@@ -1471,14 +1474,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                             if (null != organizationVo) {
                                 generalVoucher.setUseOrgCode(organizationVo.getOrgCode());
                             }
-                            String deptSid = salesOrder.getOrgSid();
                             GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
                             if (StringUtils.isNotBlank(bankName)) {
                                 voucherDetail.setBankName(bankName);
                             }
-                            SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
+                            if (StringUtils.isNotBlank(schedule.getCwDeptNo())) {
-                            if (null != organizationDeptVo) {
+                                voucherDetail.setDeptCode(schedule.getCwDeptNo());
-                                voucherDetail.setDeptCode(organizationDeptVo.getOrgCode());
                             }
                             //   String busVinSid = vehicle.getSid();
                             // BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java

@@ -57,12 +57,14 @@ import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.MonthlyAccrualSource
 import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualrecord.LoanMonthlyAccrualRecord;
 import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
+import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule;
 import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.*;
 import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.flow.*;
 import com.yxt.anrui.riskcenter.api.loantransferpaymentrecord.LoanTransferPaymentRecord;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
+import com.yxt.anrui.riskcenter.biz.loanrepaymentschedule.LoanRepaymentScheduleService;
 import com.yxt.anrui.riskcenter.biz.loantransferpaymentrecord.LoanTransferPaymentRecordService;
 import com.yxt.common.base.config.component.DocPdfComponent;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -148,7 +150,8 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
     private BusSalesOrderFeign busSalesOrderFeign;
     @Autowired
     private BasePurchaseSystemFeign basePurchaseSystemFeign;
-
+    @Autowired
+    private LoanRepaymentScheduleService loanRepaymentScheduleService;
     public ResultBean<LoanTransferPaymentApplyInit> paymentInit(String[] sids) {
         ResultBean<LoanTransferPaymentApplyInit> rb = ResultBean.fireFail();
         LoanTransferPaymentApplyInit vo = new LoanTransferPaymentApplyInit();
@@ -889,10 +892,9 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
                                 paymentVoucher.setPayTypeCode(manufacturerBank.getDueBankKey());
                             }
                         }
-                        String deptSid = planDetails.getDeptSid();
+                        LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(planDetails.getScheduleSid());
-                        SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
+                        if (StringUtils.isNotBlank(schedule.getCwDeptNo())) {
-                        if (null != organizationDeptVo) {
+                            voucherDetail.setDeptCode(schedule.getCwDeptNo());
-                            voucherDetail.setDeptCode(organizationDeptVo.getOrgCode());
                         }
                         BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
                         BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(planDetails.getSalesOrderSid()).getData();

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

@@ -90,8 +90,6 @@ public class AsBusreserveBill extends BaseEntity {
     private String createOrgName; // 创建组织
     @ApiModelProperty("组织全路径")
     private String orgSidPath; // 组织全路径
-    @ApiModelProperty("跟踪记录")
-    private String trackLogs; // 跟踪记录
     @ApiModelProperty("制单部门sid")
     private String createDeptSid; // 制单部门sid
     @ApiModelProperty("制单部门")

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

@@ -90,8 +90,6 @@ public class AsBusreserveBillDetailsVo implements Vo {
     private String useOrgSid; // 使用组织sid
     @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
-    @ApiModelProperty("跟踪记录")
-    private String trackLogs; // 跟踪记录
     @ApiModelProperty("制单部门sid")
     private String createDeptSid; // 制单部门sid
     @ApiModelProperty("制单部门")
@@ -99,4 +97,8 @@ public class AsBusreserveBillDetailsVo implements Vo {
     @ApiModelProperty("客户单位")
     private String customerOrg; // 客户单位
     private List<AsbillSitemVo> sitemVos = new ArrayList<>();
+    @ApiModelProperty("跟踪记录")
+    private List<String> trackLogs = new ArrayList<>(); // 跟踪记录
+    @ApiModelProperty("跟踪记录")
+    private String trackLog;
 }

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

@@ -90,8 +90,6 @@ public class AsBusreserveBillDto implements Dto {
     private String useOrgSid; // 使用组织sid
     @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
-    @ApiModelProperty("跟踪记录")
-    private String trackLogs; // 跟踪记录
     @ApiModelProperty("制单部门sid")
     private String createDeptSid; // 制单部门sid
     @ApiModelProperty("制单部门")
@@ -99,6 +97,8 @@ public class AsBusreserveBillDto implements Dto {
     @ApiModelProperty("客户单位")
     private String customerOrg; // 客户单位
     private List<AsbillSitemVo> sitemVos = new ArrayList<>();
-
+    @ApiModelProperty("跟踪记录")
-
+    private List<String> trackLogs = new ArrayList<>(); // 跟踪记录
+    @ApiModelProperty("跟踪记录")
+    private String trackLog;
 }

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

@@ -76,5 +76,7 @@ public class AsBusreserveBillQuery implements Query {
     private String startDate; // 预约时间开始
     private String endDate; // 预约时间开始
     private String state;
+    @ApiModelProperty("预约服务顾问")
+    private String waitorName; // 预约服务顾问
 
 }

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

@@ -68,13 +68,15 @@ public class AsBusreserveBillVo implements Vo {
     private String customerName; // 客户名称
     @ApiModelProperty("车牌号")
     private String vehMark; // 车牌号
+    @ApiModelProperty("车架号")
+    private String vinNo; // 车架号
     @ApiModelProperty("联系电话")
     private String mobile; // 联系电话
     @ApiModelProperty("预约时间开始")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date reserveStart; // 预约时间开始
     @ApiModelProperty("预约时间截止")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date reserveEnd; // 预约时间截止
 	@ApiModelProperty("预约服务顾问")
     private String waitorName; // 预约服务顾问

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

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asbusreservebilltrack;
+
+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/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-09 17:01:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "预约单-跟踪记录", description = "预约单-跟踪记录")
+@TableName("as_busreserve_bill_track")
+public class AsBusreserveBillTrack extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("预约单sid")
+    private String billSid; // 预约单sid
+
+}

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

@@ -33,11 +33,13 @@ import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillDto;
 import com.yxt.anrui.as.api.asbusrepairbill.SitemVo;
 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.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;
@@ -83,6 +85,9 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private AsBusreserveBillTrackService asBusreserveBillTrackService;
+
     private QueryWrapper<AsBusreserveBill> createQueryWrapper(AsBusreserveBillQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -115,37 +120,37 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
             privilegeQuery.setMenuUrl(query.getMenuUrl());
             privilegeQuery.setUserSid(query.getUserSid());
             ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
-            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+//            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
-                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+//                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
-                String orgSidPath = query.getOrgPath();
+//                String orgSidPath = query.getOrgPath();
-                orgSidPath = orgSidPath + "/";
+//                orgSidPath = orgSidPath + "/";
-                int i1 = orgSidPath.indexOf("/");
+//                int i1 = orgSidPath.indexOf("/");
-                int i2 = orgSidPath.indexOf("/", i1 + 1);
+//                int i2 = orgSidPath.indexOf("/", i1 + 1);
-                int i3 = orgSidPath.indexOf("/", i2 + 1);
+//                int i3 = orgSidPath.indexOf("/", i2 + 1);
-                int i4 = orgSidPath.indexOf("/", i3 + 1);
+//                int i4 = orgSidPath.indexOf("/", i3 + 1);
-                String orgLevelKey = defaultIdReltBean.getData();
+//                String orgLevelKey = defaultIdReltBean.getData();
-                if ("1".equals(orgLevelKey)) {
+//                if ("1".equals(orgLevelKey)) {
-                    orgSidPath = orgSidPath.substring(0, i1);
+//                    orgSidPath = orgSidPath.substring(0, i1);
-                    qw.like("orgSidPath", orgSidPath);
+//                    qw.like("orgSidPath", orgSidPath);
-                } else if ("2".equals(orgLevelKey)) {
+//                } else if ("2".equals(orgLevelKey)) {
-                    orgSidPath = orgSidPath.substring(0, i2);
+//                    orgSidPath = orgSidPath.substring(0, i2);
-                    qw.like("orgSidPath", orgSidPath);
+//                    qw.like("orgSidPath", orgSidPath);
-                } else if ("3".equals(orgLevelKey)) {
+//                } else if ("3".equals(orgLevelKey)) {
-                    orgSidPath = orgSidPath.substring(0, i3);
+//                    orgSidPath = orgSidPath.substring(0, i3);
-                    qw.like("orgSidPath", orgSidPath);
+//                    qw.like("orgSidPath", orgSidPath);
-                } else if ("4".equals(orgLevelKey)) {
+//                } else if ("4".equals(orgLevelKey)) {
-                    orgSidPath = orgSidPath.substring(0, i4);
+//                    orgSidPath = orgSidPath.substring(0, i4);
-                    qw.like("orgSidPath", orgSidPath);
+//                    qw.like("orgSidPath", orgSidPath);
-                } else if ("5".equals(orgLevelKey)) {
+//                } else if ("5".equals(orgLevelKey)) {
-                    qw.eq("createBySid", query.getUserSid());
+//                    qw.eq("createBySid", query.getUserSid());
-                } else {
+//                } else {
-                    PagerVo<AsBusreserveBillVo> p = new PagerVo<>();
+//                    PagerVo<AsBusreserveBillVo> p = new PagerVo<>();
-                    return p;
+//                    return p;
-                }
+//                }
-            } else {
+//            } else {
-                PagerVo<AsBusreserveBillVo> p = new PagerVo<>();
+//                PagerVo<AsBusreserveBillVo> p = new PagerVo<>();
-                return p;
+//                return p;
-            }
+//            }
         }
 
         if (StringUtils.isNotBlank(query.getState())) {
@@ -154,6 +159,9 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
         if (StringUtils.isNotBlank(query.getUseOrgName())) {
             qw.like("useOrgName", query.getUseOrgName());
         }
+        if (StringUtils.isNotBlank(query.getWaitorName())) {
+            qw.like("waitorName", query.getWaitorName());
+        }
         if (StringUtils.isNotBlank(query.getCreateDept())) {
             qw.like("createDept", query.getCreateDept());
         }
@@ -302,6 +310,16 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
                 }
                 vo.setSitemVos(sitemVos);
             }
+            List<AsBusreserveBillTrack> asBusreserveBillTracks = asBusreserveBillTrackService.fetchByMainSid(sid);
+            if (!asBusreserveBillTracks.isEmpty()) {
+                List<String> remarks = new ArrayList<>();
+                for (AsBusreserveBillTrack asBusreserveBillTrack : asBusreserveBillTracks) {
+                    if (StringUtils.isNotBlank(asBusreserveBillTrack.getRemarks())) {
+                        remarks.add(asBusreserveBillTrack.getRemarks());
+                    }
+                }
+                vo.setTrackLogs(remarks);
+            }
         }
         return vo;
     }
@@ -318,10 +336,12 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
         if (StringUtils.isNotBlank(dto.getSid())) {
             AsBusreserveBill bill = fetchBySid(dto.getSid());
             if (null != bill) {
-                if (StringUtils.isNotBlank(dto.getTrackLogs())) {
+                if (StringUtils.isNotBlank(dto.getTrackLog())) {
-                    bill.setTrackLogs(dto.getTrackLogs());
+                    AsBusreserveBillTrack billTrack = new AsBusreserveBillTrack();
+                    billTrack.setRemarks(dto.getTrackLog());
+                    billTrack.setBillSid(dto.getSid());
+                    asBusreserveBillTrackService.insert(billTrack);
                 }
-                baseMapper.updateById(bill);
             }
         }
     }

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

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

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebilltrack/AsBusreserveBillTrackMapper.xml

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

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

@@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asbusreservebilltrack;
+
+import com.yxt.anrui.as.api.asbusreservebillsitem.AsBusreserveBillSitemDetailsVo;
+import com.yxt.anrui.as.api.asbusreservebillsitem.AsBusreserveBillSitemDto;
+import com.yxt.anrui.as.api.asbusreservebillsitem.AsBusreserveBillSitemQuery;
+import com.yxt.anrui.as.api.asbusreservebillsitem.AsBusreserveBillSitemVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: as(as) <br/>
+ * File: AsBusreserveBillSitemFeignFallback.java <br/>
+ * Class: as.biz.asbusreservebillsitem.AsBusreserveBillSitemRest <br/>
+ * Description: 预约单-服务项目. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-09 17:01:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "预约单-跟踪记录")
+@RestController
+@RequestMapping("v1/AsBusreserveBillTrack")
+public class AsBusreserveBillTrackRest {
+
+}

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

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asbusreservebilltrack;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.as.api.asbusreservebillsitem.*;
+import 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 java.util.List;
+
+/**
+ * Project: as(as) <br/>
+ * File: AsBusreserveBillSitemService.java <br/>
+ * Class: as.biz.asbusreservebillsitem.AsBusreserveBillSitemService <br/>
+ * Description: 预约单-服务项目 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-09 17:01:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AsBusreserveBillTrackService extends MybatisBaseService<AsBusreserveBillTrackMapper, AsBusreserveBillTrack> {
+
+	public List<AsBusreserveBillTrack> fetchByMainSid(String sid) {
+		return baseMapper.fetchByMainSid(sid);
+	}
+
+	public int delByMainSid(String sid) {
+		return baseMapper.delByMainSid(sid);
+	}
+
+}