From 2533f9d0241d9e4162c8280f5b962ecac05adb9f Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 15 May 2023 17:50:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basedistributor/BaseDistributorMapper.java | 2 ++ .../basedistributor/BaseDistributorMapper.xml | 13 +++++++++++++ .../basedistributor/BaseDistributorService.java | 10 ++++++++-- .../CrmCustomerTempListQuery.java | 3 +++ .../crmcustomertemp/CrmCustomerTempService.java | 3 +++ .../FinBillApplicationFeign.java | 2 +- .../FinBillApplicationQuery.java | 3 +++ .../finbillapplication/FinBillApplicationVo.java | 3 +++ .../FinBillApplicationService.java | 16 +++++++++++++++- .../biz/finbillvehicle/FinBillVehicleMapper.java | 2 +- .../finbillvehicle/FinBillVehicleService.java | 2 +- .../invoiced/BillApplicationPageVo.java | 3 +++ .../AppBusAdvanceGinvoiceapplyService.java | 6 +++--- .../autoservice/invoiced/InvoicedService.java | 15 ++++++++------- 14 files changed, 67 insertions(+), 16 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java index 8ee5f4c655..d0410c1f7c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java @@ -134,4 +134,6 @@ public interface BaseDistributorMapper extends BaseMapper { List selectAllDisList(String orgSid); BaseDistributorListVo selectDisListBySid(String sid); + + List selectAppAllDisList(@Param("sid") String sid, @Param("search") String search); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml index db7ab5b44a..b50b293ec3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml @@ -247,4 +247,17 @@ WHERE isDelete = 0 AND sid = #{sid} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java index 4a6f6cc64c..a2608712b2 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java @@ -904,8 +904,13 @@ public class BaseDistributorService extends MybatisBaseService> invoiceName(String userSid, String orgPath, String search) { ResultBean rb = ResultBean.fireFail(); - SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData(); - List baseDistributorListVos = baseMapper.selectAllDisList(sysOrganizationVo.getSid()); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + List baseDistributorListVos = new ArrayList<>(); + if (StringUtils.isBlank(search)){ + baseDistributorListVos = baseMapper.selectAllDisList(useOrgSid); + }else { + baseDistributorListVos = baseMapper.selectAppAllDisList(useOrgSid,search); + } List appDisAndCustms = new ArrayList<>(); for (BaseDistributorListVo baseDistributorListVo : baseDistributorListVos) { AppDisAndCustm appDisAndCustm = new AppDisAndCustm(); @@ -939,6 +944,7 @@ public class BaseDistributorService extends MybatisBaseService crmCustomerTempListVos = crmCustomerTempFeign.selectCustomerList(crmCustomerTempListQuery).getData(); for (CrmCustomerTempListVo crmCustomerTempListVo : crmCustomerTempListVos) { AppDisAndCustm appDisAndCustm = new AppDisAndCustm(); diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListQuery.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListQuery.java index 2f41675842..35f8f596f4 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListQuery.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListQuery.java @@ -18,4 +18,7 @@ public class CrmCustomerTempListQuery implements Query { @ApiModelProperty("组织机构全路径sid") private String orgPath; private String certificateTypeKey; //证件类型 + + //移动端查询条件 + private String search; } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index cd53799ae4..1c39fd2022 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -998,6 +998,9 @@ public class CrmCustomerTempService extends MybatisBaseService list = baseMapper.selectCustomerList(qw); list.removeAll(Collections.singleton(null)); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java index 05746c60e4..15aea71219 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java @@ -245,7 +245,7 @@ public interface FinBillApplicationFeign { @ResponseBody public ResultBean addInvoicedApply(@Valid @RequestBody AddInvoicedApplyDto dto); - @ApiOperation("移动端欠款开票初始化") + @ApiOperation("移动端开票申请初始化") @PostMapping("/appQKFetchDetailsBySid") @ResponseBody public ResultBean appQKFetchDetailsBySid(@RequestBody AppBillApplicationDetailsQKQuery query); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java index 7809d5d6c9..18e97b8bb2 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java @@ -83,4 +83,7 @@ public class FinBillApplicationQuery implements Query { @ApiModelProperty("1待办2已办") private String type; + + @ApiModelProperty("移动端查询条件") + private String name; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java index 315dd223a3..77467bf495 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java @@ -91,4 +91,7 @@ public class FinBillApplicationVo implements Vo { private String procDefId; @ApiModelProperty(value = "实例id") private String procInstSid; + + @ApiModelProperty("车架号拼接") + private String vinNo; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 520f9a20eb..90e974ffde 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -209,6 +209,10 @@ public class FinBillApplicationService extends MybatisBaseService wrapper.like("fba.customerName", query.getName()).or().like("fba.contractNo", query.getName())); + } String applyStartDate = query.getApplyStartDate(); String applyEndDate = query.getApplyEndDate(); qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (fba.applyDate,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')"). @@ -228,6 +232,16 @@ public class FinBillApplicationService extends MybatisBaseService qw = createQueryWrapper(query); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + for (FinBillApplicationVo record : pagging.getRecords()) { + String sid = record.getSid(); + List finBillVehicleVos = finBillVehicleService.fetchByMainSid(sid); + String vinNos = ""; + for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { + String vinNo = finBillVehicleVo.getVinNo(); + vinNos = vinNos + vinNo + ","; + } + record.setVinNo(vinNos.substring(0,vinNos.lastIndexOf(","))); + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -435,7 +449,7 @@ public class FinBillApplicationService extends MybatisBaseService finBillTrailerVos = finBillTrailerService.fetchByMainSid(sid); if (finBillTrailerVos.size() > 0) { for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) { - FinBillVehicleVo finBillVehicleVo = finBillVehicleService.fetchByMainSid(sid); + FinBillVehicleVo finBillVehicleVo = finBillVehicleService.fetchByMainSid(sid).get(0); finBillTrailerVo.setInvoiceInfo(finBillVehicleVo.getOpenTickRemarks()); BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(finBillTrailerVo.getGcVinNo()).getData(); List commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData(); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java index 0c3609146a..197a670d31 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java @@ -81,5 +81,5 @@ public interface FinBillVehicleMapper extends BaseMapper { FinBillVehicleVo selByVinNo(String vinNo); @Select("select * from fin_bill_vehicle where billAppSid = #{sid}") - FinBillVehicleVo fetchByMainSid(String sid); + List fetchByMainSid(String sid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java index 68fe99d96a..c49030a7c9 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java @@ -146,7 +146,7 @@ public class FinBillVehicleService extends MybatisBaseService fetchByMainSid(String sid) { return baseMapper.fetchByMainSid(sid); } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageVo.java index 5075063ec2..0553d08bd4 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageVo.java @@ -58,4 +58,7 @@ public class BillApplicationPageVo implements Vo { @ApiModelProperty("开票单位") private String billUnit; + + @ApiModelProperty("车架号拼接") + private String vinNo; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java index 0a9ef2ae82..5dd37fe90a 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java @@ -1022,7 +1022,7 @@ public class AppBusAdvanceGinvoiceapplyService { idCardImages.add(zjApplicationAppendx.getFileUrl()); } ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo(); - itemEditTextInfo.setTitle("证件"); + itemEditTextInfo.setTitle("证件(营业执照或身份证)"); itemEditTextInfo.setType(1); itemEditTextInfo.setNullAble(false); itemEditTextInfo.setKey("idCardImages"); @@ -1046,7 +1046,7 @@ public class AppBusAdvanceGinvoiceapplyService { invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl()); } ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo(); - itemEditTextInfo.setTitle("款项确认书"); + itemEditTextInfo.setTitle("款项确认书(贷款业务上传)"); itemEditTextInfo.setType(1); itemEditTextInfo.setNullAble(true); itemEditTextInfo.setKey("invoiceApplyConfirmImages"); @@ -1058,7 +1058,7 @@ public class AppBusAdvanceGinvoiceapplyService { registerContractImages.add(cldjhtApplicationAppendx.getFileUrl()); } ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo(); - itemEditTextInfo.setTitle("车辆登记合同"); + itemEditTextInfo.setTitle("车辆登记合同(开票名称与客户名称不一致时上传)"); itemEditTextInfo.setType(1); itemEditTextInfo.setNullAble(true); itemEditTextInfo.setKey("registerContractImages"); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java index face889111..13a3248124 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java @@ -53,7 +53,7 @@ public class InvoicedService { BillApplicationPageQuery params = pagerQuery.getParams(); FinBillApplicationQuery finBillApplicationQuery = new FinBillApplicationQuery(); finBillApplicationQuery.setCreateBySid(params.getUserSid()); - finBillApplicationQuery.setCustomerName(params.getName()); + finBillApplicationQuery.setName(params.getName()); finBillApplicationQuery.setOrgPath(params.getOrgPath()); finBillApplicationQuery.setType(params.getType()); PagerQuery pcq = new PagerQuery<>(); @@ -80,6 +80,7 @@ public class InvoicedService { }else { billApplicationPageVo.setShowUpData(false); } + billApplicationPageVo.setVinNo(record.getVinNo()); billApplicationPageVos.add(billApplicationPageVo); } v.setRecords(billApplicationPageVos); @@ -373,12 +374,12 @@ public class InvoicedService { String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); submitBillApplicationDto.setUseOrgSid(useOrgSid); submitBillApplicationDto.setCreateBySid(dto.getUserSid()); - submitBillApplicationDto.setTotalBillMoney(dto.getInvoiceMoney()); + submitBillApplicationDto.setTotalBillMoney(dto.getInvoiceTotal()); submitBillApplicationDto.setOrgSidPath(dto.getOrgPath()); submitBillApplicationDto.setSaleTypeValue(dto.getSaleType()); - submitBillApplicationDto.setSaleDeptName(dto.getSellerName()); + submitBillApplicationDto.setSaleDeptName(dto.getSellerDept()); submitBillApplicationDto.setStaffName(dto.getSellerName()); - submitBillApplicationDto.setOpenTickUnitName(dto.getOpenTickName()); + submitBillApplicationDto.setOpenTickUnitName(dto.getInvoicingUnit()); submitBillApplicationDto.setCustomerName(dto.getName()); submitBillApplicationDto.setOneBillMoney(dto.getInvoiceMoney()); submitBillApplicationDto.setOpenTickTypeKey(dto.getOpenTickTypeKey()); @@ -562,7 +563,7 @@ public class InvoicedService { idCardImages.add(zjApplicationAppendx.getFileUrl()); } ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo(); - itemEditTextInfo.setTitle("证件"); + itemEditTextInfo.setTitle("证件(营业执照或身份证)"); itemEditTextInfo.setType(1); itemEditTextInfo.setNullAble(false); itemEditTextInfo.setKey("idCardImages"); @@ -586,7 +587,7 @@ public class InvoicedService { invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl()); } ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo(); - itemEditTextInfo.setTitle("款项确认书"); + itemEditTextInfo.setTitle("款项确认书(贷款业务上传)"); itemEditTextInfo.setType(1); itemEditTextInfo.setNullAble(true); itemEditTextInfo.setKey("invoiceApplyConfirmImages"); @@ -598,7 +599,7 @@ public class InvoicedService { registerContractImages.add(cldjhtApplicationAppendx.getFileUrl()); } ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo(); - itemEditTextInfo.setTitle("车辆登记合同"); + itemEditTextInfo.setTitle("车辆登记合同(开票名称与客户名称不一致时上传)"); itemEditTextInfo.setType(1); itemEditTextInfo.setNullAble(true); itemEditTextInfo.setKey("registerContractImages");