Commit e5de27d2 by “zcwang”

modify: 导出添加工单id条件

parent 024029d7
Pipeline #44882 passed with stages
in 1 minute 38 seconds
...@@ -160,7 +160,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ ...@@ -160,7 +160,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
//记录最大出现次数 //记录最大出现次数
int temp = 0; int temp = 0;
//记录最大值 //记录最大值
GoodsResponseRpc name = new GoodsResponseRpc(); GoodsResponseRpc responseRpc = new GoodsResponseRpc();
//记录出现的所有值 //记录出现的所有值
List<GoodsResponseRpc> emails = new ArrayList<GoodsResponseRpc>(); List<GoodsResponseRpc> emails = new ArrayList<GoodsResponseRpc>();
//遍历取出所有商品关联的人 //遍历取出所有商品关联的人
...@@ -211,16 +211,22 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ ...@@ -211,16 +211,22 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
email.setOccurrenceNumber(goodsResponseRpc.getOccurrenceNumber() + 1); email.setOccurrenceNumber(goodsResponseRpc.getOccurrenceNumber() + 1);
if (temp < goodsResponseRpc.getOccurrenceNumber()) { if (temp < goodsResponseRpc.getOccurrenceNumber()) {
temp = goodsResponseRpc.getOccurrenceNumber(); temp = goodsResponseRpc.getOccurrenceNumber();
name = goodsResponseRpc; responseRpc = goodsResponseRpc;
} }
} }
map.put(email.getName(), email); map.put(email.getName(), email);
} }
if (name.getName() == null) { if (responseRpc.getName() == null) {
Iterator<GoodsResponseRpc> iterator = map.values().iterator(); Iterator<GoodsResponseRpc> iterator = map.values().iterator();
name = iterator.next(); responseRpc = iterator.next();
} }
return name; if (StringUtils.isBlank(responseRpc.getEmail())) {
Integer byType = ChangePrincipalEnum.getByType(commander);
if (null != byType) {
this.goodsGetEmail(responseRpc, byType);
}
}
return responseRpc;
} }
/** /**
...@@ -236,7 +242,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ ...@@ -236,7 +242,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
*/ */
private GoodsResponseRpc queryChangeSupplier(ChangeCommanderEnum commanderEnum, String changeSupplierId, private GoodsResponseRpc queryChangeSupplier(ChangeCommanderEnum commanderEnum, String changeSupplierId,
String commander) { String commander) {
GoodsResponseRpc rpc = new GoodsResponseRpc(); GoodsResponseRpc goodsResponseRpc = new GoodsResponseRpc();
if (!commanderEnum.getId().equals(ChangeCommanderEnum.SUPPLIERS_ASSOCIATED.getId()) || changeSupplierId == null if (!commanderEnum.getId().equals(ChangeCommanderEnum.SUPPLIERS_ASSOCIATED.getId()) || changeSupplierId == null
|| commander == null) { || commander == null) {
return null; return null;
...@@ -260,16 +266,18 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ ...@@ -260,16 +266,18 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
req.setSupplierIdList(supplierIdList); req.setSupplierIdList(supplierIdList);
//进行参数解析 //进行参数解析
List<SupplierUserRsp> listAjaxResponse = supplierInfoService.querySupplierRelatedUser(req); List<SupplierUserRsp> listAjaxResponse = supplierInfoService.querySupplierRelatedUser(req);
if (CollectionUtils.isEmpty(listAjaxResponse)) { if (!CollectionUtils.isEmpty(listAjaxResponse)) {
return null;
}
SupplierUserRsp supplierUserRsp = listAjaxResponse.get(0); SupplierUserRsp supplierUserRsp = listAjaxResponse.get(0);
Map<String, String> uid2NameMap = supplierUserRsp.getUid2NameMap(); Map<String, String> uid2NameMap = supplierUserRsp.getUid2NameMap();
for (String key: uid2NameMap.keySet()) { for (String key : uid2NameMap.keySet()) {
rpc.setName(uid2NameMap.get(key)); goodsResponseRpc.setName(uid2NameMap.get(key));
rpc.setEmail(key); goodsResponseRpc.setEmail(key);
} }
return rpc; }
if (StringUtils.isBlank(goodsResponseRpc.getEmail())) {
this.getEmail(goodsResponseRpc, req.getSearchType());
}
return goodsResponseRpc;
} }
/** /**
...@@ -499,4 +507,46 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ ...@@ -499,4 +507,46 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
} }
} }
private void getEmail(GoodsResponseRpc goodsResponseRpc, Integer type) {
switch (type) {
case 4:
//商品开发
goodsResponseRpc.setName(appConfig.getFunctionaryName());
goodsResponseRpc.setEmail(appConfig.getFunctionaryEmail());
case 1:
//采购
goodsResponseRpc.setName(appConfig.getPurchaseName());
goodsResponseRpc.setEmail(appConfig.getPurchaseEmail());
case 2:
//计划
goodsResponseRpc.setName(appConfig.getGoodsProjectName());
goodsResponseRpc.setEmail(appConfig.getGoodsProjectEmail());
case 3:
//SQE
goodsResponseRpc.setName(appConfig.getSqeName());
goodsResponseRpc.setEmail(appConfig.getSqeEmail());
}
}
private void goodsGetEmail(GoodsResponseRpc goodsResponseRpc, Integer type) {
switch (type) {
case 1:
//商品开发
goodsResponseRpc.setName(appConfig.getFunctionaryName());
goodsResponseRpc.setEmail(appConfig.getFunctionaryEmail());
case 2:
//采购
goodsResponseRpc.setName(appConfig.getPurchaseName());
goodsResponseRpc.setEmail(appConfig.getPurchaseEmail());
case 3:
//计划
goodsResponseRpc.setName(appConfig.getGoodsProjectName());
goodsResponseRpc.setEmail(appConfig.getGoodsProjectEmail());
case 4:
//SQE
goodsResponseRpc.setName(appConfig.getSqeName());
goodsResponseRpc.setEmail(appConfig.getSqeEmail());
}
}
} }
...@@ -29,4 +29,12 @@ public enum ChangePrincipalEnum { ...@@ -29,4 +29,12 @@ public enum ChangePrincipalEnum {
return name; return name;
} }
public static Integer getByType(String name) {
for ( ChangePrincipalEnum value : ChangePrincipalEnum.values()) {
if (value.getName().equals(name)) {
return value.getType();
}
}
return null;
}
} }
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