Skip to content

Y
yanxuan-qc-change-system
Commit 01463113 by 王志超
Options

Merge branch 'release-2023020201' into 'master' 

分支release-2023020201已上线，自动合并到master

See merge request !15
parents 8849e836 1e87e466
Pipeline #45141 passed with stages
in 1 minute 49 seconds
Showing with 124 additions and 28 deletions
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
......@@ -1280,6 +1280,7 @@ public class ChangeFlowBiz {
return userBaseContainer;
}
@Deprecated
public void export(ChangeFlowListQueryReq changeFlowListQueryReq, HttpServletResponse response) {
List<ChangeRecord> changeRecords = changeRecordMapper.selectByCondition(changeFlowListQueryReq);
if (CollectionUtils.isEmpty(changeRecords)) {
......
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/callback/ChangeFlowExportCallback.java
......@@ -115,11 +115,12 @@ public class ChangeFlowExportCallback implements DesCallbackService {
@Override
public List<List<ExcelCell>> queryExcelData(CallbackQueryReq req) {
log.info("[op: address book export callback queryExcelData] req={}", JSON.toJSONString(req));
log.info("[op: change flow export callback queryExcelData] req={}", JSON.toJSONString(req));
ChangeFlowExportQuery query = JSON.parseObject(req.getParamJson(), ChangeFlowExportQuery.class);
query.setOffset(req.getOffset());
query.setLimit(req.getLimit());
List<ChangeFlowExcelDTO> list = getExportList(query);
log.debug("[op: change flow export callback queryExcelData] size:{}", list.size());
return list.stream().map(ChangeFlowExcelVo::init).collect(Collectors.toList());
}
......
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/config/AppConfig.java
......@@ -32,48 +32,48 @@ public class AppConfig {
/**
* 商品关联开发兜底人名
*/
@Value("${change.goods.functionary.name:\"钱伟钰\"}")
@Value("${change.goods.functionary.name:钱伟钰}")
private String functionaryName;
/**
* 商品关联开发兜底邮箱
*/
@Value("${change.goods.functionary.email:\"qianweiyu@corp.netease.com\"}")
@Value("${change.goods.functionary.email:qianweiyu@corp.netease.com}")
private String functionaryEmail;
/**
* 商品关联采购兜底人名
*/
@Value("${change.goods.purchase.name:\"陈金灿\"}")
@Value("${change.goods.purchase.name:陈金灿}")
private String purchaseName;
/**
* 商品关联采购兜底邮箱
*/
@Value("${change.goods.purchase.email:\"bjchenjincan@corp.netease.com\"}")
@Value("${change.goods.purchase.email:bjchenjincan@corp.netease.com}")
private String purchaseEmail;
/**
* 商品关联计划兜底人名
*/
@Value("${change.goods.project.name:\"王敏\"}")
@Value("${change.goods.project.name:王敏}")
private String goodsProjectName;
/**
* 商品关联计划兜底邮箱
*/
@Value("${change.goods.project.email:\"wangmin12@corp.netease.com\"}")
@Value("${change.goods.project.email:wangmin12@corp.netease.com}")
private String goodsProjectEmail;
/**
* 商品关联SQE兜底邮箱
*/
@Value("${change.goods.sqe.name:\"崔亦仙\"}")
@Value("${change.goods.sqe.name:崔亦仙}")
private String sqeName;
/**
* 商品关联SQE兜底邮箱
*/
@Value("${change.goods.sqe.email:\"cuiyixian@corp.netease.com\"}")
@Value("${change.goods.sqe.email:cuiyixian@corp.netease.com}")
private String sqeEmail;
/**
......
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/ChangeFlowExportQuery.java
......@@ -83,6 +83,11 @@ public class ChangeFlowExportQuery {
*/
protected String uid;
/**
* 工单id
*/
private Long flowId;
private Long limit;
private Long offset;
......
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/InteriorChangeConfigServiceImpl.java
......@@ -160,7 +160,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
//记录最大出现次数
int temp = 0;
//记录最大值
GoodsResponseRpc name = new GoodsResponseRpc();
GoodsResponseRpc responseRpc = new GoodsResponseRpc();
//记录出现的所有值
List<GoodsResponseRpc> emails = new ArrayList<GoodsResponseRpc>();
//遍历取出所有商品关联的人
......@@ -211,16 +211,22 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
email.setOccurrenceNumber(goodsResponseRpc.getOccurrenceNumber() + 1);
if (temp < goodsResponseRpc.getOccurrenceNumber()) {
temp = goodsResponseRpc.getOccurrenceNumber();
name = goodsResponseRpc;
responseRpc = goodsResponseRpc;
}
}
map.put(email.getName(), email);
}
if (name.getName() == null) {
if (responseRpc.getName() == null) {
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
*/
private GoodsResponseRpc queryChangeSupplier(ChangeCommanderEnum commanderEnum, String changeSupplierId,
String commander) {
GoodsResponseRpc rpc = new GoodsResponseRpc();
GoodsResponseRpc goodsResponseRpc = new GoodsResponseRpc();
if (!commanderEnum.getId().equals(ChangeCommanderEnum.SUPPLIERS_ASSOCIATED.getId()) || changeSupplierId == null
|| commander == null) {
return null;
......@@ -260,16 +266,19 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
req.setSupplierIdList(supplierIdList);
//进行参数解析
List<SupplierUserRsp> listAjaxResponse = supplierInfoService.querySupplierRelatedUser(req);
if (CollectionUtils.isEmpty(listAjaxResponse)) {
return null;
}
log.debug("[querySupplierRelatedUser] response:{}", JSON.toJSONString(listAjaxResponse));
if (!CollectionUtils.isEmpty(listAjaxResponse)) {
SupplierUserRsp supplierUserRsp = listAjaxResponse.get(0);
Map<String, String> uid2NameMap = supplierUserRsp.getUid2NameMap();
for (String key: uid2NameMap.keySet()) {
rpc.setName(uid2NameMap.get(key));
rpc.setEmail(key);
for (String key : uid2NameMap.keySet()) {
goodsResponseRpc.setName(uid2NameMap.get(key));
goodsResponseRpc.setEmail(key);
}
return rpc;
}
if (StringUtils.isBlank(goodsResponseRpc.getEmail())) {
this.getEmail(goodsResponseRpc, req.getSearchType());
}
return goodsResponseRpc;
}
/**
......@@ -482,20 +491,74 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
//BU
goodsRpc.setFunctionaryName(appConfig.getFunctionaryName());
goodsRpc.setFunctionaryEmail(appConfig.getFunctionaryEmail());
break;
case 2:
//采购
goodsRpc.setPurchaseName(appConfig.getPurchaseName());
goodsRpc.setPurchaseEmail(appConfig.getPurchaseEmail());
break;
case 3:
//计划
goodsRpc.setGoodsProjectName(appConfig.getGoodsProjectName());
goodsRpc.setGoodsProjectEmail(appConfig.getGoodsProjectEmail());
break;
case 4:
//SQE
goodsRpc.setGoodsSqeName(appConfig.getSqeName());
goodsRpc.setGoodsSqeEmail(appConfig.getSqeEmail());
break;
}
}
}
private void getEmail(GoodsResponseRpc goodsResponseRpc, Integer type) {
switch (type) {
case 4:
//商品开发
goodsResponseRpc.setName(appConfig.getFunctionaryName());
goodsResponseRpc.setEmail(appConfig.getFunctionaryEmail());
break;
case 1:
//采购
goodsResponseRpc.setName(appConfig.getPurchaseName());
goodsResponseRpc.setEmail(appConfig.getPurchaseEmail());
break;
case 2:
//计划
goodsResponseRpc.setName(appConfig.getGoodsProjectName());
goodsResponseRpc.setEmail(appConfig.getGoodsProjectEmail());
break;
case 3:
//SQE
goodsResponseRpc.setName(appConfig.getSqeName());
goodsResponseRpc.setEmail(appConfig.getSqeEmail());
break;
}
}
private void goodsGetEmail(GoodsResponseRpc goodsResponseRpc, Integer type) {
switch (type) {
case 1:
//商品开发
goodsResponseRpc.setName(appConfig.getFunctionaryName());
goodsResponseRpc.setEmail(appConfig.getFunctionaryEmail());
break;
case 2:
//采购
goodsResponseRpc.setName(appConfig.getPurchaseName());
goodsResponseRpc.setEmail(appConfig.getPurchaseEmail());
break;
case 3:
//计划
goodsResponseRpc.setName(appConfig.getGoodsProjectName());
goodsResponseRpc.setEmail(appConfig.getGoodsProjectEmail());
break;
case 4:
//SQE
goodsResponseRpc.setName(appConfig.getSqeName());
goodsResponseRpc.setEmail(appConfig.getSqeEmail());
break;
}
}
......
yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/enums/ChangePrincipalEnum.java
......@@ -29,4 +29,12 @@ public enum ChangePrincipalEnum {
return name;
}
public static Integer getByType(String name) {
for ( ChangePrincipalEnum value : ChangePrincipalEnum.values()) {
if (value.getName().equals(name)) {
return value.getType();
}
}
return null;
}
}
yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/enums/CreateSourceEnum.java
......@@ -13,7 +13,8 @@ package com.netease.mail.yanxuan.change.common.enums;
public enum CreateSourceEnum {
QC(1, "网易QC端"),
TONG_ZHOU(2, "同舟端"),
PRODUCT(3, "商品端");
PRODUCT(3, "商品端"),
COLLABORATION_CENTER(4, "协同中心");
private Integer type;
......
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeFlowRequest.java
......@@ -75,4 +75,9 @@ public class ChangeFlowRequest {
private String serviceCode;
private String uid;
/**
* 工单id
*/
private Long flowId;
}
\ No newline at end of file
yanxuan-qc-change-system-dal/src/main/resources/mybatis/mapper/ChangeRecordMapper.xml
......@@ -128,6 +128,9 @@
<if test="createSupplier != null">
and create_supplier = #{createSupplier}
</if>
<if test="flowId != null">
and flow_id = #{flowId}
</if>
</where>
limit #{offset},#{limit}
</select>
......
yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/config/UserInterceptor.java
......@@ -76,7 +76,11 @@ public class UserInterceptor implements HandlerInterceptor {
log.info("userInfo: {}", JSON.toJSONString(userInfo));
if (userInfo != null) {
RequestLocalBean.setUid(userInfo.getUsername());
if (userInfo.getProfile() != null) {
RequestLocalBean.setName(userInfo.getProfile().getNickName());
} else {
RequestLocalBean.setName(userInfo.getUsername());
}
}
} else {
// 获取用户信息
......
yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/ChangeFlowController.java
......@@ -105,8 +105,9 @@ public class ChangeFlowController {
changeFlowListQueryReq.setStartTime(startTime);
changeFlowListQueryReq.setEndTime(endTime);
changeFlowListQueryReq.setFlowId(flowId);
// QC端可以查看所有，不加入过滤条件
if (!CreateSourceEnum.QC.getType().equals(createSource)) {
// QC端/协同中心可以查看所有，不加入过滤条件
if (!CreateSourceEnum.QC.getType().equals(createSource)
&& !CreateSourceEnum.COLLABORATION_CENTER.getType().equals(createSource)) {
changeFlowListQueryReq.setCreateSource(createSource);
}
if (CreateSourceEnum.TONG_ZHOU.getType().equals(createSource)) {
......@@ -198,7 +199,8 @@ public class ChangeFlowController {
@RequestParam(name = "startTime", required = false) Long startTime,
@RequestParam(name = "endTime", required = false) Long endTime,
@RequestParam(name = "createSource", required = false, defaultValue = "1") Integer createSource,
@RequestParam(name = "serviceCode") String serviceCode) {
@RequestParam(name = "serviceCode") String serviceCode,
@RequestParam(name = "flowId", required = false) Long flowId) {
ChangeFlowRequest changeFlowRequest = new ChangeFlowRequest();
changeFlowRequest.setItemId(itemId);
changeFlowRequest.setSupplier(supplier);
......@@ -211,8 +213,10 @@ public class ChangeFlowController {
changeFlowRequest.setStartTime(startTime);
changeFlowRequest.setEndTime(endTime);
changeFlowRequest.setServiceCode(serviceCode);
// QC端可以查看所有，不加入过滤条件
if (!CreateSourceEnum.QC.getType().equals(createSource)) {
changeFlowRequest.setFlowId(flowId);
// QC端/协同中心可以查看所有，不加入过滤条件
if (!CreateSourceEnum.QC.getType().equals(createSource)
&& !CreateSourceEnum.COLLABORATION_CENTER.getType().equals(createSource)) {
changeFlowRequest.setCreateSource(createSource);
}
if (CreateSourceEnum.TONG_ZHOU.getType().equals(createSource)) {
......
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