From b8fe2601b670b7a2368d5b8e89b19ed6f15509e2 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 9 May 2024 16:50:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A2=E5=8A=A1=E5=87=AD?= =?UTF-8?q?=E8=AF=81=E9=83=A8=E9=97=A8=E5=8F=96=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderLoancontract.java | 4 + .../BusSalesOrderLoancontractFeign.java | 3 +- ...usSalesOrderLoancontractFeignFallback.java | 3 +- .../BusSalesOrderLoancontractMapper.java | 4 +- .../BusSalesOrderLoancontractRest.java | 5 +- .../BusSalesOrderLoancontractService.java | 6 +- .../FinCollectionConfirmationService.java | 70 ++++++----- .../LoanPlanDetailsVoForLateVoucher.java | 1 + .../LoanRepaymentSchedule.java | 2 + .../LoanRepaymentScheduleFeign.java | 6 + .../LoanRepaymentScheduleFeignFallback.java | 5 + .../LoanBePadsincereApplyService.java | 20 +-- .../LoanBuckleApplyService.java | 24 ++-- .../LoanMonthlyAccrualApplyService.java | 15 ++- .../LoanRepaymentHistoryService.java | 16 ++- .../LoanRepaymentPlanDetailsMapper.java | 2 + .../LoanRepaymentPlanDetailsMapper.xml | 26 +++- .../LoanRepaymentPlanDetailsService.java | 14 ++- .../ScheduledRepaymentPlanDetailsService.java | 22 ++-- .../LoanRepaymentScheduleRest.java | 7 ++ .../LoanRepaymentScheduleService.java | 27 +++-- .../LoanTransferPaymentApplyService.java | 12 +- .../asbusreservebill/AsBusreserveBill.java | 2 - .../AsBusreserveBillDetailsVo.java | 6 +- .../asbusreservebill/AsBusreserveBillDto.java | 10 +- .../AsBusreserveBillQuery.java | 2 + .../asbusreservebill/AsBusreserveBillVo.java | 6 +- .../AsBusreserveBillTrack.java | 59 +++++++++ .../AsBusreserveBillService.java | 114 ++++++++++-------- .../AsBusreserveBillTrackMapper.java | 63 ++++++++++ .../AsBusreserveBillTrackMapper.xml | 7 ++ .../AsBusreserveBillTrackRest.java | 58 +++++++++ .../AsBusreserveBillTrackService.java | 66 ++++++++++ 33 files changed, 528 insertions(+), 159 deletions(-) create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebilltrack/AsBusreserveBillTrack.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebilltrack/AsBusreserveBillTrackMapper.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebilltrack/AsBusreserveBillTrackMapper.xml create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebilltrack/AsBusreserveBillTrackRest.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebilltrack/AsBusreserveBillTrackService.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontract.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontract.java index 1998de8ad1..89ec052c41 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontract.java +++ b/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(销售订单)
* File: BusSalesOrderLoancontract.java
@@ -74,5 +76,7 @@ public class BusSalesOrderLoancontract extends BaseEntity { private String busState; // 业务状态码 @ApiModelProperty("是否生成还款计划表（0否，1是）") private String repaymentState; // 是否生成还款计划表（0否，1是） + @ApiModelProperty("还款计划表生成时间") + private Date repaymentCreateTime; // 还款计划表生成时间 } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java index 164030445c..59461af22f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java +++ b/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") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java index acf6d69907..5c06e616a6 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java +++ b/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; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java index 6a00b80604..601b9e5bcf 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java +++ b/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 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 loanCreateSchedule(@RequestParam("salesOrderSid") String salesOrderSid); + @ApiOperation("根据sid查询实体") + @GetMapping("/fetchBySid") + @ResponseBody + public ResultBean fetchBySid(@RequestParam("sid") String sid); + + @ApiOperation("生成还款计划表") @PostMapping("/loanCreateSchedulePdf") @ResponseBody diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java index 857b905951..2b4aa92a42 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java +++ b/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 fetchBySid(String sid) { + return null; + } + @Override public ResultBean loanCreateSchedulePdf(LoanCreateSchedulePdfVo dto) { return null; diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java index aabd8f813c..4ea97bfd16 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java +++ b/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 recordVos = baseMapper.dkListPageExport(qw); return recordVos; } -} \ No newline at end of file +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java index 178a69b88d..0ba26cdfe7 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java +++ b/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 listPage(PagerQuery pq) { IPage page = PagerUtil.queryToPage(pq); @@ -700,11 +704,12 @@ public class LoanBuckleApplyService extends MybatisBaseService accrualInit(String orgPath) { ResultBean rb = ResultBean.fireFail(); String orgSidPath = orgPath; @@ -701,11 +704,13 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService saveHistory(LoanRepaymentHistoryDto dto) { ResultBean rb = ResultBean.fireFail(); LoanRepaymentHistory entity = new LoanRepaymentHistory(); @@ -855,11 +858,12 @@ public class LoanRepaymentHistoryService extends MybatisBaseService selPushLaterVoucherOnBuckle(@Param("planSids") List planSids); LoanRepaymentPlanDetails fetchMainBankByBusVinSid(@Param("busVinSid") String busVinSid); + + String fetchCwDeptCodeByBusVinSid(@Param("busVinSid") String busVinSid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml index f23e685cd8..82a6cdb51d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml +++ b/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 - \ No newline at end of file + + diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java index 66a54de13e..74e7e11b3d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java +++ b/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 fetchBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanRepaymentSchedule repaymentSchedule = loanRepaymentScheduleService.fetchBySid(sid); + return rb.success().setData(repaymentSchedule); + } + @Override public ResultBean loanCreateSchedulePdf(LoanCreateSchedulePdfVo dto) { return loanRepaymentScheduleService.loanCreateSchedulePdf(dto); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java index ce2c11944f..4bcd75e015 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java +++ b/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 busSalesOrderVehicles = busSalesOrderVehicleFeign.selbyContractSid(dto.getSalesOrderSid()).getData(); busSalesOrderVehicles.removeAll(Collections.singleton(null)); @@ -1226,7 +1233,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService { - busSalesOrderLoancontractFeign.setRepaymentState(dto.getSalesOrderSid()); + busSalesOrderLoancontractFeign.setRepaymentState(dto.getSalesOrderSid(),new DateTime()); }); } catch (Exception e) { e.printStackTrace(); @@ -1334,14 +1341,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService paymentInit(String[] sids) { ResultBean rb = ResultBean.fireFail(); LoanTransferPaymentApplyInit vo = new LoanTransferPaymentApplyInit(); @@ -889,10 +892,9 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService sitemVos = new ArrayList<>(); + @ApiModelProperty("跟踪记录") + private List trackLogs = new ArrayList<>(); // 跟踪记录 + @ApiModelProperty("跟踪记录") + private String trackLog; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java index dd360bab8a..42dc1fa5e0 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java @@ -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 sitemVos = new ArrayList<>(); - - -} \ No newline at end of file + @ApiModelProperty("跟踪记录") + private List trackLogs = new ArrayList<>(); // 跟踪记录 + @ApiModelProperty("跟踪记录") + private String trackLog; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillQuery.java index 6660a320f7..5b1069fc83 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillQuery.java @@ -76,5 +76,7 @@ public class AsBusreserveBillQuery implements Query { private String startDate; // 预约时间开始 private String endDate; // 预约时间开始 private String state; + @ApiModelProperty("预约服务顾问") + private String waitorName; // 预约服务顾问 } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillVo.java index 4a2aea897c..b627e65dc6 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillVo.java @@ -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; // 预约服务顾问 diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebilltrack/AsBusreserveBillTrack.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebilltrack/AsBusreserveBillTrack.java new file mode 100644 index 0000000000..b9b4b0699e --- /dev/null +++ b/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)
+ * File: AsBusreserveBill.java
+ * Class: as.api.asbusreservebill.AsBusreserveBill
+ * Description: 预约单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 17:01:49
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "预约单-跟踪记录", description = "预约单-跟踪记录") +@TableName("as_busreserve_bill_track") +public class AsBusreserveBillTrack extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("预约单sid") + private String billSid; // 预约单sid + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java index 9a9af58e97..13790bd8da 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java @@ -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 createQueryWrapper(AsBusreserveBillQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -91,16 +96,16 @@ public class AsBusreserveBillService extends MybatisBaseService defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); - if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { - //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) - String orgSidPath = query.getOrgPath(); - orgSidPath = orgSidPath + "/"; - int i1 = orgSidPath.indexOf("/"); - int i2 = orgSidPath.indexOf("/", i1 + 1); - int i3 = orgSidPath.indexOf("/", i2 + 1); - int i4 = orgSidPath.indexOf("/", i3 + 1); - String orgLevelKey = defaultIdReltBean.getData(); - if ("1".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i1); - qw.like("orgSidPath", orgSidPath); - } else if ("2".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i2); - qw.like("orgSidPath", orgSidPath); - } else if ("3".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i3); - qw.like("orgSidPath", orgSidPath); - } else if ("4".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i4); - qw.like("orgSidPath", orgSidPath); - } else if ("5".equals(orgLevelKey)) { - qw.eq("createBySid", query.getUserSid()); - } else { - PagerVo p = new PagerVo<>(); - return p; - } - } else { - PagerVo p = new PagerVo<>(); - return p; - } +// if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { +// //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) +// String orgSidPath = query.getOrgPath(); +// orgSidPath = orgSidPath + "/"; +// int i1 = orgSidPath.indexOf("/"); +// int i2 = orgSidPath.indexOf("/", i1 + 1); +// int i3 = orgSidPath.indexOf("/", i2 + 1); +// int i4 = orgSidPath.indexOf("/", i3 + 1); +// String orgLevelKey = defaultIdReltBean.getData(); +// if ("1".equals(orgLevelKey)) { +// orgSidPath = orgSidPath.substring(0, i1); +// qw.like("orgSidPath", orgSidPath); +// } else if ("2".equals(orgLevelKey)) { +// orgSidPath = orgSidPath.substring(0, i2); +// qw.like("orgSidPath", orgSidPath); +// } else if ("3".equals(orgLevelKey)) { +// orgSidPath = orgSidPath.substring(0, i3); +// qw.like("orgSidPath", orgSidPath); +// } else if ("4".equals(orgLevelKey)) { +// orgSidPath = orgSidPath.substring(0, i4); +// qw.like("orgSidPath", orgSidPath); +// } else if ("5".equals(orgLevelKey)) { +// qw.eq("createBySid", query.getUserSid()); +// } else { +// PagerVo p = new PagerVo<>(); +// return p; +// } +// } else { +// PagerVo p = new PagerVo<>(); +// return p; +// } } if (StringUtils.isNotBlank(query.getState())) { - qw.eq("state",query.getState()); + qw.eq("state", query.getState()); } if (StringUtils.isNotBlank(query.getUseOrgName())) { - qw.like("useOrgName",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()); + qw.like("createDept", query.getCreateDept()); } if (StringUtils.isNotBlank(query.getCreateByName())) { - qw.like("createByName",query.getCreateByName()); + qw.like("createByName", query.getCreateByName()); } if (StringUtils.isNotBlank(query.getBillNo())) { - qw.like("billNo",query.getBillNo()); + qw.like("billNo", query.getBillNo()); } if (StringUtils.isNotBlank(query.getCustomerName())) { - qw.like("customerName",query.getCustomerName()); + qw.like("customerName", query.getCustomerName()); } if (StringUtils.isNotBlank(query.getVehMark())) { - qw.like("vehMark",query.getVehMark()); + qw.like("vehMark", query.getVehMark()); } if (StringUtils.isNotBlank(query.getVinNo())) { - qw.like("vinNo",query.getVinNo()); + qw.like("vinNo", query.getVinNo()); } if (StringUtils.isNotBlank(query.getMobile())) { - qw.like("mobile",query.getMobile()); + qw.like("mobile", query.getMobile()); } String createStartTime = query.getStartCreateDate(); String createEndTime = query.getEndCreateDate(); @@ -302,6 +310,16 @@ public class AsBusreserveBillService extends MybatisBaseService asBusreserveBillTracks = asBusreserveBillTrackService.fetchByMainSid(sid); + if (!asBusreserveBillTracks.isEmpty()) { + List 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_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无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)
+ * File: AsBusreserveBillSitemMapper.java
+ * Class: as.biz.asbusreservebillsitem.AsBusreserveBillSitemMapper
+ * Description: 预约单-服务项目.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 17:01:49
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface AsBusreserveBillTrackMapper extends BaseMapper { + + @Select("select * from as_busreserve_bill_track where billSid =#{sid}") + List fetchByMainSid(@Param("sid") String sid); + + @Delete("delete from as_busreserve_bill_track where billSid = #{sid}") + int delByMainSid(@Param("sid") String sid); +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebilltrack/AsBusreserveBillTrackMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebilltrack/AsBusreserveBillTrackMapper.xml new file mode 100644 index 0000000000..8525721629 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebilltrack/AsBusreserveBillTrackMapper.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebilltrack/AsBusreserveBillTrackRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebilltrack/AsBusreserveBillTrackRest.java new file mode 100644 index 0000000000..31134869c3 --- /dev/null +++ b/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)
+ * File: AsBusreserveBillSitemFeignFallback.java
+ * Class: as.biz.asbusreservebillsitem.AsBusreserveBillSitemRest
+ * Description: 预约单-服务项目.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 17:01:49
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "预约单-跟踪记录") +@RestController +@RequestMapping("v1/AsBusreserveBillTrack") +public class AsBusreserveBillTrackRest { + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebilltrack/AsBusreserveBillTrackService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebilltrack/AsBusreserveBillTrackService.java new file mode 100644 index 0000000000..15fc089806 --- /dev/null +++ b/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)
+ * File: AsBusreserveBillSitemService.java
+ * Class: as.biz.asbusreservebillsitem.AsBusreserveBillSitemService
+ * Description: 预约单-服务项目 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 17:01:49
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class AsBusreserveBillTrackService extends MybatisBaseService { + + public List fetchByMainSid(String sid) { + return baseMapper.fetchByMainSid(sid); + } + + public int delByMainSid(String sid) { + return baseMapper.delByMainSid(sid); + } + +}