From f9d0d4f521d4e3998643e456f149e6b074255b3b Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 13 Jul 2022 13:57:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=92=8C=E8=BD=A6=E5=9E=8B=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/busvehicleorder/BusVehicleOrderListVo.java | 2 ++ .../biz/busvehicleorder/BusVehicleOrderMapper.xml | 3 ++- .../base/biz/busvehicleorder/BusVehicleOrderRest.java | 11 ++++++----- .../biz/crmcustomertemp/CrmCustomerTempMapper.java | 4 ++-- .../biz/crmcustomertemp/CrmCustomerTempService.java | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderListVo.java index b3d36db51f..eb4c13ec28 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderListVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderListVo.java @@ -24,6 +24,8 @@ public class BusVehicleOrderListVo implements Vo { private String orderDate; @ApiModelProperty(value = "数量") private String quantity; + @ApiModelProperty(value = "可用数量") + private String useNum; @ApiModelProperty(value = "预计上线时间") @JsonSerialize(using = ToStringSerializer.class) private String expectLaunchDate; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml index bf715b95c2..21ce51c454 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml @@ -50,7 +50,8 @@ bvo.expectLaunchDate, bvo.launchDate, bvo.offlineDate, - cast((cast(bvo.platformNo as signed)-IFNULL(cast(bvo.lockingNum as signed),'0')) as signed) as quantity + cast(bvo.platformNo as signed) as quantity, + cast((cast(bvo.platformNo as signed)-IFNULL(cast(bvo.lockingNum as signed),'0')) as signed) as useNum FROM bus_vehicle_order bvo LEFT JOIN bus_vehicle_apply_detail bvad ON bvo.purchaseApplyMediumModelSid = bvad.sid diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java index 6f2c916bf1..6dd49da2d3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java @@ -128,16 +128,17 @@ public class BusVehicleOrderRest implements BusVehicleOrderFeign { for (BusVehicleOrderListVo v : listVoList) { if (StringUtils.isNotBlank(v.getExpectLaunchDate())) { v.setOrderStatus("未上线"); - } else if (StringUtils.isNotBlank(v.getLaunchDate())) { + } + if (StringUtils.isNotBlank(v.getLaunchDate())) { v.setOrderStatus("上线"); - } else if (StringUtils.isNotBlank(v.getOfflineDate())) { + } + if (StringUtils.isNotBlank(v.getOfflineDate())) { v.setOrderStatus("下线"); - } else { + } + if(StringUtils.isBlank(v.getOrderStatus())){ v.setOrderStatus("待办"); } } - - } PagerVo pv = new PagerVo<>(); PagerVo pv1 = PagerUtil.pageToVo(page, pv); diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java index 963ad24b53..d717d7a8b4 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java @@ -62,8 +62,8 @@ public interface CrmCustomerTempMapper extends BaseMapper { CrmCustomerTempVo selectByMobileOrWx(Map map); - @Select("SELECT COUNT(1) FROM crm_customer_temp WHERE createOrgSid=#{orgSid}") - int selectCountByOrgSid(String orgSid); + @Select("SELECT COUNT(1) FROM crm_customer_temp WHERE customerNo LIKE concat(#{orgCode}, '%')") + int selectCountByOrgSid(String orgCode); AppCrmCustomerTempVo selNameAndMolieByUserSid(@Param("customerSid") String customerSid); diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index f57897238d..cda367ab51 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -756,7 +756,7 @@ public class CrmCustomerTempService extends MybatisBaseService genetrateCustomerNumO(String customerTypeKey, SysUserInfoVo sysUserInfoVo) { // 流水号 - int i = selectCountByOrgSid(sysUserInfoVo.getOrgSid()); + int i = selectCountByOrgSid(sysUserInfoVo.getOrgCode()); String num = String.format("%06d", i + 1); // 不足6位补0 Map map = new HashMap<>(); map.put("code", sysUserInfoVo.getOrgCode() + customerTypeKey + num);