diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java index 9f056d097a..891f27c724 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java @@ -135,7 +135,6 @@ public class BaseDiscountpackageService extends MybatisBaseService { BaseVehicleState selectOnes(String busSid); + + BusSalesOrder selevtByBusSid(String busSid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml index db8cf27569..f1c5456120 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml @@ -6,4 +6,10 @@ from base_vehicle_state where busSid = #{busSid} order by id desc limit 1 + + \ No newline at end of file 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 28b65054d3..4bb977ad6c 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 @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState; import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto; import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.result.ResultBean; import org.springframework.stereotype.Service; @@ -93,6 +94,36 @@ public class BaseVehicleStateService extends MybatisBaseService select RIGHT(bv.linkNo, 8) - from bus_delivered bd - left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid - where bd.contractNo = #{contractId} - and bd.state = 0 + from bus_sales_order_vehicle bv + left join bus_sales_order bo on bv.salesOrderSid = bo.sid + left join anrui_base.base_vehicle_state bs on bs.busSid = bv.sid + where bo.contractNo = #{contractId} + and (bs.busState>=402) and bv.linkSid in #{item} @@ -118,14 +119,18 @@ \ No newline at end of file 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 8ac348f0c7..d3fd099eba 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 @@ -2167,11 +2167,16 @@ public class BusDeliveredApplyService extends MybatisBaseService trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid(), busDeliveredApply.getContractNo()); - if (trailerList.getData().getList().isEmpty()) { + if(trailerList.getData() != null){ + if (trailerList.getData().getList().isEmpty()) { + appCarListVo.setShowHandCarBtn(false); + } else { + appCarListVo.setShowHandCarBtn(true); + } + }else{ appCarListVo.setShowHandCarBtn(false); - } else { - appCarListVo.setShowHandCarBtn(true); } + //优惠包使用情况 List discountUse = new ArrayList<>(); List discountsList = busDeliveredDetailsDiscountService.selectByVinSid(busDeliveredApplyDetails.getSid()); @@ -2225,6 +2230,7 @@ public class BusDeliveredApplyService extends MybatisBaseService discountUse = appCarListVo.getDiscountUse(); @@ -2234,6 +2240,7 @@ public class BusDeliveredApplyService extends MybatisBaseService num) { return rb.setMsg("本次出库为该订单最后一批出库，还存在未赠送的套餐，不允许提交"); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 636eaebf2e..350e1aa57d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -62,7 +62,8 @@ bo.contractNo as contractId, bo.staffName as saler, bo.procDefId, - bo.procInstId + bo.procInstId, + if(length(bo.nodeState)>0,true,false) as showRePublishBtn FROM bus_sales_order bo left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index e27bacf38b..a51cd317b9 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -465,7 +465,6 @@ public class BusSalesOrderService extends MybatisBaseService vinLists = busSalesOrderVehicleService.selectLists(sid); @@ -1316,19 +1315,21 @@ public class BusSalesOrderService extends MybatisBaseService initBigDecimalOneList = new ArrayList<>(); //是否是现车//ToDo:促销政策 if ("1".equals(busSalesOrder.getType())) { - //根据销售订单sid查询现车的sid集合 - vehicleList = busSalesOrderVehicleService.selectVehicleSid(sid); - //根据现车去查询销售政策的总促销政策之和 - if (vehicleList.size() > 0) { - for (int i = 0; i < vehicleList.size(); i++) { - BigDecimal initBigDecimalTwo = BigDecimal.ZERO; - //根据sid去查询销售政策的sid，根据销售政策查询销售政策的金额 - ResultBean> listResultBean = baseDiscountpackageFeign.getMoney(vehicleList.get(i), busSalesOrder.getUseOrgSid()); - if (listResultBean.getSuccess() && !listResultBean.getData().isEmpty()) { - List stringList = listResultBean.getData(); - initBigDecimalTwo = initBigDecimalTwo.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add)); + if(StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum())){ + //根据销售订单sid查询现车的sid集合 + vehicleList = busSalesOrderVehicleService.selectVehicleSid(sid); + //根据现车去查询销售政策的总促销政策之和 + if (vehicleList.size() > 0) { + for (int i = 0; i < vehicleList.size(); i++) { + BigDecimal initBigDecimalTwo = BigDecimal.ZERO; + //根据sid去查询销售政策的sid，根据销售政策查询销售政策的金额 + ResultBean> listResultBean = baseDiscountpackageFeign.getMoney(vehicleList.get(i), busSalesOrder.getUseOrgSid()); + if (listResultBean.getSuccess() && !listResultBean.getData().isEmpty()) { + List stringList = listResultBean.getData(); + initBigDecimalTwo = initBigDecimalTwo.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add)); + } + initBigDecimalOneList.add(initBigDecimalTwo.toString()); } - initBigDecimalOneList.add(initBigDecimalTwo.toString()); } } } @@ -1921,14 +1922,14 @@ public class BusSalesOrderService extends MybatisBaseService pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), ""); for (AppBusSalesOrderVo record : pagging.getRecords()) { /*************再次发起按钮显示****************/ - if (StringUtils.isNotBlank(pq.getParams().getType())) { + /* if (StringUtils.isNotBlank(pq.getParams().getType())) { String type = pq.getParams().getType(); if (type.equals("2")) { record.setShowRePublishBtn(true); } else { record.setShowRePublishBtn(false); } - } + }*/ /**************************************/ ResultBean commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(record.getSaleOrderSid()); if (commonContractVoResultBean.getData() != null) { @@ -2251,7 +2252,6 @@ public class BusSalesOrderService extends MybatisBaseService nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(saleOrderSid); - nowCarList.removeAll(Collections.singleton(null)); - if (!nowCarList.isEmpty()) { - orderInfo.setNowCarList(nowCarList); - boolean isCheck = isCheck(vinNoList, nowCarList, vinNoMap); - if (isCheck) { - orderInfo.setNotice("当前车型已经更新，请进行确认"); + if(StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum())){ + orderInfo.setNowCarUnknownVinNum(busSalesOrder.getNowCarUnknownVinNum()); + }else{ + //类型为现车，查询该销售订单的现车车辆信息 + List nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(saleOrderSid); + nowCarList.removeAll(Collections.singleton(null)); + if (!nowCarList.isEmpty()) { + orderInfo.setNowCarList(nowCarList); + boolean isCheck = isCheck(vinNoList, nowCarList, vinNoMap); + if (isCheck) { + orderInfo.setNotice("当前车型已经更新，请进行确认"); + } } } type = "0"; @@ -3402,7 +3406,6 @@ public class BusSalesOrderService extends MybatisBaseService vinList = busSalesOrderVehicleService.selectList(sid); List vinLists = busSalesOrderVehicleService.selectLists(sid); //包含采购系统的车架号 List vinList = vinLists.stream().map(v -> v.getVinNo()).collect(Collectors.toList()); @@ -3427,7 +3430,6 @@ public class BusSalesOrderService extends MybatisBaseService stringList = busSalesVehicleOrderService.selectList(sid); List stringLists = busSalesVehicleOrderService.selectLists(sid); //包含采购系统的采购订单编号 List stringList = stringLists.stream().map(v -> v.getLinkNo()).collect(Collectors.toList()); @@ -4779,7 +4781,7 @@ public class BusSalesOrderService extends MybatisBaseService resultBean = getSaleOrderDetails(businessSid); AppOrderDetailsVo vo = resultBean.getData();*/ - if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(busSalesOrderOne.getType())) { + if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(busSalesOrderOne.getType())) { //更新已选择的车架号的状态为审批中 List list = busSalesOrderVehicleService.selectVehicleSid(businessSid); BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery(); @@ -4869,7 +4871,7 @@ public class BusSalesOrderService extends MybatisBaseService resultBean = getSaleOrderDetails(businessSid); AppOrderDetailsVo vo = resultBean.getData();*/ - if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(busSalesOrderOne.getType())) { + if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(busSalesOrderOne.getType())) { //更新已选择的车架号的状态为审批中 List list = busSalesOrderVehicleService.selectVehicleSid(businessSid); BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery(); @@ -5153,13 +5155,18 @@ public class BusSalesOrderService extends MybatisBaseService details = getSaleOrderDetails(bv.getBusinessSid()); AppOrderDetailsVo vo = details.getData(); if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) { - //更新已选择的车架号的状态为销售订单锁定 - List list = busSalesOrderVehicleService.selectVehicleSid(bv.getBusinessSid()); - BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery(); - busMainDepositUpdateQuery.setVinSidList(list); - busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.ORDER_LOCK.getCode()); - busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.ORDER_LOCK.getRemarks()); - baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery); + if(StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum())){ + //更新已选择的车架号的状态为销售订单锁定 + List list = busSalesOrderVehicleService.selectVehicleSid(bv.getBusinessSid()); + list.removeAll(Collections.singleton(null)); + if(!list.isEmpty()){ + BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery(); + busMainDepositUpdateQuery.setVinSidList(list); + busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.ORDER_LOCK.getCode()); + busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.ORDER_LOCK.getRemarks()); + baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery); + } + } } //查询是否有合同，如果没有则生成合同 OrderContractQuery orderContractQuery = new OrderContractQuery(); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java index 6bfa4b553e..741196e497 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java @@ -233,47 +233,51 @@ public class BusSalesOrderModelService extends MybatisBaseService details = baseVehicleModelFeign.selectDetails(orderInfo.getModelSid()); - if (details.getData() != null) { - String vehicleKey = details.getData().getVehicleType(); - //除牵引外，其他类型的公告型号为必填项 - if(!BusSalesOrderConstantUtils.VehicleFunctions.TRACTION.getCode().equals(vehicleKey)){ - if(StringUtils.isBlank(orderInfo.getPublicModelSid())){ - return rb.setMsg("公告型号不能为空，如若不能选择请联系相关人员进行添加"); + //现车下不确定车架号的车辆数量 + String nowCarUnknownVinNum = orderInfo.getNowCarUnknownVinNum(); + if(StringUtils.isBlank(nowCarUnknownVinNum)){ + //添加上装信息=========== + ResultBean details = baseVehicleModelFeign.selectDetails(orderInfo.getModelSid()); + if (details.getData() != null) { + String vehicleKey = details.getData().getVehicleType(); + //除牵引外，其他类型的公告型号为必填项 + if (!BusSalesOrderConstantUtils.VehicleFunctions.TRACTION.getCode().equals(vehicleKey)) { + if (StringUtils.isBlank(orderInfo.getPublicModelSid())) { + return rb.setMsg("公告型号不能为空，如若不能选择请联系相关人员进行添加"); + } } - } - //（是否开启上装需要根据车辆功能载货、自卸、搅拌车、专用车的开启，且为必填） - if (BusSalesOrderConstantUtils.VehicleFunctions.DUMP.getCode().equals(vehicleKey) || - BusSalesOrderConstantUtils.VehicleFunctions.TRUCK.getCode().equals(vehicleKey) || - BusSalesOrderConstantUtils.VehicleFunctions.MIXER.getCode().equals(vehicleKey) || - BusSalesOrderConstantUtils.VehicleFunctions.SPECIAL.getCode().equals(vehicleKey)) { - if (topSidList.size() > 0) { - String topSid = topSidList.get(0); - String topSidVin = ""; - if ("0".equals(dto.getState())) {//现车 - String topPrice = ""; - for (int i = 0; i < nowCarList1.size(); i++) { - AppBusSalesOrderVehicleDto appBusSalesOrderVehicleDto = nowCarList1.get(i); - if(StringUtils.isNotBlank(appBusSalesOrderVehicleDto.getTopSid())){ - //根据车架号和上装配置以及分公司sid查询上装价格 - BaseVehinstall baseVehinstall = baseVehinstallFeign.selectOne(appBusSalesOrderVehicleDto.getLinkNo(),busSalesOrder.getUseOrgSid()).getData(); - if(baseVehinstall != null){ - topPrice = baseVehinstall.getGuidePrice(); + //（是否开启上装需要根据车辆功能载货、自卸、搅拌车、专用车的开启，且为必填） + if (BusSalesOrderConstantUtils.VehicleFunctions.DUMP.getCode().equals(vehicleKey) || + BusSalesOrderConstantUtils.VehicleFunctions.TRUCK.getCode().equals(vehicleKey) || + BusSalesOrderConstantUtils.VehicleFunctions.MIXER.getCode().equals(vehicleKey) || + BusSalesOrderConstantUtils.VehicleFunctions.SPECIAL.getCode().equals(vehicleKey)) { + if (topSidList.size() > 0) { + String topSid = topSidList.get(0); + String topSidVin = ""; + if ("0".equals(dto.getState())) {//现车 + String topPrice = ""; + for (int i = 0; i < nowCarList1.size(); i++) { + AppBusSalesOrderVehicleDto appBusSalesOrderVehicleDto = nowCarList1.get(i); + if (StringUtils.isNotBlank(appBusSalesOrderVehicleDto.getTopSid())) { + //根据车架号和上装配置以及分公司sid查询上装价格 + BaseVehinstall baseVehinstall = baseVehinstallFeign.selectOne(appBusSalesOrderVehicleDto.getLinkNo(), busSalesOrder.getUseOrgSid()).getData(); + if (baseVehinstall != null) { + topPrice = baseVehinstall.getGuidePrice(); + } } } - } - //判断是否与之前的相同，若相同则不用修改，若不同，则需要删除上装信息，重新添加一条 - List nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(salesOrderSid); - nowCarList.removeAll(Collections.singleton(null)); - if (!nowCarList.isEmpty()) { - List stringList = nowCarList.stream().map(AppNowCarListVo::getTopSid).filter(StringUtils::isNotBlank).collect(Collectors.toList()); - if (stringList.size() > 0) { - topSidVin = stringList.get(0); - } - if (StringUtils.isNotBlank(topSidVin)) { - if (!topSidVin.equals(topSid)) { - busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid); + //判断是否与之前的相同，若相同则不用修改，若不同，则需要删除上装信息，重新添加一条 + List nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(salesOrderSid); + nowCarList.removeAll(Collections.singleton(null)); + if (!nowCarList.isEmpty()) { + List stringList = nowCarList.stream().map(AppNowCarListVo::getTopSid).filter(StringUtils::isNotBlank).collect(Collectors.toList()); + if (stringList.size() > 0) { + topSidVin = stringList.get(0); + } + if (StringUtils.isNotBlank(topSidVin)) { + if (!topSidVin.equals(topSid)) { + szConfig(salesOrderSid,topSid,topPrice); + /* busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid); //新增上装 BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData(); BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup(); @@ -298,7 +302,7 @@ public class BusSalesOrderModelService extends MybatisBaseService appReadyCarList = busSalesVehicleOrderService.selectAppDetailsVoBySaleOrderSid(salesOrderSid); - appReadyCarList.removeAll(Collections.singleton(null)); - String topPrice = ""; - for (int i = 0; i stringList = appReadyCarList.stream().map(AppReadyCarListVo::getTopSid).filter(StringUtils::isNotBlank).collect(Collectors.toList()); - if (stringList.size() > 0) { - topSidVin = stringList.get(0); + if ("1".equals(dto.getState())) {//采购订单 + List appReadyCarList = busSalesVehicleOrderService.selectAppDetailsVoBySaleOrderSid(salesOrderSid); + appReadyCarList.removeAll(Collections.singleton(null)); + String topPrice = ""; + for (int i = 0; i < readyCarList1.size(); i++) { + //根据采购订单查询上装的配置 + AppBusSalesVehicleOrderDto appBusSalesVehicleOrderDto = readyCarList1.get(i); + BusVehicleApplySz busVehicleApplySz = busVehicleOrderFeign.selectApplySz(appBusSalesVehicleOrderDto.getLinkSid()).getData(); + if (busVehicleApplySz != null) { + topPrice = busVehicleApplySz.getGuidePrice(); + } } - if (StringUtils.isNotBlank(topSidVin)) { - if (!topSidVin.equals(topSid)) { - busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid); - //新增上装 - BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData(); - BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup(); - busSalesOrderMakeup.setSalesOrderSid(salesOrderSid); - //上装名称 - busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue()); - busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey()); - //委改方式 - busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue()); - busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey()); - //委改厂 - busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory()); - //外廓尺寸 - busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long()); - busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide()); - busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high()); - //板材材质 - busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue()); - busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey()); - //板材厚度 - busSalesOrderMakeup.setPlateThickness("底：" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边：" + baseVehinstallmodel.getPlateThicknessEdge() + "mm"); - busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom()); - busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge()); - //上装价格 - if(StringUtils.isNotBlank(topPrice)){ - busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice)); + if (!appReadyCarList.isEmpty()) { + List stringList = appReadyCarList.stream().map(AppReadyCarListVo::getTopSid).filter(StringUtils::isNotBlank).collect(Collectors.toList()); + if (stringList.size() > 0) { + topSidVin = stringList.get(0); + } + if (StringUtils.isNotBlank(topSidVin)) { + if (!topSidVin.equals(topSid)) { + busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid); + //新增上装 + BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData(); + BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup(); + busSalesOrderMakeup.setSalesOrderSid(salesOrderSid); + //上装名称 + busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue()); + busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey()); + //委改方式 + busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue()); + busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey()); + //委改厂 + busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory()); + //外廓尺寸 + busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long()); + busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide()); + busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high()); + //板材材质 + busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue()); + busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey()); + //板材厚度 + busSalesOrderMakeup.setPlateThickness("底：" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边：" + baseVehinstallmodel.getPlateThicknessEdge() + "mm"); + busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom()); + busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge()); + //上装价格 + if (StringUtils.isNotBlank(topPrice)) { + busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice)); + } + //更多配置 + busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig()); + //颜色 + busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue()); + busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey()); + //篷布滑道 + busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide()); + //冷藏冷机 + busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator()); + //自卸液压盖板 + busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl()); + //地板加热 + busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating()); + busSalesOrderMakeup.setBuyTypeKey("01"); + busSalesOrderMakeup.setBuyTypeValue("公司采购"); + busSalesOrderMakeup.setIsMain(0); + busSalesOrderMakeupService.insert(busSalesOrderMakeup); + busSalesOrderService.updateMakeUp(salesOrderSid, "1"); + } + } else { + if (StringUtils.isNotBlank(topSid)) { + busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid); + //新增上装 + BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData(); + BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup(); + busSalesOrderMakeup.setSalesOrderSid(salesOrderSid); + //上装名称 + busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue()); + busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey()); + //委改方式 + busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue()); + busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey()); + //委改厂 + busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory()); + //外廓尺寸 + busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long()); + busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide()); + busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high()); + //板材材质 + busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue()); + busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey()); + //板材厚度 + busSalesOrderMakeup.setPlateThickness("底：" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边：" + baseVehinstallmodel.getPlateThicknessEdge() + "mm"); + busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom()); + busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge()); + //上装价格 + if (StringUtils.isNotBlank(topPrice)) { + busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice)); + } + //更多配置 + busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig()); + //颜色 + busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue()); + busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey()); + //篷布滑道 + busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide()); + //冷藏冷机 + busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator()); + //自卸液压盖板 + busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl()); + //地板加热 + busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating()); + busSalesOrderMakeup.setBuyTypeKey("01"); + busSalesOrderMakeup.setBuyTypeValue("公司采购"); + busSalesOrderMakeup.setIsMain(0); + busSalesOrderMakeupService.insert(busSalesOrderMakeup); + busSalesOrderService.updateMakeUp(salesOrderSid, "1"); } - //更多配置 - busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig()); - //颜色 - busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue()); - busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey()); - //篷布滑道 - busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide()); - //冷藏冷机 - busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator()); - //自卸液压盖板 - busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl()); - //地板加热 - busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating()); - busSalesOrderMakeup.setBuyTypeKey("01"); - busSalesOrderMakeup.setBuyTypeValue("公司采购"); - busSalesOrderMakeup.setIsMain(0); - busSalesOrderMakeupService.insert(busSalesOrderMakeup); - busSalesOrderService.updateMakeUp(salesOrderSid, "1"); } } else { - if (StringUtils.isNotBlank(topSid)) { - busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid); - //新增上装 - BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData(); - BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup(); - busSalesOrderMakeup.setSalesOrderSid(salesOrderSid); - //上装名称 - busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue()); - busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey()); - //委改方式 - busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue()); - busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey()); - //委改厂 - busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory()); - //外廓尺寸 - busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long()); - busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide()); - busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high()); - //板材材质 - busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue()); - busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey()); - //板材厚度 - busSalesOrderMakeup.setPlateThickness("底：" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边：" + baseVehinstallmodel.getPlateThicknessEdge() + "mm"); - busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom()); - busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge()); - //上装价格 - if(StringUtils.isNotBlank(topPrice)){ - busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice)); - } - //更多配置 - busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig()); - //颜色 - busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue()); - busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey()); - //篷布滑道 - busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide()); - //冷藏冷机 - busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator()); - //自卸液压盖板 - busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl()); - //地板加热 - busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating()); - busSalesOrderMakeup.setBuyTypeKey("01"); - busSalesOrderMakeup.setBuyTypeValue("公司采购"); - busSalesOrderMakeup.setIsMain(0); - busSalesOrderMakeupService.insert(busSalesOrderMakeup); - busSalesOrderService.updateMakeUp(salesOrderSid, "1"); + busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid); + //新增上装 + BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData(); + BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup(); + busSalesOrderMakeup.setSalesOrderSid(salesOrderSid); + //上装名称 + busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue()); + busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey()); + //委改方式 + busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue()); + busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey()); + //委改厂 + busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory()); + //外廓尺寸 + busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long()); + busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide()); + busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high()); + //板材材质 + busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue()); + busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey()); + //板材厚度 + busSalesOrderMakeup.setPlateThickness("底：" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边：" + baseVehinstallmodel.getPlateThicknessEdge() + "mm"); + busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom()); + busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge()); + //上装价格 + if (StringUtils.isNotBlank(topPrice)) { + busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice)); } + //更多配置 + busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig()); + //颜色 + busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue()); + busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey()); + //篷布滑道 + busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide()); + //冷藏冷机 + busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator()); + //自卸液压盖板 + busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl()); + //地板加热 + busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating()); + busSalesOrderMakeup.setBuyTypeKey("01"); + busSalesOrderMakeup.setBuyTypeValue("公司采购"); + busSalesOrderMakeup.setIsMain(0); + busSalesOrderMakeupService.insert(busSalesOrderMakeup); + busSalesOrderService.updateMakeUp(salesOrderSid, "1"); } - } else { - busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid); - //新增上装 - BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData(); - BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup(); - busSalesOrderMakeup.setSalesOrderSid(salesOrderSid); - //上装名称 - busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue()); - busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey()); - //委改方式 - busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue()); - busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey()); - //委改厂 - busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory()); - //外廓尺寸 - busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long()); - busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide()); - busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high()); - //板材材质 - busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue()); - busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey()); - //板材厚度 - busSalesOrderMakeup.setPlateThickness("底：" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边：" + baseVehinstallmodel.getPlateThicknessEdge() + "mm"); - busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom()); - busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge()); - //上装价格 - if(StringUtils.isNotBlank(topPrice)){ - busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice)); - } - //更多配置 - busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig()); - //颜色 - busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue()); - busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey()); - //篷布滑道 - busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide()); - //冷藏冷机 - busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator()); - //自卸液压盖板 - busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl()); - //地板加热 - busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating()); - busSalesOrderMakeup.setBuyTypeKey("01"); - busSalesOrderMakeup.setBuyTypeValue("公司采购"); - busSalesOrderMakeup.setIsMain(0); - busSalesOrderMakeupService.insert(busSalesOrderMakeup); - busSalesOrderService.updateMakeUp(salesOrderSid, "1"); } + } else { + //删除上装信息 + busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid); + busSalesOrderService.updateMakeUp1(salesOrderSid); } } else { //删除上装信息 busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid); busSalesOrderService.updateMakeUp1(salesOrderSid); } - } else { - //删除上装信息 - busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid); - busSalesOrderService.updateMakeUp1(salesOrderSid); } } + String state = dto.getState(); if ("2".equals(state)) {//需采购 //查询现车和采购订单是否有数据、若有数据，则查询topSid是否有值，若有值，则删除上装信息、若无值，则继续 @@ -652,7 +661,7 @@ public class BusSalesOrderModelService extends MybatisBaseService 0) { List topSidLists = vinList.stream().map(v -> v.getTopSid()).filter(StringUtils::isNotBlank).collect(Collectors.toList()); - if(topSidLists.size()>0){ + if (topSidLists.size() > 0) { //清除上装信息 busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid); } @@ -661,7 +670,7 @@ public class BusSalesOrderModelService extends MybatisBaseService 0) { List topSidLists = orderList.stream().map(v -> v.getTopSid()).filter(StringUtils::isNotBlank).collect(Collectors.toList()); - if(topSidLists.size()>0){ + if (topSidLists.size() > 0) { //清除上装信息 busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid); } @@ -676,9 +685,17 @@ public class BusSalesOrderModelService extends MybatisBaseService nowCarList = orderInfo.getNowCarList(); - busSalesOrderVehicleService.saveAppVehicle(nowCarList, salesOrderSid); - num = nowCarList.size(); + if(StringUtils.isNotBlank(nowCarUnknownVinNum)){//不确定车架号 + num = Integer.valueOf(nowCarUnknownVinNum).intValue(); + busSalesOrder = busSalesOrderService.fetchBySid(salesOrderSid); + busSalesOrder.setNowCarUnknownVinNum(nowCarUnknownVinNum); + busSalesOrderService.updateById(busSalesOrder); + }else{ + List nowCarList = orderInfo.getNowCarList(); + busSalesOrderVehicleService.saveAppVehicle(nowCarList, salesOrderSid); + num = nowCarList.size(); + } + } if ("1".equals(state)) {//采购订单 List readyCarList = orderInfo.getReadyCarList(); @@ -749,7 +766,7 @@ public class BusSalesOrderModelService extends MybatisBaseService listPageVo(PagerQuery pq) { FinFundsCarriedForwardApplyQuery query = pq.getParams(); @@ -694,7 +697,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); + ResultBean voResultBean = flowFeign.startProcess(bv); if (!voResultBean.getSuccess()) { return rb.setMsg(voResultBean.getMsg()); } @@ -705,18 +708,31 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + FinFundsCarriedForwardApply finalFinFundsCarriedForwardApply = finFundsCarriedForwardApply; + 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(finalFinFundsCarriedForwardApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + messageFlowableQuery.setMsgTitle("款项结转申请"); + messageFeign.pushMessage(messageFlowableQuery); + }); + } catch (Exception e) { + e.printStackTrace(); + } + return voResultBean; } if (r == 2) { @@ -1213,7 +1229,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); + ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } @@ -1231,18 +1247,31 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + FinFundsCarriedForwardApply finalFinFundsCarriedForwardApply = finFundsCarriedForwardApply; + Future future1 = pool.submit(() -> { + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + ufVo.setProcDefId(finalFinFundsCarriedForwardApply.getProcDefId()); + ufVo.setProcInsId(finalFinFundsCarriedForwardApply.getProcInstSid()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("款项结转申请"); + messageFlowableQuery.setMsgContent(finalFinFundsCarriedForwardApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + messageFlowableQuery.setMsgTitle("款项结转申请"); + messageFeign.pushMessage(messageFlowableQuery); + }); + } catch (Exception e) { + e.printStackTrace(); + } + } return rb.success().setData(resultBean.getData()); } else { @@ -1282,18 +1311,32 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + FinFundsCarriedForwardApply finalFinFundsCarriedForwardApply = finFundsCarriedForwardApply; + Future future1 = pool.submit(() -> { + //极光推送 + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + ufVo.setProcDefId(finalFinFundsCarriedForwardApply.getProcDefId()); + ufVo.setProcInsId(finalFinFundsCarriedForwardApply.getProcInstSid()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("款项结转申请"); + messageFlowableQuery.setMsgContent(finalFinFundsCarriedForwardApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + messageFlowableQuery.setMsgTitle("款项结转申请"); + messageFeign.pushMessage(messageFlowableQuery); + }); + } catch (Exception e) { + e.printStackTrace(); + } + } return rb.success().setData(resultBean.getData()); } else { @@ -1405,6 +1448,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService useDeptList = new ArrayList<>(); + @ApiModelProperty("产品类别key") + private String productTypeKey; + @ApiModelProperty("产品类别value") + private String productTypeValue; + @ApiModelProperty("业务类型key") + private String busTypeKey; + @ApiModelProperty("业务类型value") + private String busTypeValue; + @ApiModelProperty("车辆大类key") + private String vehCategoryKey; + @ApiModelProperty("车辆大类value") + private String vehCategoryValue; + @ApiModelProperty("车辆功能key") + private String vehTypeKey; + @ApiModelProperty("车辆功能value") + private String vehTypeValue; + @ApiModelProperty("最高融资额比例（%）") + private String maxLoanRatio; + @ApiModelProperty("最高融资额") + private String maxLoanAmount; + @ApiModelProperty("期数") + private int period; + private String periodKey; + @ApiModelProperty("年利率（%）") + private String yearRatio; + @ApiModelProperty("有效期至") + private String validDateTo; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("创建组织名称") + private String createOrgName; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("使用组织名称") + private String useOrgName; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java index 0db09ce6a8..fdb0416128 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java @@ -2,6 +2,9 @@ package com.yxt.anrui.riskcenter.api.loanfinotherPolicy; import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyQuery; import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyVo; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyStateQuery; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanRiskStateQuery; +import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyDto; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -30,6 +33,16 @@ public interface LoanFinOtherPolicyFeign { @ResponseBody public ResultBean> listPage(@RequestBody PagerQuery pq); + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody LoanFinOtherPolicyDtos dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + @GetMapping("details") @ApiOperation("详情") ResultBean details(@RequestParam("sid") String sid); @@ -37,4 +50,12 @@ public interface LoanFinOtherPolicyFeign { @GetMapping("selectList") @ApiOperation("获取产品政策下其他融，或分公司下其他融") ResultBean> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam("sid") String sid); + + @ApiOperation("使用状态停用、开启:useState为1时走停用，为0时走开启") + @PostMapping("setState") + ResultBean setState(@RequestBody LoanFinOtherPolicyStateQuery query); + + @ApiOperation("风控状态禁用、启用:useState为1时走禁用，为0时走启用") + @PostMapping("setRiskState") + ResultBean setRiskState(@RequestBody LoanOtherRiskStateQuery query); } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyPageVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyPageVo.java index ab5008fdb3..810350df0d 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyPageVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyPageVo.java @@ -18,11 +18,11 @@ public class LoanFinOtherPolicyPageVo implements Vo { private String sid; @ApiModelProperty("报备状态：1已报备，0未报备") - private int filingState; + private String filingState; @ApiModelProperty("风控状态：1禁用 0正常 风控中心设置的状态") - private int riskState; + private String riskState; @ApiModelProperty("使用状态：1停用 0正常 各分公司设置的状态") - private int useSate; + private String useSate; @ApiModelProperty("有效期至") private String validDateTo; @ApiModelProperty("创建组织名称") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyQuery.java index 62a6e46fd5..8b885d81d1 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyQuery.java @@ -15,11 +15,13 @@ import java.math.BigDecimal; public class LoanFinOtherPolicyQuery implements Query { @ApiModelProperty("报备状态：1已报备，0未报备") - private int filingState; + private String filingState; @ApiModelProperty("风控状态：1禁用 0正常 风控中心设置的状态") - private int riskState; + private String riskState; @ApiModelProperty("使用状态：1停用 0正常 各分公司设置的状态") - private int useSate; + private String useSate; + @ApiModelProperty("创建组织sid") + private String createOrgSid; @ApiModelProperty("创建组织名称") private String createOrgName; @ApiModelProperty("业务类型value") @@ -35,7 +37,7 @@ public class LoanFinOtherPolicyQuery implements Query { @ApiModelProperty("结束有效期至") private String validEndDateTo; @ApiModelProperty("期数") - private int period; + private String period; @ApiModelProperty("年利率（%）") - private BigDecimal yearRatio; + private String yearRatio; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyStateQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyStateQuery.java new file mode 100644 index 0000000000..4897311b28 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyStateQuery.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.riskcenter.api.loanfinotherPolicy; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/7/11 + **/ +@Data +public class LoanFinOtherPolicyStateQuery { + @ApiModelProperty("sids") + private List sidsList = new ArrayList<>(); + @ApiModelProperty("useState为1时走停用，为0时走开启") + private String useState; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanOtherRiskStateQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanOtherRiskStateQuery.java new file mode 100644 index 0000000000..89fa4b132d --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanOtherRiskStateQuery.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.riskcenter.api.loanfinotherPolicy; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/7/11 + **/ +@Data +public class LoanOtherRiskStateQuery { + + @ApiModelProperty("sids") + private List sidsList = new ArrayList<>(); + @ApiModelProperty("riskState为1时走禁用，为0时走启用") + private String riskState; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java index cfaf69335d..512caa5a93 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java @@ -44,7 +44,7 @@ public interface LoanFinPolicyFeign { ResultBean setRiskState(@RequestBody LoanRiskStateQuery query); @ApiOperation("金融产品政策管理分页列表") - @PostMapping("pagerList") + @PostMapping("pager/base/v1/commoncontract/fetcist") ResultBean> pagerList(@RequestBody PagerQuery pagerQuery); @ApiOperation("app金融产品资方常规") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java index 7e82ef1f41..36ca9d453e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java @@ -1,11 +1,13 @@ package com.yxt.anrui.riskcenter.biz.loanfinotherPolicy; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.AppOtherPolicyVo; -import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy; -import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyVos; -import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.OtherPolicyVo; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.*; +import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -29,4 +31,6 @@ public interface LoanFinOtherPolicyMapper extends BaseMapper List selectListOne(String sid); List selectListTwo(String useOrgSid); + + IPage selectPageVo(IPage page,@Param(Constants.WRAPPER)QueryWrapper qw); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml index 49a6ec6e7e..a2c835439e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml @@ -44,4 +44,34 @@ and lfo.filingState = 2 and lfo.validDateTo > now() + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java index 2e5ef8f72d..e17999d624 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java @@ -1,6 +1,9 @@ package com.yxt.anrui.riskcenter.biz.loanfinotherPolicy; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.*; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyStateQuery; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanRiskStateQuery; +import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -26,7 +29,20 @@ public class LoanFinOtherPolicyRest implements LoanFinOtherPolicyFeign { @Override public ResultBean> listPage(PagerQuery pq) { - return null; + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = loanFinOtherPolicyService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean save(LoanFinOtherPolicyDtos dto) { + return loanFinOtherPolicyService.saveOrUpdateDto(dto); + } + + @Override + public ResultBean delBySids(String[] sids) { + loanFinOtherPolicyService.delBySids(sids); + return new ResultBean().success(); } @Override @@ -38,4 +54,14 @@ public class LoanFinOtherPolicyRest implements LoanFinOtherPolicyFeign { public ResultBean> selectList(String orgPath, String userSid, String sid) { return loanFinOtherPolicyService.selectList(orgPath,userSid,sid); } + + @Override + public ResultBean setState(LoanFinOtherPolicyStateQuery query) { + return loanFinOtherPolicyService.setState(query); + } + + @Override + public ResultBean setRiskState(LoanOtherRiskStateQuery query) { + return loanFinOtherPolicyService.setRiskState(query); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java index 909a6afd07..1242c770cb 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java @@ -1,14 +1,27 @@ package com.yxt.anrui.riskcenter.biz.loanfinotherPolicy; +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.base.api.commonappendix.CommonAppendixDto; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; -import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.AppOtherPolicyVo; -import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy; -import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyVos; -import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.OtherPolicyVo; +import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; +import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.*; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyStateQuery; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanRiskStateQuery; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.UseDept; +import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.*; +import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDto; 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.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Collections; import java.util.List; @@ -66,4 +79,135 @@ public class LoanFinOtherPolicyService extends MybatisBaseService listPageVo(PagerQuery pq) { + LoanFinOtherPolicyQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("createOrgSid",query.getCreateOrgSid()); + if (StringUtils.isNotBlank(query.getCreateOrgName())) { + qw.like("createOrgName", query.getCreateOrgName()); + } + if (StringUtils.isNotBlank(query.getFilingState())) { + qw.eq("filingState", query.getFilingState()); + } + if (StringUtils.isNotBlank(query.getRiskState())) { + qw.eq("riskState", query.getRiskState()); + } + if (StringUtils.isNotBlank(query.getUseSate())) { + qw.eq("useSate", query.getUseSate()); + } + if (StringUtils.isNotBlank(query.getBusTypeValue())) { + qw.like("busTypeValue", query.getBusTypeValue()); + } + if (StringUtils.isNotBlank(query.getVehCategoryValue())) { + qw.like("vehCategoryValue", query.getVehCategoryValue()); + } + if (StringUtils.isNotBlank(query.getVehTypeValue())) { + qw.like("vehTypeValue", query.getVehTypeValue()); + } + if (StringUtils.isNotBlank(query.getOtherPolicyName())) { + qw.like("otherPolicyName", query.getOtherPolicyName()); + } + if (StringUtils.isNotBlank(query.getYearRatio())) { + qw.like("yearRatio", query.getYearRatio()); + } + String validStartDateTo = query.getValidStartDateTo(); + String validEndDateTo = query.getValidEndDateTo(); + qw.apply(StringUtils.isNotEmpty(validStartDateTo), "date_format (validDateTo,'%Y-%m-%d') >= date_format('" + validStartDateTo + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(validEndDateTo), "date_format (validDateTo,'%Y-%m-%d') <= date_format('" + validEndDateTo + "','%Y-%m-%d')" + ); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean saveOrUpdateDto(LoanFinOtherPolicyDtos dto) { + ResultBean rb = ResultBean.fireFail(); + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) {//新增 + this.insertByDto(dto); + return rb.success(); + } + this.updateByDto(dto); + return rb.success(); + } + + public void insertByDto(LoanFinOtherPolicyDtos dto) { + List useDeptList = dto.getUseDeptList(); + LoanFinOtherPolicy entity = new LoanFinOtherPolicy(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + String useDeptSid = ""; + String useDeptName = ""; + for (UseDept useDept : useDeptList) { + useDeptSid = useDeptSid + useDept.getDeptSid() + ","; + useDeptName = useDeptName + useDept.getDeptName() + ","; + } + entity.setOtherPolicyName(entity.getBankShortName() + entity.getProductTypeValue() + entity.getYearRatio() + entity.getPeriod()); + entity.setUseDeptSids(useDeptSid.substring(0,useDeptSid.lastIndexOf(","))); + entity.setUseDeptNames(useDeptName.substring(0,useDeptName.lastIndexOf(","))); + baseMapper.insert(entity); + } + + public void updateByDto(LoanFinOtherPolicyDtos dto) { + String dtoSid = dto.getSid(); + List useDeptList = dto.getUseDeptList(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + LoanFinOtherPolicy entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + String useDeptSid = ""; + String useDeptName = ""; + for (UseDept useDept : useDeptList) { + useDeptSid = useDeptSid + useDept.getDeptSid() + ","; + useDeptName = useDeptName + useDept.getDeptName() + ","; + } + entity.setOtherPolicyName(entity.getBankShortName() + entity.getProductTypeValue() + entity.getYearRatio() + entity.getPeriod()); + entity.setUseDeptSids(useDeptSid.substring(0,useDeptSid.lastIndexOf(","))); + entity.setUseDeptNames(useDeptName.substring(0,useDeptName.lastIndexOf(","))); + baseMapper.updateById(entity); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean setState(LoanFinOtherPolicyStateQuery query) { + ResultBean rb = ResultBean.fireFail(); + //ToDo:是否可以停用或开启，需补充条件 + List sidsList = query.getSidsList(); + sidsList.removeAll(Collections.singleton(null)); + if (sidsList.isEmpty()) { + return rb.setMsg("请选择数据"); + } + String useState = query.getUseState(); + for (String sid : sidsList) { + LoanFinOtherPolicy loanFinOtherPolicy = fetchBySid(sid); + if (loanFinOtherPolicy == null) { + return rb.setMsg("选择的其他融产品不存在"); + } + loanFinOtherPolicy.setUseSate(Integer.valueOf(useState).intValue()); + baseMapper.updateById(loanFinOtherPolicy); + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean setRiskState(LoanOtherRiskStateQuery query) { + ResultBean rb = ResultBean.fireFail(); + //ToDo:是否可以停用或开启，需补充条件 + List sidsList = query.getSidsList(); + sidsList.removeAll(Collections.singleton(null)); + if (sidsList.isEmpty()) { + return rb.setMsg("请选择数据"); + } + String riskState = query.getRiskState(); + for (String sid : sidsList) { + LoanFinOtherPolicy loanFinOtherPolicy = fetchBySid(sid); + if (loanFinOtherPolicy == null) { + return rb.setMsg("选择的其他融产品不存在"); + } + loanFinOtherPolicy.setRiskState(Integer.valueOf(riskState).intValue()); + baseMapper.updateById(loanFinOtherPolicy); + } + return rb.success(); + } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ModelDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ModelDto.java index fdb6b7bcaf..d0908739b7 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ModelDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ModelDto.java @@ -39,4 +39,6 @@ public class ModelDto implements Dto { + + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/OrderInfoDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/OrderInfoDto.java index 6000d0fd13..57a5bb24c7 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/OrderInfoDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/OrderInfoDto.java @@ -47,4 +47,7 @@ public class OrderInfoDto implements Dto { private String publicModelSid; @ApiModelProperty("公告型号配置") private String publicModelSon; + + @ApiModelProperty("现车下不确定车架号的车辆数量") + private String nowCarUnknownVinNum; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/OrderInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/OrderInfoVo.java index 2486dfbb60..0710114879 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/OrderInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/OrderInfoVo.java @@ -55,4 +55,8 @@ public class OrderInfoVo implements Vo { @ApiModelProperty("公告型号是否可空：true，false必填") private boolean publicModelNullable; + + @ApiModelProperty("现车下不确定车架号的车辆数量") + private String nowCarUnknownVinNum; + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java index 389efde692..5145e095cc 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java @@ -673,7 +673,7 @@ public class AppBusSalesOrderService { List list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), SystemVo.class)).collect(Collectors.toList()); flowOrderVo.setList(list); } - if ("3".equals(busSalesOrder.getType())) { + if ("3".equals(busSalesOrder.getType()) || StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum())) { flowOrderVo.setShow(true); } else { flowOrderVo.setShow(false); diff --git a/工作内容需要的文档/单据模板/款项结转打印模板/jzsqjg.ftl b/工作内容需要的文档/单据模板/款项结转打印模板/jzsqjg.ftl index 9bcea29f9d..abaaa59b7b 100644 --- a/工作内容需要的文档/单据模板/款项结转打印模板/jzsqjg.ftl +++ b/工作内容需要的文档/单据模板/款项结转打印模板/jzsqjg.ftl @@ -90,17 +90,13 @@ - - - - - - - - - - + + + + + + @@ -128,7 +124,7 @@ - + @@ -206,7 +202,7 @@ - + @@ -261,8 +257,7 @@ - - + @@ -317,7 +312,7 @@ - + @@ -356,104 +351,6 @@ - - - - - - - - - - 申请部门： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${applyDept!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -464,24 +361,13 @@ - - - - - - - - - - - - 申请人： + 申请部门： - + @@ -531,13 +417,13 @@ - ${applyPeo!} + ${applyDept!} - + @@ -592,7 +478,7 @@ - + @@ -670,7 +556,6 @@ - @@ -719,7 +604,6 @@ - @@ -768,6 +652,7 @@ + @@ -816,7 +701,6 @@ - @@ -865,7 +749,7 @@ - + @@ -984,7 +868,6 @@ - @@ -1030,7 +913,6 @@ - @@ -1071,6 +953,7 @@ + @@ -1111,7 +994,6 @@ - @@ -1152,7 +1034,7 @@ - + @@ -1311,14 +1193,14 @@ xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"> 1 - 57 - 164 + 52 + 148 0 0 2 false false - 164 + 148 WPS Office_11.1.0.14309_F1E327BC-269C-435d-A152-05C5408002CA 0 @@ -1334,7 +1216,7 @@ 2014-10-29T12:08:00Z God 文档存本地丢失不负责 - 2023-07-27T03:16:23Z + 2023-07-31T08:33:33Z @@ -1347,7 +1229,7 @@ 2052-11.1.0.14309 - 2D380203F5044904B1BE9AE51DA87754_13 + 97A810377C06437C8F0D67126FFA892D_13 @@ -1863,6 +1745,7 @@ + @@ -1875,6 +1758,7 @@ + @@ -1883,6 +1767,7 @@ + @@ -1893,6 +1778,7 @@ + @@ -1927,13 +1813,14 @@ - + + @@ -1956,18 +1843,16 @@ - - + - - + @@ -2006,6 +1891,7 @@ + @@ -2028,19 +1914,18 @@ - - - + + diff --git a/工作内容需要的文档/单据模板/款项结转打印模板/jzsqzks.ftl b/工作内容需要的文档/单据模板/款项结转打印模板/jzsqzks.ftl index 4482443354..7331e33f78 100644 --- a/工作内容需要的文档/单据模板/款项结转打印模板/jzsqzks.ftl +++ b/工作内容需要的文档/单据模板/款项结转打印模板/jzsqzks.ftl @@ -87,17 +87,13 @@ - - - - - - - - - - - + + + + + + + @@ -124,7 +120,7 @@ - + @@ -202,7 +198,7 @@ - + @@ -257,8 +253,7 @@ - - + @@ -313,8 +308,7 @@ - - + @@ -353,104 +347,6 @@ - - - - - - - - - - 申请部门： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${applyDept!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -461,24 +357,13 @@ - - - - - - - - - - - - 申请人： + 申请部门： - + @@ -528,13 +413,13 @@ - ${applyPeo!} + ${applyDept!} - + @@ -589,7 +474,8 @@ - + + @@ -666,7 +552,6 @@ - @@ -715,7 +600,6 @@ - @@ -764,7 +648,7 @@ - + @@ -813,7 +697,6 @@ - @@ -981,7 +864,6 @@ - @@ -1027,7 +909,6 @@ - @@ -1068,7 +949,7 @@ - + @@ -1109,7 +990,6 @@ - @@ -1274,14 +1154,14 @@ xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"> 1 - 57 - 164 + 52 + 148 0 0 1 false false - 164 + 148 WPS Office_11.1.0.14309_F1E327BC-269C-435d-A152-05C5408002CA 0 @@ -1297,7 +1177,7 @@ 2014-10-29T12:08:00Z God 文档存本地丢失不负责 - 2023-07-27T03:17:59Z + 2023-07-31T08:35:25Z @@ -1310,7 +1190,7 @@ 2052-11.1.0.14309 - 21863D8A3CFD4FDB924FD0A9161B1128_13 + 32E34B51FAB641798E823A5E057B5988_13 @@ -1702,6 +1582,7 @@ + @@ -1726,8 +1607,8 @@ - + @@ -1745,7 +1626,6 @@ - @@ -1762,9 +1642,11 @@ + + @@ -1773,6 +1655,7 @@ + @@ -1794,8 +1677,6 @@ - - @@ -1813,6 +1694,7 @@ + @@ -1862,7 +1744,6 @@ -