Skip to content

Y
yanxuan-qc-change-system
Commit d57b1b0a by “zcwang”
Options

modify：导出字段完善

parent 43682a60
Showing with 460 additions and 53 deletions
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
......@@ -46,6 +46,7 @@ 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.ItemService;
import com.netease.mail.yanxuan.change.biz.service.rpc.IusService;
import com.netease.mail.yanxuan.change.biz.service.rpc.QCService;
import com.netease.mail.yanxuan.change.biz.service.rpc.SupplierSendService;
import com.netease.mail.yanxuan.change.biz.service.rpc.SupplierService;
import com.netease.mail.yanxuan.change.biz.service.rpc.TodoService;
......@@ -102,6 +103,7 @@ import com.netease.mail.yanxuan.change.integration.item.SimplePhyCateGoryResultC
import com.netease.mail.yanxuan.change.integration.item.meta.SpuTO;
import com.netease.mail.yanxuan.change.integration.item.param.BatchQuerySpuInfoParam;
import com.netease.mail.yanxuan.change.integration.item.param.CommonIdsParamQuery;
import com.netease.mail.yanxuan.change.integration.qc.meta.QcCategoryVO;
import com.netease.mail.yanxuan.change.integration.todo.ChangeExecuteEmailDTO;
import com.netease.mail.yanxuan.change.integration.todo.TaskCreateDTO;
import com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse;
......@@ -172,6 +174,9 @@ public class ChangeFlowBiz {
@Autowired
private SupplierService supplierService;
@Autowired
private QCService qcService;
public String createAndSubmit(ChangeFlowCreateReq changeFlowCreateReq) {
String uid = RequestLocalBean.getUid();
String name = RequestLocalBean.getName();
......@@ -994,7 +999,14 @@ public class ChangeFlowBiz {
Long itemId = itemVO.getItemId();
itemBasicInfoVO.setItemId(itemId);
itemBasicInfoVO.setItemName(itemVO.getItemName());
itemBasicInfoVO.setQcCategory(null);
List<QcCategoryVO> qcCategoryList = qcService.getQcCategoryListByItemId(itemId);
if (CollectionUtils.isNotEmpty(qcCategoryList)) {
String collect = qcCategoryList.stream().map(QcCategoryVO::getCategoryName)
.collect(Collectors.joining("/"));
itemBasicInfoVO.setQcCategory(collect);
} else {
itemBasicInfoVO.setQcCategory("/");
}
List<SimplePhyCateGoryResultCo> simplePhyCateGoryResultCos = categoryChain.get(itemId);
if (CollectionUtils.isEmpty(simplePhyCateGoryResultCos)) {
throw ExceptionFactory.createBiz(ResponseCode.THIRD_ERR, "未查询到物理类目");
......
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/callback/ChangeFlowExportCallback.java
......@@ -6,7 +6,12 @@
*/
package com.netease.mail.yanxuan.change.biz.callback;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import org.apache.commons.collections4.CollectionUtils;
......@@ -23,16 +28,34 @@ import com.netease.mail.dp.des.process.api.entity.ExcelTitle;
import com.netease.mail.dp.des.process.api.entity.PivotTable;
import com.netease.mail.dp.des.starter.callback.DesCallbackService;
import com.netease.mail.yanxuan.change.biz.service.ChangeFlowExportQuery;
import com.netease.mail.yanxuan.change.biz.service.InteriorChangeConfigService;
import com.netease.mail.yanxuan.change.biz.service.change.ChangeTypeService;
import com.netease.mail.yanxuan.change.biz.service.rpc.ItemService;
import com.netease.mail.yanxuan.change.biz.service.rpc.IusService;
import com.netease.mail.yanxuan.change.biz.service.rpc.QCService;
import com.netease.mail.yanxuan.change.common.enums.BusinessFormEnum;
import com.netease.mail.yanxuan.change.common.enums.ChangeStatusEnum;
import com.netease.mail.yanxuan.change.common.enums.ChangeSubjectEnum;
import com.netease.mail.yanxuan.change.common.enums.MainSpuStatusEnum;
import com.netease.mail.yanxuan.change.common.util.DateUtils;
import com.netease.mail.yanxuan.change.common.util.ExcelUtil;
import com.netease.mail.yanxuan.change.dal.entity.ChangeExecRecord;
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.mapper.ChangeExecRecordMapper;
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.ChangeFlowListQueryReq;
import com.netease.mail.yanxuan.change.dal.meta.model.vo.ItemVO;
import com.netease.mail.yanxuan.change.integration.excel.ChangeFlowExcelDTO;
import com.netease.mail.yanxuan.change.integration.excel.ChangeFlowExcelVo;
import com.netease.mail.yanxuan.change.integration.flow.UserQueryDTO;
import com.netease.mail.yanxuan.change.integration.flow.ius.rsp.IusUserInfoRsp;
import com.netease.mail.yanxuan.change.integration.item.SimplePhyCateGoryResultCo;
import com.netease.mail.yanxuan.change.integration.item.meta.SpuTO;
import com.netease.mail.yanxuan.change.integration.item.param.BatchQuerySpuInfoParam;
import com.netease.mail.yanxuan.change.integration.item.param.CommonIdsParamQuery;
import com.netease.mail.yanxuan.change.integration.qc.meta.QcCategoryVO;
import lombok.extern.slf4j.Slf4j;
......@@ -49,7 +72,21 @@ public class ChangeFlowExportCallback implements DesCallbackService {
@Autowired
private ChangeTypeService changeTypeService;
@Autowired
private ChangeExecRecordMapper changeExecRecordMapper;
@Autowired
private ItemService itemService;
@Autowired
private InteriorChangeConfigService interiorChangeConfigService;
@Autowired
private QCService qcService;
@Autowired
private IusService iusService;
@Override
public ExcelTitle queryExcelTitle(CallbackQueryReq req) {
......@@ -82,36 +119,146 @@ public class ChangeFlowExportCallback implements DesCallbackService {
if (CollectionUtils.isEmpty(changeRecords)) {
return Lists.newArrayList();
}
List<ChangeFlowExcelDTO> changeFlowExcelDTOList = new ArrayList<>();
// 导出excel，按照商品/供应商和行动项，n*n重复拆分，例2个商品3个行动项，拆分成2*3=6行，其他属性一致
for (ChangeRecord record : changeRecords) {
ChangeSubjectEnum changeSubjectEnum = ChangeSubjectEnum.getChangeSubjectEnum(record.getChangeSubject());
switch (changeSubjectEnum) {
case PRODUCT:
String changeItemJsonStr = record.getChangeItem();
List<ItemVO> itemVOS = JSON.parseArray(changeItemJsonStr, ItemVO.class);
List<ChangeExecRecord> changeExecRecords = changeExecRecordMapper.selectByChangeRecordId(record.getId());
List<IusUserInfoRsp> userListInfo = new ArrayList<>();
try {
Set<String> userEmail = changeExecRecords.stream().map(ChangeExecRecord::getChangeExecUserEmail).collect(Collectors.toSet());
userListInfo = iusService.queryUserListInfo(UserQueryDTO.builder().uids(new ArrayList<>(userEmail)).build());
} catch (Exception ex) {
log.info("query user info has ex", ex);
}
List<Long> itemIds = itemVOS.stream().map(ItemVO::getItemId).collect(Collectors.toList());
// 批量查询spu信息
List<SpuTO> spuTOS = itemService.batchQuerySpuInfo(BatchQuerySpuInfoParam.builder().ids(itemIds)
.commonProps(new ArrayList<>()).spuProps(Arrays.asList("itemSetupType", "businessForm")).build());
// 批量查询物理类目
Map<Long, List<SimplePhyCateGoryResultCo>> categoryChain = itemService
.queryBySpuIds(CommonIdsParamQuery.builder().ids(itemIds).build());
// 查询商品对应负责人信息
Map<Long, ChangeGoodsPrincipalPO> longChangeGoodsPrincipalPOMap = interiorChangeConfigService
.queryGoodsPrincipalInfo(itemIds);
log.debug("[detail] spuTOS:{}", JSON.toJSONString(spuTOS));
for (ItemVO itemVO : itemVOS) {
for (ChangeExecRecord changeExecRecord : changeExecRecords) {
Long itemId = itemVO.getItemId();
// 组装通用信息，除商品信息，行动项以外其他字段一致
ChangeFlowExcelDTO changeFlowExcelDTO = this.obtainCommon(record, changeSubjectEnum);
changeFlowExcelDTO.setSupplier("/");
changeFlowExcelDTO.setChangeItem(itemVO.getItemName());
changeFlowExcelDTO.setSPUId(itemId);
List<QcCategoryVO> qcCategoryList = qcService.getQcCategoryListByItemId(itemId);
if (CollectionUtils.isNotEmpty(qcCategoryList)) {
String collect = qcCategoryList.stream().map(QcCategoryVO::getCategoryName)
.collect(Collectors.joining("/"));
changeFlowExcelDTO.setQcCategory(collect);
} else {
changeFlowExcelDTO.setQcCategory("/");
}
List<SimplePhyCateGoryResultCo> simplePhyCateGoryResultCos = categoryChain.get(itemId);
if (CollectionUtils.isNotEmpty(simplePhyCateGoryResultCos)) {
String collect = simplePhyCateGoryResultCos.stream()
.map(SimplePhyCateGoryResultCo::getName).collect(Collectors.joining("/"));
changeFlowExcelDTO.setPhyCategory(collect);
} else {
changeFlowExcelDTO.setPhyCategory("/");
}
Optional<SpuTO> optionalSpuTO = spuTOS.stream().filter(spu -> spu.getId() == itemId).findAny();
if (!optionalSpuTO.isPresent()) {
} else {
SpuTO spuTO = optionalSpuTO.get();
Map<String, String> propertyMap = spuTO.getPropertyMap();
changeFlowExcelDTO.setItemSetupType(Integer.valueOf(propertyMap.get("itemSetupType")));
String businessForm = propertyMap.get("businessForm");
int business = StringUtils.isBlank(businessForm) ? 0 : Integer.parseInt(businessForm);
changeFlowExcelDTO.setBusinessForm(BusinessFormEnum.getByType(business));
changeFlowExcelDTO.setStatus(MainSpuStatusEnum.getByStatus(spuTO.getStatus()));
}
ChangeGoodsPrincipalPO changeGoodsPrincipalPO = longChangeGoodsPrincipalPOMap.get(itemId);
changeFlowExcelDTO.setFunctionary(changeGoodsPrincipalPO.getFunctionaryName()
+ changeGoodsPrincipalPO.getFunctionaryEmail());
changeFlowExcelDTO.setPurchase(
changeGoodsPrincipalPO.getPurchaseName() + changeGoodsPrincipalPO.getPurchaseEmail());
changeFlowExcelDTO.setGoodsSqe(
changeGoodsPrincipalPO.getGoodsSqeName() + changeGoodsPrincipalPO.getGoodsSqeEmail());
changeFlowExcelDTO.setGoodsProjectName(
changeGoodsPrincipalPO.getGoodsProjectName() + changeGoodsPrincipalPO.getGoodsProjectEmail());
// 组装行动项相关信息
obtainChangeExec(changeExecRecord, changeFlowExcelDTO, userListInfo);
changeFlowExcelDTO.setChangeResult(record.getChangeResult());
changeFlowExcelDTO
.setChangeEndTime(record.getState().equals(ChangeStatusEnum.END.getStatus())
? DateUtils.parseLongToString(record.getUpdateTime(), DateUtils.DATE_TIME_FORMAT)
: "");
changeFlowExcelDTOList.add(changeFlowExcelDTO);
}
}
case SUPPLIER:
// 供应商变更，以行动项循环
case OTHER:
default:
}
}
return changeRecords.stream().map(record -> {
ChangeFlowExcelDTO changeFlowExcelDTO = new ChangeFlowExcelDTO();
changeFlowExcelDTO.setId(record.getId());
changeFlowExcelDTO
.setChangeSubject(ChangeSubjectEnum.getChangeSubjectEnum(record.getChangeSubject()).getDesc());
ChangeType parentChangeType = changeTypeService.getChangeTypeById(record.getParentChangeClassId());
ChangeType sonChangeType = changeTypeService.getChangeTypeById(record.getSonChangeClassId());
changeFlowExcelDTO.setChangeType(parentChangeType.getTypeName() + ">" + sonChangeType.getTypeName());
changeFlowExcelDTO.setChangeDepartment(record.getChangeDepartment());
changeFlowExcelDTO.setChangeContent(record.getChangeContent());
changeFlowExcelDTO.setChangeCommander(record.getChangeCommander());
String changeItemJsonStr = record.getChangeItem();
if (StringUtils.isNotBlank(changeItemJsonStr)) {
List<ItemVO> itemVOS = JSON.parseArray(changeItemJsonStr, ItemVO.class);
changeFlowExcelDTO.setChangeItems(itemVOS.stream().map(item -> item.getItemId() + item.getItemName())
.collect(Collectors.joining(",")));
}
if (StringUtils.isNotBlank(record.getChangeSupplier())) {
changeFlowExcelDTO.setSupplier(record.getChangeSupplier());
}
changeFlowExcelDTO.setChangeState(record.getState());
// todo:变更发起人组织查询：姓名（组织架构三级部门）/供应商ID/system+发起时间
changeFlowExcelDTO.setChangeCreator(record.getCreator());
changeFlowExcelDTO.setExecDepartmentStrList(record.getParticipateChangeExecDepartment());
changeFlowExcelDTO.setCreateTime(record.getCreateTime());
return changeFlowExcelDTO;
}).collect(Collectors.toList());
}
private void obtainChangeExec(ChangeExecRecord changeExecRecord, ChangeFlowExcelDTO changeFlowExcelDTO,
List<IusUserInfoRsp> userListInfo) {
changeFlowExcelDTO.setExecDepartment(changeExecRecord.getChangeExecDepartment());
Optional<IusUserInfoRsp> anyExeUser = userListInfo.stream()
.filter(u -> u.getUid().equals(changeExecRecord.getChangeExecUserEmail())).findAny();
String execUserName = "";
if (anyExeUser.isPresent()) {
execUserName = anyExeUser.get().getName();
}
changeFlowExcelDTO.setChangeExecUser(execUserName + changeExecRecord.getChangeExecUserEmail());
changeFlowExcelDTO.setChangeExecRiskDesc(changeExecRecord.getChangeRiskDesc());
changeFlowExcelDTO.setChangeExecProject(changeExecRecord.getChangeExecProject());
changeFlowExcelDTO.setChangeChecking(changeExecRecord.getChangeChecking());
changeFlowExcelDTO.setChangeExecFinishTime(changeExecRecord.getChangeExecFinishTime());
changeFlowExcelDTO.setChangeExecFinishDesc(changeExecRecord.getChangeExecFinishDesc());
}
/**
* 组装通用字段
* @param record
* @param changeSubjectEnum
* @return
*/
private ChangeFlowExcelDTO obtainCommon(ChangeRecord record, ChangeSubjectEnum changeSubjectEnum) {
ChangeFlowExcelDTO changeFlowExcelDTO = new ChangeFlowExcelDTO();
changeFlowExcelDTO.setFlowId(record.getFlowId());
String createTimeStr = DateUtils.parseLongToString(record.getCreateTime(), DateUtils.DATE_TIME_FORMAT);
changeFlowExcelDTO.setCreateTime(createTimeStr);
changeFlowExcelDTO.setChangeCreator(record.getCreator());
changeFlowExcelDTO.setChangeSubject(changeSubjectEnum.getDesc());
ChangeType parentChangeType = changeTypeService.getChangeTypeById(record.getParentChangeClassId());
ChangeType sonChangeType = changeTypeService.getChangeTypeById(record.getSonChangeClassId());
changeFlowExcelDTO.setChangeType(parentChangeType.getTypeName() + ">" + sonChangeType.getTypeName());
changeFlowExcelDTO.setChangeLevel(record.getChangeLevel());
changeFlowExcelDTO.setChangeDepartment(record.getChangeDepartment());
changeFlowExcelDTO.setChangeCommander(record.getChangeCommander());
changeFlowExcelDTO.setChangeReason(record.getChangeReason());
changeFlowExcelDTO.setChangeContent(record.getChangeContent());
changeFlowExcelDTO.setChangeRiskDesc(record.getChangeRiskDesc());
changeFlowExcelDTO.setChangeProfit(record.getChangeProfit());
changeFlowExcelDTO.setChangeProfitDesc(record.getChangeProfitDesc());
return changeFlowExcelDTO;
}
@Override
public PivotTable queryPivotTable(CallbackQueryReq callbackQueryReq) {
return null;
......
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/rpc/ItemService.java
......@@ -70,4 +70,6 @@ public class ItemService {
response.getMsg());
return new ArrayList<>();
}
}
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/rpc/IusService.java
......@@ -6,10 +6,10 @@
*/
package com.netease.mail.yanxuan.change.biz.service.rpc;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
......@@ -17,8 +17,10 @@ import com.alibaba.fastjson.JSON;
import com.netease.mail.yanxuan.change.biz.meta.exception.ExceptionFactory;
import com.netease.mail.yanxuan.change.common.bean.ResponseCode;
import com.netease.mail.yanxuan.change.common.bean.ResponseCodeEnum;
import com.netease.mail.yanxuan.change.integration.flow.UserQueryDTO;
import com.netease.mail.yanxuan.change.integration.flow.ius.IusRpcService;
import com.netease.mail.yanxuan.change.integration.flow.ius.req.IusDepartmentReq;
import com.netease.mail.yanxuan.change.integration.flow.ius.rsp.IusUserInfoRsp;
import com.netease.mail.yanxuan.change.integration.flow.ius.rsp.SecondaryDepartments;
import com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse;
......@@ -47,4 +49,20 @@ public class IusService {
throw ExceptionFactory.createBiz(ResponseCode.CREATE_FLOW_ERROR, "查询部门错误");
}
}
/**
* 查询用户信息
*/
public List<IusUserInfoRsp> queryUserListInfo(UserQueryDTO query) {
log.info("[queryUserListInfo] queryUserListInfo req:{}", JSON.toJSONString(query));
AjaxResponse<List<IusUserInfoRsp>> response = iusRpcService.queryUserListInfo(query);
log.info("[queryUserListInfo] response of queryUserListInfo ={}", JSON.toJSONString(response));
if (ResponseCodeEnum.SUCCESS.getCode() == response.getCode()) {
return response.getData();
} else {
log.error("[queryUserListInfo] queryUserListInfo failed, query={}, errMsg={}", JSON.toJSONString(query),
JSON.toJSONString(response));
return new ArrayList<>();
}
}
}
\ No newline at end of file
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/rpc/QCService.java
......@@ -6,6 +6,8 @@
*/
package com.netease.mail.yanxuan.change.biz.service.rpc;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
......@@ -27,9 +29,9 @@ public class QCService {
@Autowired
private QcRpcService qcRpcService;
public QcCategoryVO getQcCategoryListByItemId(Long itemId) {
public List<QcCategoryVO> getQcCategoryListByItemId(Long itemId) {
log.info("[QCService-getQcCategoryListByItemId] request of query={}", itemId);
AjaxResult<QcCategoryVO> response = qcRpcService.getQcCategoryListByItemId(itemId);
AjaxResult<List<QcCategoryVO>> response = qcRpcService.getQcCategoryListByItemId(itemId);
log.info("[QCService-getQcCategoryListByItemId] response of query QcCategoryList ={}",
JSON.toJSONString(response));
if (Boolean.TRUE.equals(response.isSuccess())) {
......
yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/enums/BusinessFormEnum.java 0 → 100644
/**
* @(#)BusinessFormEnum.java, 2022/12/20.
* <p/>
* Copyright 2022 Netease, Inc. All rights reserved.
* NETEASE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
*/
package com.netease.mail.yanxuan.change.common.enums;
/**
* @Author zcwang
* @Date 2022/12/20
*/
public enum BusinessFormEnum {
SELF_SUPPORT(0,"自营"),
YX_SELECTION_OEM(3,"严选贴牌代销"),
OTHER_BRANDS(4,"他方品牌代销"),
COMMISSION2(5,"代销2.0");
private Integer type;
private String desc;
BusinessFormEnum(Integer type, String desc) {
this.type = type;
this.desc = desc;
}
public Integer getType() {
return type;
}
public String getDesc() {
return desc;
}
public static String getByType(Integer type) {
for (BusinessFormEnum value : BusinessFormEnum.values()) {
if (value.getType().equals(type)) {
return value.getDesc();
}
}
return "";
}
}
\ No newline at end of file
yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/enums/MainSpuStatusEnum.java 0 → 100644
/**
* @(#)MainSpuStatusEmum.java, 2022/12/20.
* <p/>
* Copyright 2022 Netease, Inc. All rights reserved.
* NETEASE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
*/
package com.netease.mail.yanxuan.change.common.enums;
/**
* @Author zcwang
* @Date 2022/12/20
*/
public enum MainSpuStatusEnum {
INIT(0,"未上架"),
NOT_ON_SHELVES(3,"未上架"),
ON_SHELVES(4,"已上架"),
PRESHELVING(5,"预上架");
private Integer status;
private String desc;
MainSpuStatusEnum(Integer status, String desc) {
this.status = status;
this.desc = desc;
}
public Integer getStatus() {
return status;
}
public String getDesc() {
return desc;
}
public static String getByStatus(Integer status) {
for (MainSpuStatusEnum value : MainSpuStatusEnum.values()) {
if (value.getStatus().equals(status)) {
return value.getDesc();
}
}
return "";
}
}
\ No newline at end of file
yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/excel/ChangeFlowExcelDTO.java
......@@ -6,7 +6,6 @@
*/
package com.netease.mail.yanxuan.change.integration.excel;
import com.netease.mail.yanxuan.change.common.enums.ChangeStatusEnum;
import com.netease.mail.yanxuan.change.common.enums.ChangeSubjectEnum;
import cn.afterturn.easypoi.excel.annotation.Excel;
......@@ -19,10 +18,22 @@ import lombok.Data;
@Data
public class ChangeFlowExcelDTO {
/**
* 主键id
* 变更id
*/
@Excel(name = "变更ID")
private Long id;
@Excel(name = "变更id")
private Long flowId;
/**
* 变更发起时间
*/
@Excel(name = "变更发起时间")
private String createTime;
/**
* 变更发起人
*/
@Excel(name = "变更发起人")
private String changeCreator;
/**
* 变更主体
......@@ -30,6 +41,7 @@ public class ChangeFlowExcelDTO {
*/
@Excel(name = "变更主体")
private String changeSubject;
/**
* 变更类型，一级类型>二级类型
*/
......@@ -37,53 +49,172 @@ public class ChangeFlowExcelDTO {
private String changeType;
/**
* 变更等级
*/
@Excel(name = "变更等级")
private Integer changeLevel;
/**
* 变更负责部门名
*/
@Excel(name = "变更负责部门名")
private String changeDepartment;
/**
* 变更负责人
*/
@Excel(name = "变更负责人")
private String changeCommander;
/**
* 变更供应商：供应商ID+供应商名称
*/
@Excel(name = "变更供应商")
private String supplier;
/**
* 变更原因
*/
@Excel(name = "变更原因")
private String changeReason;
/**
* 变更内容
*/
@Excel(name = "变更内容")
private String changeContent;
/**
* 变更负责人
* 变更潜在风险描述
*/
@Excel(name = "变更负责人")
private String changeCommander;
@Excel(name = "变更潜在风险描述")
private String changeRiskDesc;
/**
* 变更商品列表，SPUID+商品名称
* 变更收益类型
*/
@Excel(name = "变更收益类型")
private Integer changeProfit;
/**
* 变更收益说明
*/
@Excel(name = "变更收益说明")
private String changeProfitDesc;
/**
* 变更商品,商品名称
*/
@Excel(name = "变更商品")
private String changeItems;
private String changeItem;
/**
* 变更供应商，仅展示供应商ID，没有时展示为“/”
* SPUID
*/
@Excel(name = "变更供应商")
private String supplier;
@Excel(name = "SPUID")
private Long SPUId;
/**
* 变更状态
* @see ChangeStatusEnum
* 品控类目
*/
@Excel(name = "变更状态")
private Integer changeState;
@Excel(name = "品控类目")
private String qcCategory;
/**
* 变更发起人
* 物理类目
*/
@Excel(name = "变更发起人")
private String changeCreator;
@Excel(name = "物理类目")
private String phyCategory;
/**
* 商品立项类型，0-正常立项商品，2-特殊免立项商品 3-组合装
*/
@Excel(name = "商品立项类型")
private Integer itemSetupType;
/**
* 经营形式，0-自营，3-严选贴牌代销，4-他方品牌代销，5-代销2.0
*/
@Excel(name = "经营形式")
private String businessForm;
/**
* 商品状态，0-未上架，1-未上架，2-已上架，4-预上架
*/
@Excel(name = "商品状态")
private String status;
/**
* 商品负责人
*/
@Excel(name = "商品负责人")
private String functionary;
/**
* 采购负责人
*/
@Excel(name = "采购负责人")
private String purchase;
/**
* SQE负责人
*/
@Excel(name = "SQE负责人")
private String goodsSqe;
/**
* 计划负责人
*/
@Excel(name = "计划负责人")
private String goodsProjectName;
/**
* 变更行动部门列表
* 变更行动部门
*/
@Excel(name = "变更行动部门")
private String execDepartmentStrList;
private String execDepartment;
/**
* 变更行动人
*/
@Excel(name = "变更行动人")
private String changeExecUser;
/**
* 行动项变更风险描述
*/
@Excel(name = "行动项变更风险描述")
private String changeExecRiskDesc;
/**
* 行动项
*/
@Excel(name = "行动项")
private String changeExecProject;
/**
* 创建时间
* 变更验证措施
*/
@Excel(name = "创建时间")
private Long createTime;
@Excel(name = "变更验证措施")
private String changeChecking;
/**
* 行动完成时间
*/
@Excel(name = "行动完成时间")
private Long changeExecFinishTime;
/**
* 行动完成情况
*/
@Excel(name = "行动完成情况")
private String changeExecFinishDesc;
/**
* 变更结论
*/
@Excel(name = "变更结论")
private Integer changeResult;
/**
* 变更完结时间
*/
@Excel(name = "变更完结时间")
private String changeEndTime;
}
\ No newline at end of file
yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/qc/QcRpcService.java
......@@ -6,6 +6,8 @@
*/
package com.netease.mail.yanxuan.change.integration.qc;
import java.util.List;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.PostMapping;
......@@ -22,5 +24,5 @@ import com.netease.yanxuan.missa.client.annotation.MissaClient;
public interface QcRpcService {
@PostMapping("/xhr/item/getQcCategoryListByItemId.json")
AjaxResult<QcCategoryVO> getQcCategoryListByItemId(Long itemId);
AjaxResult<List<QcCategoryVO>> getQcCategoryListByItemId(Long itemId);
}
\ 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