Commit b88f4bc3 by “zcwang”

add: 工单详情负责人信息

parent a20d7b21
...@@ -38,6 +38,7 @@ import com.netease.mail.yanxuan.change.biz.meta.exception.ExceptionFactory; ...@@ -38,6 +38,7 @@ import com.netease.mail.yanxuan.change.biz.meta.exception.ExceptionFactory;
import com.netease.mail.yanxuan.change.biz.service.ChangeFileService; import com.netease.mail.yanxuan.change.biz.service.ChangeFileService;
import com.netease.mail.yanxuan.change.biz.service.ChangeFlowExecService; import com.netease.mail.yanxuan.change.biz.service.ChangeFlowExecService;
import com.netease.mail.yanxuan.change.biz.service.ChangeFlowService; import com.netease.mail.yanxuan.change.biz.service.ChangeFlowService;
import com.netease.mail.yanxuan.change.biz.service.InteriorChangeConfigService;
import com.netease.mail.yanxuan.change.biz.service.change.ChangeConfigService; import com.netease.mail.yanxuan.change.biz.service.change.ChangeConfigService;
import com.netease.mail.yanxuan.change.biz.service.change.ChangeTypeService; import com.netease.mail.yanxuan.change.biz.service.change.ChangeTypeService;
import com.netease.mail.yanxuan.change.biz.service.rpc.FlowService; import com.netease.mail.yanxuan.change.biz.service.rpc.FlowService;
...@@ -62,6 +63,7 @@ import com.netease.mail.yanxuan.change.dal.entity.ChangeFile; ...@@ -62,6 +63,7 @@ import com.netease.mail.yanxuan.change.dal.entity.ChangeFile;
import com.netease.mail.yanxuan.change.dal.entity.ChangeRecord; import com.netease.mail.yanxuan.change.dal.entity.ChangeRecord;
import com.netease.mail.yanxuan.change.dal.entity.ChangeType; import com.netease.mail.yanxuan.change.dal.entity.ChangeType;
import com.netease.mail.yanxuan.change.dal.mapper.ChangeRecordMapper; import com.netease.mail.yanxuan.change.dal.mapper.ChangeRecordMapper;
import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeGoodsPrincipalPO;
import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeExecConfigReq; import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeExecConfigReq;
import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeExecProject; import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeExecProject;
import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowCancelReq; import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowCancelReq;
...@@ -133,6 +135,9 @@ public class ChangeFlowBiz { ...@@ -133,6 +135,9 @@ public class ChangeFlowBiz {
@Autowired @Autowired
private ItemService itemService; private ItemService itemService;
@Autowired
private InteriorChangeConfigService interiorChangeConfigService;
public String createAndSubmit(ChangeFlowCreateReq changeFlowCreateReq) { public String createAndSubmit(ChangeFlowCreateReq changeFlowCreateReq) {
String uid = RequestLocalBean.getUid(); String uid = RequestLocalBean.getUid();
log.info("[create] createReq={}, uid:{}", JSON.toJSONString(changeFlowCreateReq), uid); log.info("[create] createReq={}, uid:{}", JSON.toJSONString(changeFlowCreateReq), uid);
...@@ -603,6 +608,9 @@ public class ChangeFlowBiz { ...@@ -603,6 +608,9 @@ public class ChangeFlowBiz {
// 批量查询物理类目 // 批量查询物理类目
Map<Long, List<SimplePhyCateGoryResultCo>> categoryChain = itemService Map<Long, List<SimplePhyCateGoryResultCo>> categoryChain = itemService
.queryBySpuIds(CommonIdsParamQuery.builder().ids(itemIds).build()); .queryBySpuIds(CommonIdsParamQuery.builder().ids(itemIds).build());
// 查询商品对应负责人信息
Map<Long, ChangeGoodsPrincipalPO> longChangeGoodsPrincipalPOMap = interiorChangeConfigService
.queryGoodsPrincipalInfo(itemIds);
List<ItemBasicInfoVO> itemBasicInfoVOS = itemList.stream().map(itemVO -> { List<ItemBasicInfoVO> itemBasicInfoVOS = itemList.stream().map(itemVO -> {
ItemBasicInfoVO itemBasicInfoVO = new ItemBasicInfoVO(); ItemBasicInfoVO itemBasicInfoVO = new ItemBasicInfoVO();
Long itemId = itemVO.getItemId(); Long itemId = itemVO.getItemId();
...@@ -631,9 +639,10 @@ public class ChangeFlowBiz { ...@@ -631,9 +639,10 @@ public class ChangeFlowBiz {
int business = StringUtils.isBlank(businessForm) ? 0 : Integer.parseInt(businessForm); int business = StringUtils.isBlank(businessForm) ? 0 : Integer.parseInt(businessForm);
itemBasicInfoVO.setBusinessForm(business); itemBasicInfoVO.setBusinessForm(business);
itemBasicInfoVO.setStatus(spuTO.getStatus()); itemBasicInfoVO.setStatus(spuTO.getStatus());
itemBasicInfoVO.setProjectCommander(null); ChangeGoodsPrincipalPO changeGoodsPrincipalPO = longChangeGoodsPrincipalPOMap.get(itemId);
itemBasicInfoVO.setProjectCommander(changeGoodsPrincipalPO.getGoodsProjectEmail());
itemBasicInfoVO.setPurchaseCommander(null); itemBasicInfoVO.setPurchaseCommander(null);
itemBasicInfoVO.setSQECommander(null); itemBasicInfoVO.setSqeCommander(null);
itemBasicInfoVO.setPlanCommander(null); itemBasicInfoVO.setPlanCommander(null);
return itemBasicInfoVO; return itemBasicInfoVO;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
......
...@@ -8,6 +8,8 @@ package com.netease.mail.yanxuan.change.dal.meta.model.vo; ...@@ -8,6 +8,8 @@ package com.netease.mail.yanxuan.change.dal.meta.model.vo;
import java.util.List; import java.util.List;
import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeGoodsPrincipalPO;
import lombok.Data; import lombok.Data;
/** /**
...@@ -52,22 +54,8 @@ public class ItemBasicInfoVO { ...@@ -52,22 +54,8 @@ public class ItemBasicInfoVO {
private Integer status; private Integer status;
/** /**
* 商品负责人 * 商品负责人信息
*/ */
private String projectCommander; private ChangeGoodsPrincipalPO changeGoodsPrincipal;
/**
* 采购负责人
*/
private String purchaseCommander;
/**
* SQE负责人
*/
private String SQECommander;
/**
* 计划负责人
*/
private String planCommander;
} }
\ No newline at end of file
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