Commit ded9e9e6 by QianQiXiang

增加一个企业简称字段

parent b85b02fe
......@@ -139,16 +139,12 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
}
List<StaffClerkInfoDTO> infoDTOS = EntityUtil.changeEntityListByJSON(StaffClerkInfoDTO.class, list);
Map<String, String> nameMap = new HashMap<>();
logger.info("测试========================================");
infoDTOS.forEach(infoDTO -> {
//企业
if (!nameMap.containsKey(infoDTO.getEnterpriseId())) {
EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(infoDTO.getEnterpriseId());
if (null != enterpriseDTO) {
nameMap.put(infoDTO.getEnterpriseId(), enterpriseDTO.getEnterpriseName()+"_"+enterpriseDTO.getEnterpriseName());
logger.info(enterpriseDTO.getEnterpriseName());
logger.info(enterpriseDTO.getBrandName());
logger.info(enterpriseDTO.getBrandName()+"_"+enterpriseDTO.getEnterpriseName());
} else {
nameMap.put(infoDTO.getEnterpriseId(), "未知商户");
}
......@@ -177,14 +173,8 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
infoDTO.setClerkName(nameMap.get(infoDTO.getClerkId()));
infoDTO.setStoreName(nameMap.get(infoDTO.getStoreId()));
logger.info("企业名和品牌名");
logger.info("1111"+nameMap.get(infoDTO.getEnterpriseId()));
String ceshi=nameMap.get(infoDTO.getEnterpriseName());
logger.info("企业名"+ceshi);
String ceshi2=nameMap.get(infoDTO.getBrandName());
logger.info("品牌名"+ceshi2);
if ((nameMap.get(infoDTO.getEnterpriseName()))!=null){
String EnterpriseandBrandName= nameMap.get(infoDTO.getEnterpriseName());
if ((nameMap.get(infoDTO.getEnterpriseId()))!=null){
String EnterpriseandBrandName= nameMap.get(infoDTO.getEnterpriseId());
logger.info("全名"+EnterpriseandBrandName);
String split[]=EnterpriseandBrandName.split("_");
infoDTO.setEnterpriseName(split[0]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment