diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/RegionsMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/RegionsMapper.java index 6d18dc3..0d5da24 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/RegionsMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/RegionsMapper.java @@ -13,7 +13,7 @@ public interface RegionsMapper { public void deleteRegions(Integer id); - public Regions getRegions(Integer id); + public Regions getRegions(String id); public int queryRegionsCount(RegionsQuery query); diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java index 70c5c0d..fe49230 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java @@ -1,6 +1,7 @@ package com.lyms.platform.permission.model; import com.lyms.platform.common.result.IdTextModel; +import com.lyms.platform.pojo.BasicConfig; import java.util.Date; @@ -10,9 +11,9 @@ public class Organization { private Integer type; private Integer level; private Integer areaManage; - private Integer provinceId; - private Integer cityId; - private Integer areaId; + private String provinceId; + private String cityId; + private String areaId; private String address; private String description; private Integer publishId; @@ -24,9 +25,9 @@ public class Organization { private IdTextModel levelObj; private IdTextModel typeObj; - private Regions province; - private Regions city; - private Regions area; + private BasicConfig province; + private BasicConfig city; + private BasicConfig area; private String foreignId; public String getForeignId() { @@ -37,27 +38,27 @@ public class Organization { this.foreignId = foreignId; } - public Regions getProvince() { + public BasicConfig getProvince() { return province; } - public void setProvince(Regions province) { + public void setProvince(BasicConfig province) { this.province = province; } - public Regions getCity() { + public BasicConfig getCity() { return city; } - public void setCity(Regions city) { + public void setCity(BasicConfig city) { this.city = city; } - public Regions getArea() { + public BasicConfig getArea() { return area; } - public void setArea(Regions area) { + public void setArea(BasicConfig area) { this.area = area; } @@ -138,32 +139,32 @@ public class Organization { } - public Integer getProvinceId() { + public String getProvinceId() { return provinceId; } - public void setProvinceId(Integer provinceId) { + public void setProvinceId(String provinceId) { this.provinceId = provinceId; } - public Integer getCityId() { + public String getCityId() { return cityId; } - public void setCityId(Integer cityId) { + public void setCityId(String cityId) { this.cityId = cityId; } - public Integer getAreaId() { + public String getAreaId() { return areaId; } - public void setAreaId(Integer areaId) { + public void setAreaId(String areaId) { this.areaId = areaId; } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java index f385a88..ccc914b 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java @@ -12,9 +12,9 @@ public class OrganizationQuery extends BaseQuery { private Integer type; private Integer level; private Integer areaManage; - private Integer provinceId; - private Integer cityId; - private Integer areaId; + private String provinceId; + private String cityId; + private String areaId; private String address; private String description; private Integer publishId; @@ -91,32 +91,32 @@ public class OrganizationQuery extends BaseQuery { } - public Integer getProvinceId() { + public String getProvinceId() { return provinceId; } - public void setProvinceId(Integer provinceId) { + public void setProvinceId(String provinceId) { this.provinceId = provinceId; } - public Integer getCityId() { + public String getCityId() { return cityId; } - public void setCityId(Integer cityId) { + public void setCityId(String cityId) { this.cityId = cityId; } - public Integer getAreaId() { + public String getAreaId() { return areaId; } - public void setAreaId(Integer areaId) { + public void setAreaId(String areaId) { this.areaId = areaId; } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/RegionsService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/RegionsService.java index c66e07a..f3bafb1 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/RegionsService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/RegionsService.java @@ -8,16 +8,16 @@ import com.lyms.platform.permission.model.RegionsQuery; import java.util.List; public interface RegionsService { - public void addRegions(Regions obj); - - public void updateRegions(Regions obj); - - public void deleteRegions(Integer id); - - public Regions getRegions(Integer id); - - public int queryRegionsCount(RegionsQuery query); - - public List queryRegions(RegionsQuery query); +// public void addRegions(Regions obj); +// +// public void updateRegions(Regions obj); +// +// public void deleteRegions(Integer id); +// +// public Regions getRegions(String id); +// +// public int queryRegionsCount(RegionsQuery query); +// +// public List queryRegions(RegionsQuery query); } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/RegionsServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/RegionsServiceImpl.java index c76ffdd..51eb02c 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/RegionsServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/RegionsServiceImpl.java @@ -13,43 +13,43 @@ import java.util.List; @Service public class RegionsServiceImpl implements RegionsService { - @Autowired - private RegionsMapper regionsMapper; - - @Override - public void addRegions(Regions obj) { - regionsMapper.addRegions(obj); - } - - @Override - public void updateRegions(Regions obj) { - regionsMapper.updateRegions(obj); - } - - @Override - public void deleteRegions(Integer id) { - regionsMapper.deleteRegions(id); - } - - @Override - public Regions getRegions(Integer id) { - if (id == null) { - return null; - } - return regionsMapper.getRegions(id); - } - - @Override - public int queryRegionsCount(RegionsQuery query) { - return regionsMapper.queryRegionsCount(query); - } - - @Override - public List queryRegions(RegionsQuery query) { - if (query.getNeed() != null) { - query.mysqlBuild(regionsMapper.queryRegionsCount(query)); - } - return regionsMapper.queryRegions(query); - } +// @Autowired +// private RegionsMapper regionsMapper; +// +// @Override +// public void addRegions(Regions obj) { +// regionsMapper.addRegions(obj); +// } +// +// @Override +// public void updateRegions(Regions obj) { +// regionsMapper.updateRegions(obj); +// } +// +// @Override +// public void deleteRegions(Integer id) { +// regionsMapper.deleteRegions(id); +// } +// +// @Override +// public Regions getRegions(String id) { +// if (id == null) { +// return null; +// } +// return regionsMapper.getRegions(id); +// } +// +// @Override +// public int queryRegionsCount(RegionsQuery query) { +// return regionsMapper.queryRegionsCount(query); +// } +// +// @Override +// public List queryRegions(RegionsQuery query) { +// if (query.getNeed() != null) { +// query.mysqlBuild(regionsMapper.queryRegionsCount(query)); +// } +// return regionsMapper.queryRegions(query); +// } } \ No newline at end of file diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java b/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java new file mode 100644 index 0000000..cdaa03d --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java @@ -0,0 +1,10 @@ +package com.lyms.platform.common.utils; + +/** + * Created by Administrator on 2016/4/30 0030. + */ +public class SystemConfig { + + public static final String CHINA_BASIC_ID = "f6c505dd-835a-43d7-b0bb-fdb9eb0b7b31"; + +} diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index f87eb8c..bb6fbfc 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -32,31 +32,31 @@ public class Patients extends BaseModel { * 地址 */ private String address; - private int provinceId; - private int cityId; - private int areaId; + private String provinceId; + private String cityId; + private String areaId; - public int getAreaId() { + public String getAreaId() { return areaId; } - public void setAreaId(int areaId) { + public void setAreaId(String areaId) { this.areaId = areaId; } - public int getCityId() { + public String getCityId() { return cityId; } - public void setCityId(int cityId) { + public void setCityId(String cityId) { this.cityId = cityId; } - public int getProvinceId() { + public String getProvinceId() { return provinceId; } - public void setProvinceId(int provinceId) { + public void setProvinceId(String provinceId) { this.provinceId = provinceId; } diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java index 33ee54c..de80241 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java @@ -96,6 +96,7 @@ public class DataImportTaskServiceImpl implements DataImportTaskService { config.setName(data.getDcName()); config.setParentId(data.getDcParentid()); config.setTypeId(data.getDcDatatypeid()); + config.setYn(YnEnums.YES.getId()); BasicConfig db = basicConfigService.getOneBasicConfigById(data.getDcId()); if (db == null) { basicConfigService.addBasicConfig(config); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java index 6bc7483..527082b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java @@ -5,6 +5,7 @@ import java.util.List; import javax.validation.Valid; import com.lyms.platform.biz.param.CommunityQuery; +import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; @@ -14,6 +15,7 @@ import com.lyms.platform.operate.web.request.PuerperaManagerQueryRequest; import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.permission.model.Regions; import com.lyms.platform.permission.service.RegionsService; +import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.Patients; import com.lyms.platform.query.PatientsQuery; import org.springframework.beans.factory.annotation.Autowired; @@ -43,7 +45,7 @@ public class CommunityConfigController extends RestController { @Autowired private PatientsService patientsService; @Autowired - private RegionsService regionsService; + private BasicConfigService basicConfigService; @@ -100,11 +102,10 @@ public class CommunityConfigController extends RestController { @TokenRequired public FrontEndResult queryCommunity(CommunityQuery communityQuery) { List communityConfigList = communityConfigService.queryCommunity(communityQuery); - Regions regions = regionsService.getRegions(Integer.valueOf(communityQuery.getId())); - if(null == regions) { + BasicConfig config = basicConfigService.getOneBasicConfigById(communityQuery.getId()); + if(null == config) { return FrontEndResult.ini(ErrorCodeConstants.PARAMETER_ERROR, "address ID error"); } - communityQuery.setLevel(String.valueOf(regions.getLevel())); if(null != communityConfigList) { return FrontEndResult.ini().setData(communityConfigList).setPageInfo(communityQuery.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java index 5cc1bfc..9feb337 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.controller; +import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; @@ -9,9 +10,11 @@ import com.lyms.platform.common.enums.OrganizationLevelEnum; import com.lyms.platform.common.enums.OrganizationTypeEnum; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.ResultUtils; +import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; +import com.lyms.platform.pojo.BasicConfig; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -34,7 +37,7 @@ public class OrganizationController extends RestController { @Autowired private OrganizationService organizationService; @Autowired - private RegionsService regionsService; + private BasicConfigService basicConfigService; @Autowired private DepartmentsService departmentsService; @@ -94,9 +97,9 @@ public class OrganizationController extends RestController { @RequestParam(value = "type", required = false) Integer type, @RequestParam(value = "level", required = false) Integer level, @RequestParam(value = "areaManage", required = false) Integer areaManage, - @RequestParam(value = "provinceId", required = false) Integer provinceId, - @RequestParam(value = "cityId", required = false) Integer cityId, - @RequestParam(value = "areaId", required = false) Integer areaId, + @RequestParam(value = "provinceId", required = false) String provinceId, + @RequestParam(value = "cityId", required = false) String cityId, + @RequestParam(value = "areaId", required = false) String areaId, @RequestParam(value = "address", required = false) String address, @RequestParam(value = "description", required = false) String description, @RequestParam(value = "shortCode", required = false) String shortCode) { @@ -143,9 +146,9 @@ public class OrganizationController extends RestController { @RequestParam(value = "type") Integer type, @RequestParam(value = "level") Integer level, @RequestParam(value = "areaManage",required = false) Integer areaManage, - @RequestParam(value = "provinceId") Integer provinceId, - @RequestParam(value = "cityId") Integer cityId, - @RequestParam(value = "areaId") Integer areaId, + @RequestParam(value = "provinceId") String provinceId, + @RequestParam(value = "cityId") String cityId, + @RequestParam(value = "areaId") String areaId, @RequestParam(value = "address") String address, @RequestParam(value = "description", required = false) String description, @RequestParam(value = "shortCode", required = false) String shortCode) { @@ -205,17 +208,11 @@ public class OrganizationController extends RestController { @RequestParam(value = "keyword", required = false) String keyword, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "limit", required = false) Integer limit, - @RequestParam(value = "areaId", required = false) Integer areaId) { + @RequestParam(value = "areaId", required = false) String areaId) { limit = limit == null ? 10 : limit; page = page == null ? 1 : page; - Regions regions = null; - if(null != areaId) { - regions = regionsService.getRegions(areaId); - } - - OrganizationQuery organizationQuery = new OrganizationQuery(); organizationQuery.setId(id); organizationQuery.setNeed("true"); @@ -225,14 +222,24 @@ public class OrganizationController extends RestController { organizationQuery.setLimit(limit); organizationQuery.setKeyword(keyword); - if(null != regions && regions.getLevel().equals(1)) { - organizationQuery.setProvinceId(areaId); - } - if(null != regions && regions.getLevel().equals(2)) { - organizationQuery.setCityId(areaId); + BasicConfig config = null; + if(null != areaId) { + config = basicConfigService.getOneBasicConfigById(areaId); } - if(null != regions && regions.getLevel().equals(3)) { - organizationQuery.setAreaId(areaId); + if (config != null) { + if (SystemConfig.CHINA_BASIC_ID.equals(config.getParentId())) { + organizationQuery.setProvinceId(areaId); + } else { + BasicConfig p1 = basicConfigService.getOneBasicConfigById(config.getParentId()); + if (p1 != null && SystemConfig.CHINA_BASIC_ID.equals(p1.getParentId())) { + organizationQuery.setCityId(areaId); + } else { + BasicConfig p2 = basicConfigService.getOneBasicConfigById(p1.getParentId()); + if (p2 != null && SystemConfig.CHINA_BASIC_ID.equals(p2.getParentId())) { + organizationQuery.setAreaId(areaId); + } + } + } } List organizations = organizationService.queryOrganization(organizationQuery); @@ -241,13 +248,13 @@ public class OrganizationController extends RestController { organization.setTypeObj(OrganizationLevelEnum.getById(organization.getLevel())); organization.setLevelObj(OrganizationTypeEnum.getById(organization.getType())); if(null != organization.getProvinceId()) { - organization.setProvince(regionsService.getRegions(organization.getProvinceId())); + organization.setProvince(basicConfigService.getOneBasicConfigById(organization.getProvinceId())); } if(null != organization.getCityId()) { - organization.setCity(regionsService.getRegions(organization.getCityId())); + organization.setCity(basicConfigService.getOneBasicConfigById(organization.getCityId())); } if(null != organization.getAreaId()) { - organization.setArea(regionsService.getRegions(organization.getAreaId())); + organization.setArea(basicConfigService.getOneBasicConfigById(organization.getAreaId())); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java index 349938a..259c270 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java @@ -1,13 +1,16 @@ package com.lyms.platform.operate.web.controller; +import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.ResultUtils; -import com.lyms.platform.permission.model.Regions; -import com.lyms.platform.permission.model.RegionsQuery; -import com.lyms.platform.permission.service.RegionsService; +import com.lyms.platform.common.utils.SystemConfig; +import com.lyms.platform.pojo.BasicConfig; +import com.lyms.platform.query.BasicConfigQuery; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -25,23 +28,28 @@ import java.util.Map; */ @Controller public class RegionController extends RestController{ + @Autowired - private RegionsService regionsService; + private BasicConfigService basicConfigService; + @TokenRequired @RequestMapping(value = "/regions",method = RequestMethod.GET) - public void getRegions(@RequestParam(value = "parentId", required = false) Integer parentId, + public void getRegions(@RequestParam(value = "parentId") String parentId, HttpServletResponse httpServletResponse){ - RegionsQuery regionsQuery= new RegionsQuery(); - regionsQuery.setParentId(parentId); - List regionses = regionsService.queryRegions(regionsQuery); + if ("0".equals(parentId) || StringUtils.isBlank(parentId)) { + parentId = SystemConfig.CHINA_BASIC_ID; + } + BasicConfigQuery query = new BasicConfigQuery(); + query.setYn(YnEnums.YES.getId()); + query.setParentId(parentId); + List configList = basicConfigService.queryBasicConfig(query); List> list =new ArrayList>(); - if(CollectionUtils.isNotEmpty(regionses)){ - for (Regions regions :regionses){ + if(CollectionUtils.isNotEmpty(configList)){ + for (BasicConfig config :configList){ Map region=new HashMap(); - region.put("id",regions.getId()); - region.put("level",regions.getLevel()); - region.put("regionName",regions.getRegionName()); - region.put("parentId", regions.getParentId()); + region.put("id",config.getId()); + region.put("regionName",config.getName()); + region.put("parentId", config.getParentId()); list.add(region); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java index 4c408b9..a661a68 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java @@ -1,9 +1,6 @@ package com.lyms.platform.operate.web.facade; -import com.lyms.platform.biz.service.BabyService; -import com.lyms.platform.biz.service.BabyVisitService; -import com.lyms.platform.biz.service.PatientsService; -import com.lyms.platform.biz.service.VisitService; +import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; @@ -15,10 +12,7 @@ import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.result.BabyVisitResult.BabyVisit; import com.lyms.platform.permission.model.Regions; import com.lyms.platform.permission.service.RegionsService; -import com.lyms.platform.pojo.BabyModel; -import com.lyms.platform.pojo.BabyVisitModel; -import com.lyms.platform.pojo.Patients; -import com.lyms.platform.pojo.VisitModel; +import com.lyms.platform.pojo.*; import com.lyms.platform.query.PatientsQuery; import com.lyms.platform.query.VisitQuery; import org.apache.commons.collections.CollectionUtils; @@ -48,7 +42,7 @@ public class VisitFacade { @Autowired private PatientsService patientsService; @Autowired - private RegionsService regionsService; + private BasicConfigService basicConfigService; /** * 根据产妇id获取产妇的访视信息 @@ -115,14 +109,14 @@ public class VisitFacade { return address; } - private AddressInner getName(int id) { + private AddressInner getName(String id) { AddressInner addressInner= new AddressInner(); addressInner.setId(id); - Regions regions = regionsService.getRegions(id); - if (null == regions) { + BasicConfig config = basicConfigService.getOneBasicConfigById(id); + if (null == config) { return addressInner; } - addressInner.setName(regions.getRegionName()); + addressInner.setName(config.getName()); return addressInner; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java index 3f38d17..c0d77b2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java @@ -18,35 +18,35 @@ public class BabyVisitAddRequest implements IBasicRequestConvert private String address; - private int provinceId; - private int cityId; - private int areaId; + private String provinceId; + private String cityId; + private String areaId; public void setAddress(String address) { this.address = address; } - public int getAreaId() { + public String getAreaId() { return areaId; } - public void setAreaId(int areaId) { + public void setAreaId(String areaId) { this.areaId = areaId; } - public int getCityId() { + public String getCityId() { return cityId; } - public void setCityId(int cityId) { + public void setCityId(String cityId) { this.cityId = cityId; } - public int getProvinceId() { + public String getProvinceId() { return provinceId; } - public void setProvinceId(int provinceId) { + public void setProvinceId(String provinceId) { this.provinceId = provinceId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java index c8c810f..333842d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java @@ -67,35 +67,35 @@ public class VisitAddRequest { */ private String address; - private int provinceId; - private int cityId; - private int areaId; + private String provinceId; + private String cityId; + private String areaId; public void setAddress(String address) { this.address = address; } - public int getAreaId() { + public String getAreaId() { return areaId; } - public void setAreaId(int areaId) { + public void setAreaId(String areaId) { this.areaId = areaId; } - public int getCityId() { + public String getCityId() { return cityId; } - public void setCityId(int cityId) { + public void setCityId(String cityId) { this.cityId = cityId; } - public int getProvinceId() { + public String getProvinceId() { return provinceId; } - public void setProvinceId(int provinceId) { + public void setProvinceId(String provinceId) { this.provinceId = provinceId; } @@ -565,9 +565,9 @@ public class VisitAddRequest { private String address; - private int provinceId; - private int cityId; - private int areaId; + private String provinceId; + private String cityId; + private String areaId; private String phone; @@ -579,27 +579,27 @@ public class VisitAddRequest { this.phone = phone; } - public int getAreaId() { + public String getAreaId() { return areaId; } - public void setAreaId(int areaId) { + public void setAreaId(String areaId) { this.areaId = areaId; } - public int getCityId() { + public String getCityId() { return cityId; } - public void setCityId(int cityId) { + public void setCityId(String cityId) { this.cityId = cityId; } - public int getProvinceId() { + public String getProvinceId() { return provinceId; } - public void setProvinceId(int provinceId) { + public void setProvinceId(String provinceId) { this.provinceId = provinceId; } @@ -726,9 +726,9 @@ public class VisitAddRequest { result = prime * result + ((dueType == null) ? 0 : dueType.hashCode()); result = prime * result + ((id == null) ? 0 : id.hashCode()); result = prime * result + ((name == null) ? 0 : name.hashCode()); - result = prime * result + cityId; - result = prime * result + areaId; - result = prime * result + provinceId; + result = prime * result + cityId==null?0:cityId.hashCode(); + result = prime * result + areaId==null?0:areaId.hashCode(); + result = prime * result + provinceId==null?0:provinceId.hashCode(); return result; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AddressInner.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AddressInner.java index 5b0a87d..bde7bb9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AddressInner.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AddressInner.java @@ -4,14 +4,14 @@ package com.lyms.platform.operate.web.result; * Created by Administrator on 2016/4/29 0029. */ public class AddressInner { - private int id; + private String id; private String name; - public int getId() { + public String getId() { return id; } - public void setId(int id) { + public void setId(String id) { this.id = id; }