From 5641204efe7a9bd8e7bde9f5afcba7d12f568f0f Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Tue, 22 Jul 2025 15:22:47 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=E5=AF=BC=E5=85=A5=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=20=20=E5=9B=BD=E5=AE=B6=E3=80=81=E7=9C=81=E4=BB=BD?= =?UTF-8?q?=E3=80=81=E5=9F=8E=E5=B8=82=E3=80=81=E5=BC=80=E9=80=9Aoms?= =?UTF-8?q?=E3=80=81=E5=90=AF=E7=94=A8=E7=8A=B6=E6=80=81=20=E6=9C=AA?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=20committer:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/emis/EmisCustomerUserController.java | 46 ++++++++++++++++++- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java index 22286053f..46538a74b 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java @@ -15,7 +15,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter; -import com.xdadan.erp.emis.domain.EmisDestination; +import com.xdadan.erp.emis.domain.*; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.service.EmisBaseService; import org.springframework.beans.factory.annotation.Autowired; @@ -38,7 +38,6 @@ import com.xdadan.erp.common.enums.BusinessType; import com.xdadan.erp.common.utils.StringUtils; import com.xdadan.erp.common.utils.poi.ExcelUtil; -import com.xdadan.erp.emis.domain.EmisCustomerUser; import com.xdadan.erp.emis.service.IEmisCustomerUserService; /** @@ -261,6 +260,9 @@ public class EmisCustomerUserController extends EmisBaseController emisCustomerUser.setUserName(emisCustomerUser.getMonthlyPayCode()); + if ("1".equals(emisCustomerUser.getBlImport())) { + nameToCode(emisCustomerUser); + } return toAjax(emisCustomerUserService.insertMonthCustomerUser(emisCustomerUser)); } catch (DuplicateKeyException e) { e.printStackTrace(); @@ -269,6 +271,46 @@ public class EmisCustomerUserController extends EmisBaseController } + private void nameToCode(EmisCustomerUser emisCustomerUser) { + // 国家 + if (!StringUtils.isEmpty(emisCustomerUser.getCountry())) { + EmisCountry country = emisBaseService.getCountryByName(emisCustomerUser.getCountry()); + if (country != null) { + emisCustomerUser.setCountry(country.getCode()); + } + } + // 省份 + if (!StringUtils.isEmpty(emisCustomerUser.getProvince())) { + EmisRegion province = emisBaseService.getRegionByName(emisCustomerUser.getCountry(), null, emisCustomerUser.getProvince()); + if (province != null) { + emisCustomerUser.setProvince(province.getRegionCode()); + } + } + // 城市 + if (!StringUtils.isEmpty(emisCustomerUser.getCity())) { + EmisRegion city = emisBaseService.getRegionByName(emisCustomerUser.getCountry(), emisCustomerUser.getProvince(), emisCustomerUser.getCity()); + if (city != null) { + emisCustomerUser.setCity(city.getRegionCode()); + } + } + // 开通oms + if (!StringUtils.isEmpty(emisCustomerUser.getBlOpenOms())) { + if ("是".equals(emisCustomerUser.getBlOpenOms())) { + emisCustomerUser.setBlOpenOms("1"); + } else { + emisCustomerUser.setBlOpenOms("0"); + } + } + // 启用状态 + if (!StringUtils.isEmpty(emisCustomerUser.getStatus())) { + if ("是".equals(emisCustomerUser.getStatus())) { + emisCustomerUser.setStatus("1"); + } else { + emisCustomerUser.setStatus("0"); + } + } + } + /** * 重置用户登录密码