From 5208cc840ad82d7d1149d71d6e4872581568254c Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Tue, 11 Feb 2025 10:03:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=94=AE=E5=90=8E=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsCustomerVehicleService.java | 10 ++++----- .../biz/crmcustomer/CrmCustomerService.java | 21 +++++++++---------- .../CrmDockingPeopleMapper.xml | 8 ++++++- .../crm/biz/crmdockingpeople/PeopleList.java | 1 + 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java index 0b4e3c6616..d9b0211d6e 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java @@ -31,17 +31,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.as.api.ascustomervehicle.*; import com.yxt.anrui.as.api.ascustomervehmaintenance.AsCustomervehMaintenance; import com.yxt.anrui.as.biz.ascustomervehmaintenance.AsCustomervehMaintenanceService; -import com.yxt.anrui.as.feign.crm.CrmCustomerTempDto; import com.yxt.anrui.as.feign.crm.CrmCustomerTempFeign; import com.yxt.anrui.as.feign.yxtcrm.CrmCustomerDto; import com.yxt.anrui.as.feign.yxtcrm.YxtCrmCustomerTempFeign; -import com.yxt.common.core.result.ResultBean; -import org.apache.commons.lang3.StringUtils; 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; @@ -263,9 +261,9 @@ public class AsCustomerVehicleService extends MybatisBaseService save = yxtCrmCustomerTempFeign.saveForQuickVeh(tempDto); if (save.getSuccess()) { - String sid = (String) save.getData(); + String sid = save.getData(); dto.setCustomerSid(sid); AsCustomerVehicleDetails vehicleDetails = new AsCustomerVehicleDetails(); BeanUtil.copyProperties(dto, vehicleDetails); diff --git a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java index adf35e38e0..5b6d96c553 100644 --- a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java +++ b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java @@ -29,9 +29,13 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.HanZiConverterPinYin; import com.yxt.common.base.utils.HttpStatusEnum; -import com.yxt.crm.biz.crmcustomerorg.CrmCustomerOrg; +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 com.yxt.crm.feign.anruicrm.crmcustomertemp.CrmCustomerTemp; import com.yxt.crm.feign.anruicrm.crmcustomertemp.CrmCustomerTempFeign; import com.yxt.crm.feign.as.ascustomervehicle.AsCustomerCrmVehVo; @@ -51,21 +55,15 @@ import com.yxt.crm.feign.portal.sysuser.SysUserDto; import com.yxt.crm.feign.portal.sysuser.SysUserFeign; import com.yxt.crm.feign.portal.sysuser.SysUserVo; import org.apache.commons.lang3.StringUtils; -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.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.math.BigDecimal; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -659,6 +657,7 @@ public class CrmCustomerService extends MybatisBaseService ${ew.sqlSegment} diff --git a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmdockingpeople/PeopleList.java b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmdockingpeople/PeopleList.java index 8f549b43ed..bb18b29ff7 100644 --- a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmdockingpeople/PeopleList.java +++ b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmdockingpeople/PeopleList.java @@ -17,4 +17,5 @@ public class PeopleList { @ApiModelProperty("手机号码") private String mobile; // 手机号码 private String remarks; + private String isEnable; }