Commit 76836184 by “zcwang”

add: 统一字段

parent f05bf9e3
...@@ -246,7 +246,7 @@ public class ChangeFlowBiz { ...@@ -246,7 +246,7 @@ public class ChangeFlowBiz {
changeExecRecord.setChangeExecUserType(c.getChangeExecUserType()); changeExecRecord.setChangeExecUserType(c.getChangeExecUserType());
changeExecRecord.setChangeExecUser(c.getChangeExecUser()); changeExecRecord.setChangeExecUser(c.getChangeExecUser());
// 查询对应的负责人 // 查询对应的负责人
// interiorChangeConfigService.queryCommanderInfo(c.getChangeExecUserType(), c.getChangeExecUser(), uid); interiorChangeConfigService.queryCommanderEmail(c.getChangeExecUserType(), c.getChangeExecUser(), uid);
changeExecRecord.setChangeRiskDesc(c.getChangeRiskDesc()); changeExecRecord.setChangeRiskDesc(c.getChangeRiskDesc());
changeExecRecord.setChangeExecProject(c.getChangeExecProject()); changeExecRecord.setChangeExecProject(c.getChangeExecProject());
changeExecRecord.setChangeChecking(c.getChangeChecking()); changeExecRecord.setChangeChecking(c.getChangeChecking());
...@@ -597,7 +597,7 @@ public class ChangeFlowBiz { ...@@ -597,7 +597,7 @@ public class ChangeFlowBiz {
changeFlowVO.setChangeLevel(changeRecord.getChangeLevel()); changeFlowVO.setChangeLevel(changeRecord.getChangeLevel());
changeFlowVO.setChangeDepartment(changeRecord.getChangeDepartment()); changeFlowVO.setChangeDepartment(changeRecord.getChangeDepartment());
changeFlowVO.setChangeCommander(changeRecord.getChangeCommander()); changeFlowVO.setChangeCommander(changeRecord.getChangeCommander());
changeFlowVO.setSupplier(changeRecord.getChangeSupplier()); changeFlowVO.setChangeSupplier(changeRecord.getChangeSupplier());
changeFlowVO.setChangeReason(changeRecord.getChangeReason()); changeFlowVO.setChangeReason(changeRecord.getChangeReason());
changeFlowVO.setChangeContent(changeRecord.getChangeContent()); changeFlowVO.setChangeContent(changeRecord.getChangeContent());
changeFlowVO.setChangeRiskDesc(changeRecord.getChangeRiskDesc()); changeFlowVO.setChangeRiskDesc(changeRecord.getChangeRiskDesc());
...@@ -696,7 +696,7 @@ public class ChangeFlowBiz { ...@@ -696,7 +696,7 @@ public class ChangeFlowBiz {
if (StringUtils.isNotBlank(itemJsonStr)) { if (StringUtils.isNotBlank(itemJsonStr)) {
changeFlowVO.setChangeItems(JSON.parseArray(itemJsonStr, ItemVO.class)); changeFlowVO.setChangeItems(JSON.parseArray(itemJsonStr, ItemVO.class));
} }
changeFlowVO.setSupplier(c.getChangeSupplier()); changeFlowVO.setChangeSupplier(c.getChangeSupplier());
changeFlowVO.setChangeState(c.getState()); changeFlowVO.setChangeState(c.getState());
changeFlowVO.setChangeCreator(c.getCreator()); changeFlowVO.setChangeCreator(c.getCreator());
String participateChangeExecDepartment = c.getParticipateChangeExecDepartment(); String participateChangeExecDepartment = c.getParticipateChangeExecDepartment();
......
...@@ -6,6 +6,7 @@ import java.util.Iterator; ...@@ -6,6 +6,7 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -34,13 +35,6 @@ import com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplier ...@@ -34,13 +35,6 @@ import com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplier
import com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierRelatedUserReq; import com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierRelatedUserReq;
import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierUserRsp; import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierUserRsp;
import com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse; import com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse;
import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
/** /**
* @author WangJiaXiang * @author WangJiaXiang
...@@ -284,7 +278,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ ...@@ -284,7 +278,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
commanderResponse.setEmail(changeExecUser); commanderResponse.setEmail(changeExecUser);
break; break;
case GOODS_ASSOCIATED: case GOODS_ASSOCIATED:
// queryGoodsCommander()
} }
return null; return null;
} }
......
...@@ -108,7 +108,7 @@ public class ChangeFlowVO { ...@@ -108,7 +108,7 @@ public class ChangeFlowVO {
/** /**
* 变更供应商 * 变更供应商
*/ */
private String supplier; private String changeSupplier;
/** /**
* 变更状态 * 变更状态
* @see ChangeStatusEnum * @see ChangeStatusEnum
......
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