客户问题修复和车型问题修复

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;

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
               <!-- (bvo.platformNo - bvo.lockingNum) AS quantity-->
         FROM bus_vehicle_order bvo
                  LEFT JOIN bus_vehicle_apply_detail bvad ON bvo.purchaseApplyMediumModelSid = bvad.sid

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<BusVehicleOrderListVo> pv = new PagerVo<>();
         PagerVo<BusVehicleOrderListVo> pv1 = PagerUtil.pageToVo(page, pv);

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<CrmCustomerTemp> {
 
     CrmCustomerTempVo selectByMobileOrWx(Map<String, String> map);
 
-    @Select("SELECT COUNT(1) FROM crm_customer_temp WHERE createOrgSid=#{orgSid}")
+    @Select("SELECT COUNT(1) FROM crm_customer_temp WHERE customerNo LIKE concat(#{orgCode}, '%')")
-    int selectCountByOrgSid(String orgSid);
+    int selectCountByOrgSid(String orgCode);
 
     AppCrmCustomerTempVo selNameAndMolieByUserSid(@Param("customerSid") String customerSid);
 

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<CrmCustomerTempMa
 
     private Map<String, String> 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<String, String> map = new HashMap<>();
         map.put("code", sysUserInfoVo.getOrgCode() + customerTypeKey + num);