demand: 导入功能 国家、省份、城市、开通oms、启用状态 未保存
committer: heyu
This commit is contained in:
parent
95cb313ff2
commit
5641204efe
@ -15,7 +15,7 @@ import java.util.List;
|
|||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
|
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.domain.exception.EmisBizError;
|
||||||
import com.xdadan.erp.emis.service.EmisBaseService;
|
import com.xdadan.erp.emis.service.EmisBaseService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
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.StringUtils;
|
||||||
import com.xdadan.erp.common.utils.poi.ExcelUtil;
|
import com.xdadan.erp.common.utils.poi.ExcelUtil;
|
||||||
|
|
||||||
import com.xdadan.erp.emis.domain.EmisCustomerUser;
|
|
||||||
import com.xdadan.erp.emis.service.IEmisCustomerUserService;
|
import com.xdadan.erp.emis.service.IEmisCustomerUserService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -261,6 +260,9 @@ public class EmisCustomerUserController extends EmisBaseController
|
|||||||
|
|
||||||
emisCustomerUser.setUserName(emisCustomerUser.getMonthlyPayCode());
|
emisCustomerUser.setUserName(emisCustomerUser.getMonthlyPayCode());
|
||||||
|
|
||||||
|
if ("1".equals(emisCustomerUser.getBlImport())) {
|
||||||
|
nameToCode(emisCustomerUser);
|
||||||
|
}
|
||||||
return toAjax(emisCustomerUserService.insertMonthCustomerUser(emisCustomerUser));
|
return toAjax(emisCustomerUserService.insertMonthCustomerUser(emisCustomerUser));
|
||||||
} catch (DuplicateKeyException e) {
|
} catch (DuplicateKeyException e) {
|
||||||
e.printStackTrace();
|
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");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 重置用户登录密码
|
* 重置用户登录密码
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user