From 3605de1a036ee779099f8adfce7448a5114a5112 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 27 Jul 2023 08:36:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BE=85=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleStateEnum.java | 2 + .../BaseVehicleStateService.java | 6 + .../biz/busdelivered/BusDeliveredMapper.java | 3 +- .../biz/busdelivered/BusDeliveredMapper.xml | 71 +++-- .../biz/busdelivered/BusDeliveredRest.java | 6 +- .../biz/busdelivered/BusDeliveredService.java | 104 ++++-- .../BusDeliveredApplyService.java | 295 ++++++++++++++---- .../BusSalesOrderVehicleMapper.java | 1 + .../BusSalesOrderVehicleMapper.xml | 9 + .../BusSalesOrderVehicleService.java | 4 + .../FinCollectionConfirmationService.java | 6 +- .../FinSelectedReceivablesDetailedMapper.xml | 2 +- ...inUncollectedReceivablesDetailedMapper.xml | 2 +- 13 files changed, 407 insertions(+), 104 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java index fe2aeac54e..5231bed542 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java @@ -71,6 +71,8 @@ public class BaseVehicleStateEnum { DDBA_SAVEVIN("6", "录入车架号"), FIN_RQ("7", "认款完成"), FIN_WRQ("8", "认款未完成"), + CKTJ("9", "出库提交"), + CKZZ("10", "出库终止、驳回以及撤回到第一环节时"), ; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java index 0ee5988d61..cefaf8c2ae 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java @@ -61,6 +61,12 @@ public class BaseVehicleStateService extends MybatisBaseService { List selectByState(); - IPage selectListsVos(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); + IPage selectListsVoNew(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); IPage getRetrievalNotLists(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw, @Param("name") String name); + IPage getRetrievalNotListNew(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw, @Param("name") String name); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml index ded95acff0..939d1d4048 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml @@ -155,24 +155,6 @@ and finState = '1' - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java index c6f0fdf7ff..d828aaf2bd 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java @@ -68,7 +68,7 @@ public class BusDeliveredRest implements BusDeliveredFeign { @Override public ResultBean> listPage(@RequestBody PagerQuery pq) { ResultBean> rb = ResultBean.fireFail(); - PagerVo pv = busDeliveredService.listPageVo(pq); + PagerVo pv = busDeliveredService.listPageVoNew(pq); return rb.success().setData(pv); } @@ -102,7 +102,7 @@ public class BusDeliveredRest implements BusDeliveredFeign { @Override public ResultBean> getRetrievalNotList(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - IPage voIPage = busDeliveredService.getRetrievalNotList(pq); + IPage voIPage = busDeliveredService.getRetrievalNotListNew(pq); return rb.success().setData(voIPage); } @@ -118,7 +118,7 @@ public class BusDeliveredRest implements BusDeliveredFeign { @Override public ResultBean> selectInfo(DeliverDetailsQuery query) { - return busDeliveredService.selectInfo(query); + return busDeliveredService.selectInfoNew(query); } @Override diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java index 5df7bed883..ea6081801a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java @@ -160,23 +160,17 @@ public class BusDeliveredService extends MybatisBaseService listPageVos(PagerQuery pq) { + public PagerVo listPageVoNew(PagerQuery pq) { BusDeliveredQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); if (query != null) { //合同编号 if (StringUtils.isNotBlank(query.getContractNo())) { - qw.like("bd.contractNo", query.getContractNo()); + qw.like("bo.contractNo", query.getContractNo()); } //客户名称 if (StringUtils.isNotBlank(query.getName())) { - qw.like("bd.name", query.getName()); + qw.like("bo.name", query.getName()); } //车架号 if (StringUtils.isNotBlank(query.getVinNo())) { @@ -187,20 +181,15 @@ public class BusDeliveredService extends MybatisBaseService busVinSidList = baseMapper.selectByState(); - //查询销售订单中申请人是当前登录人且已办结的，linkSid有值，且在车辆台账中不为出库的。 IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectListsVos(page, qw); + IPage pagging = baseMapper.selectListsVoNew(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } - public void saveOrUpdateDto(BusDeliveredDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { @@ -271,7 +260,26 @@ public class BusDeliveredService extends MybatisBaseService getRetrievalNotLists(PagerQuery pq) { + public IPage getRetrievalNotListNew(PagerQuery pq) { + QueryWrapper qw = new QueryWrapper<>(); + String name = pq.getParams().getName(); + IPage page = PagerUtil.queryToPage(pq); + String orgPath = pq.getParams().getOrgPath(); + String orgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + } else { + orgSid = sysStaffOrgFeign.getPathSidByUserSid(pq.getParams().getUserSid()).getData(); + } + qw.eq("bo.useOrgSid", orgSid); + if (StringUtils.isNotBlank(pq.getParams().getUserSid())) { + qw.eq("bo.createBySid", pq.getParams().getUserSid()); + } + IPage iPage = baseMapper.getRetrievalNotListNew(page, qw, name); + return iPage; + } + + /* public IPage getRetrievalNotLists(PagerQuery pq) { QueryWrapper qw = new QueryWrapper<>(); String name = pq.getParams().getName(); IPage page = PagerUtil.queryToPage(pq); @@ -298,7 +306,7 @@ public class BusDeliveredService extends MybatisBaseService getRetrievalApplyInfo(AppDeliveredDetailsQuery query) { ResultBean rb = ResultBean.fireFail(); @@ -408,7 +416,7 @@ public class BusDeliveredService extends MybatisBaseService trailerList = baseTrailerFeign.trailerList(vinSid, contractNo); - if (trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) { + if (trailerList.getData() != null && trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) { appCarListVo.setShowHandCarBtn(false); } else { appCarListVo.setShowHandCarBtn(true); @@ -694,6 +702,64 @@ public class BusDeliveredService extends MybatisBaseService> selectInfoNew(DeliverDetailsQuery query) { + ResultBean> rb = ResultBean.fireFail(); + //移动端：排除已选车辆后的所有未提交及未出库的车辆集合 + //PC端：前端传的已勾选的所有的车辆的集合 + String contractNo = query.getContractNo(); + List vinSelectSid = query.getVinSelectsid(); + vinSelectSid.removeAll(Collections.singleton(null)); + List vinSids = query.getVinSids(); + vinSids.removeAll(Collections.singleton(null)); + List list = new ArrayList<>(); + List busSalesOrderVehicleList = busSalesOrderVehicleService.selectByNoAndVinSidsNew(contractNo); + for (int i = 0; i < busSalesOrderVehicleList.size(); i++) { + AppCarListVo appCarListVo = new AppCarListVo(); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleList.get(i); + String vinSid = busSalesOrderVehicle.getLinkSid(); + if (!vinSelectSid.isEmpty()) { + if (vinSelectSid.contains(vinSid)) { + continue; + } + } + if (!vinSids.isEmpty()) { + if (vinSids.contains(vinSid)) { + appCarListVo.setVinSid(vinSid); + } else { + continue; + } + } else { + appCarListVo.setVinSid(vinSid); + } + ResultBean trailerList = baseTrailerFeign.trailerList(vinSid, query.getContractNo()); + if (trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) { + appCarListVo.setShowHandCarBtn(false); + } else { + appCarListVo.setShowHandCarBtn(true); + } + //优惠包使用情况 + List discountList = new ArrayList<>(); + List busSalesOrderDiscountList = busSalesOrderDiscountService.selectListByContractNo(contractNo); + for (int j = 0; j < busSalesOrderDiscountList.size(); j++) { + BusDeliveredDetailsDiscountsVo busDeliveredDetailsDiscountsVo = new BusDeliveredDetailsDiscountsVo(); + BusSalesOrderDiscount orderDiscountVo = busSalesOrderDiscountList.get(j); + busDeliveredDetailsDiscountsVo.setDiscountInfo(orderDiscountVo.getDiscountExplain()); + busDeliveredDetailsDiscountsVo.setDiscountSid(orderDiscountVo.getSid()); + busDeliveredDetailsDiscountsVo.setDiscountPrice(orderDiscountVo.getPrice()); + busDeliveredDetailsDiscountsVo.setDiscountNum(0); + busDeliveredDetailsDiscountsVo.setTotalNum(orderDiscountVo.getNum()); + busDeliveredDetailsDiscountsVo.setDiscountName(orderDiscountVo.getName()); + discountList.add(busDeliveredDetailsDiscountsVo); + } + appCarListVo.setDiscountUse(discountList); + BusDeliveredUseMessagesVo deliveredUseMessagesVo = new BusDeliveredUseMessagesVo(); + deliveredUseMessagesVo.setVin(busSalesOrderVehicle.getLinkNo().substring(busSalesOrderVehicle.getLinkNo().length() - 8)); + appCarListVo.setRealBuyer(deliveredUseMessagesVo); + list.add(appCarListVo); + } + return rb.success().setData(list); + } + public BusDelivered getState(String contractNo, String vinSid) { return baseMapper.getState(contractNo,vinSid); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 53452e525d..06d01a6726 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -42,6 +42,9 @@ import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo; import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutFeign; import com.yxt.anrui.base.api.basevehicleout.BaseVehicleZSOutApplyDto; import com.yxt.anrui.base.api.basevehicleout.BaseVehicleZSOutDto; +import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto; +import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum; +import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo; @@ -213,6 +216,8 @@ public class BusDeliveredApplyService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + Future future1 = pool.submit(() -> { + List dtoList = new ArrayList<>(); + List stringList = busDeliveredApplyDetailsService.selectVinByApplySid(bv.getBusinessSid()); + stringList.removeAll(Collections.singleton(null)); + if (!stringList.isEmpty()) { + stringList.stream().forEach(v -> { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKKP_PASS.getTypeKey()); + baseVehicleStateDto.setBusSid(v); + dtoList.add(baseVehicleStateDto); + }); + ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } try { ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() .setNameFormat("demo-pool-%d").build(); @@ -836,10 +866,34 @@ public class BusDeliveredApplyService extends MybatisBaseService stringList = busDeliveredApplyDetailsService.selectVinByApplySid(bv.getBusinessSid()); - for (int i = 0; i < stringList.size(); i++) { + //==============================新增车辆的持久状态组装数据 + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply; + Future future1 = pool.submit(() -> { + List dtoList = new ArrayList<>(); + stringList.removeAll(Collections.singleton(null)); + if (!stringList.isEmpty()) { + stringList.stream().forEach(v -> { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKTJ.getTypeKey()); + baseVehicleStateDto.setBusSid(v); + dtoList.add(baseVehicleStateDto); + }); + ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + /*for (int i = 0; i < stringList.size(); i++) { String vinNo = stringList.get(i); busDeliveredService.updateState(vinNo, 0); - } + }*/ //更改申请的状态为待审核2 baseMapper.updateStateBySid(2, bv.getBusinessSid()); } @@ -1378,7 +1432,31 @@ public class BusDeliveredApplyService extends MybatisBaseService vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid()); //更新该合同的该车架号的状态为1 - busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1); +// busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1); + //==============================新增车辆的持久状态组装数据 + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply; + Future future1 = pool.submit(() -> { + List dtoList = new ArrayList<>(); + vinSidList.removeAll(Collections.singleton(null)); + if (!vinSidList.isEmpty()) { + vinSidList.stream().forEach(v -> { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKZZ.getTypeKey()); + baseVehicleStateDto.setBusSid(v); + dtoList.add(baseVehicleStateDto); + }); + ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } baseMapper.updateStateBySid(1, query.getBusinessSid()); } //极光推送 @@ -1477,7 +1555,31 @@ public class BusDeliveredApplyService extends MybatisBaseService vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid()); //更新该合同的该车架号的状态为1 - busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1); +// busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1); + //==============================新增车辆的持久状态组装数据 + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply; + Future future1 = pool.submit(() -> { + List dtoList = new ArrayList<>(); + vinSidList.removeAll(Collections.singleton(null)); + if (!vinSidList.isEmpty()) { + vinSidList.stream().forEach(v -> { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKZZ.getTypeKey()); + baseVehicleStateDto.setBusSid(v); + dtoList.add(baseVehicleStateDto); + }); + ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } baseMapper.updateStateBySid(1, query.getBusinessSid()); } @@ -1516,7 +1618,31 @@ public class BusDeliveredApplyService extends MybatisBaseService vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid()); //更新该合同的该车架号的状态为1 - busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1); +// busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1); + //==============================新增车辆的持久状态组装数据 + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply; + Future future1 = pool.submit(() -> { + List dtoList = new ArrayList<>(); + vinSidList.removeAll(Collections.singleton(null)); + if (!vinSidList.isEmpty()) { + vinSidList.stream().forEach(v -> { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKZZ.getTypeKey()); + baseVehicleStateDto.setBusSid(v); + dtoList.add(baseVehicleStateDto); + }); + ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } return rb.success().setData(resultBean.getData()); } else { if (businessTaskId.equals(query.getTaskId())) { @@ -1530,7 +1656,31 @@ public class BusDeliveredApplyService extends MybatisBaseService vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid()); //更新该合同的该车架号的状态为1 - busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1); +// busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1); + //==============================新增车辆的持久状态组装数据 + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply; + Future future1 = pool.submit(() -> { + List dtoList = new ArrayList<>(); + vinSidList.removeAll(Collections.singleton(null)); + if (!vinSidList.isEmpty()) { + vinSidList.stream().forEach(v -> { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKZZ.getTypeKey()); + baseVehicleStateDto.setBusSid(v); + dtoList.add(baseVehicleStateDto); + }); + ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } return rb.success().setData(resultBean.getData()); } } @@ -1720,6 +1870,9 @@ public class BusDeliveredApplyService extends MybatisBaseService vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sid); //更新该合同的该车架号的状态为0 - busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 0); +// busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 0); + //更新出库申请的状态为待审核2 baseMapper.updateStateBySid(2, sid); - //极光推送 busDeliveredApply = fetchBySid(businessSid); - MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); - MessageFlowVo messageFlowVo = new MessageFlowVo(); - BeanUtil.copyProperties(ufVo, messageFlowVo); - messageFlowableQuery.setUfVo(messageFlowVo); - messageFlowableQuery.setAppMap(appMap); - messageFlowableQuery.setBusinessSid(businessSid); - messageFlowableQuery.setModuleName("出库申请"); - messageFlowableQuery.setMsgContent(busDeliveredApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); - messageFlowableQuery.setMsgTitle("出库申请"); - ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + //==============================新增车辆的持久状态组装数据 + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply; + Future future1 = pool.submit(() -> { + List dtoList = new ArrayList<>(); + vinSidList.removeAll(Collections.singleton(null)); + if (!vinSidList.isEmpty()) { + vinSidList.stream().forEach(v -> { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKTJ.getTypeKey()); + baseVehicleStateDto.setBusSid(v); + dtoList.add(baseVehicleStateDto); + }); + ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusDeliveredApply finalBusDeliveredApply = busDeliveredApply; + Future future1 = pool.submit(() -> { + //极光推送 + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("出库申请"); + messageFlowableQuery.setMsgContent(finalBusDeliveredApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + messageFlowableQuery.setMsgTitle("出库申请"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + }); + } catch (Exception e) { + e.printStackTrace(); + } + return voResultBean; } if (r == 2) { @@ -2219,7 +2413,31 @@ public class BusDeliveredApplyService extends MybatisBaseService vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sid); //更新该合同的该车架号的状态为0 - busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 0); +// busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 0); + //==============================新增车辆的持久状态组装数据 + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply; + Future future1 = pool.submit(() -> { + List dtoList = new ArrayList<>(); + vinSidList.removeAll(Collections.singleton(null)); + if (!vinSidList.isEmpty()) { + vinSidList.stream().forEach(v -> { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKTJ.getTypeKey()); + baseVehicleStateDto.setBusSid(v); + dtoList.add(baseVehicleStateDto); + }); + ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } //更新出库申请的状态为待审核2 baseMapper.updateStateBySid(2, sid); return complete(bv); @@ -2315,43 +2533,4 @@ public class BusDeliveredApplyService extends MybatisBaseService getRetrievalDetail(String contractSid) { -// ResultBean rb = ResultBean.fireFail(); -// AppDeliveredApplyInfoVo vo = new AppDeliveredApplyInfoVo(); -// BusDeliveredApply busDeliveredApply = fetchBySid(contractSid); -// BeanUtils.copyProperties(busDeliveredApply,vo); -// -// if (vo.getIsTerminal().equals(1)) { -// List voList = busDeliveredApplyDetailsService.appDetailsList(contractSid); -// voList.removeAll(Collections.singleton(null)); -// if (!voList.isEmpty()) { -// for (AppCarListVo v : voList) { -// CrmCustomerTempVo data = crmCustomerTempFeign.selByMobile(vo.getMobile()).getData(); -// AppUseInfoVo appUseInfoVo = new AppUseInfoVo(); -// appUseInfoVo.setMobile(data.getMobile()); -// appUseInfoVo.setCustomer(data.getName()); -// appUseInfoVo.setAddress(data.getAddress()); -// appUseInfoVo.setIdNumber(data.getIDNumber()); -// v.setUseInfo(appUseInfoVo); -// } -// } -// vo.setCarList(voList); -// -// } else if (vo.getIsTerminal().equals(0)) { -// //根据出库申请单的sid查询需要出库的车辆信息 -// List voList = busDeliveredApplyDetailsService.appDetailsList(contractSid); -// for (int i = 0; i < voList.size(); i++) { -// BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(voList.get(i).getUseMessageSid()); -// AppUseInfoVo appUseInfoVo = new AppUseInfoVo(); -// appUseInfoVo.setMobile(busDeliveredUseMessage.getMobile()); -// appUseInfoVo.setCustomer(busDeliveredUseMessage.getName()); -// appUseInfoVo.setAddress(busDeliveredUseMessage.getAddress()); -// appUseInfoVo.setIdNumber(busDeliveredUseMessage.getIdNo()); -// voList.get(i).setUseInfo(appUseInfoVo); -// } -// vo.setCarList(voList); -// } -// return rb.success().setData(vo); -// } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java index 8faf3f54f3..9fcee45478 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java @@ -114,6 +114,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper selectByNoAndVinSids(String contractNo); + List selectByNoAndVinSidsNew(String contractNo); List appVehicleQKKPList(@Param(Constants.WRAPPER) QueryWrapper qw); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml index 63d72d8b54..8832a83802 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml @@ -98,6 +98,15 @@ and length(bv.linkSid) > 0 + + diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml index 8dcf61c327..12fde0097c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml @@ -93,7 +93,7 @@ ${ew.sqlSegment} and length(furd.busVinSid) > 0 - group by furd.sid,currentReceivableMoney,furd.contractNo + group by furd.sid,currentReceivableMoney>0,furd.contractNo having currentReceivableMoney>0 order by furd.contractNo desc