Commit 283a46cf authored by wangqiang's avatar wangqiang

修改IED 获取项目代号

parent 32d4db3e
...@@ -289,6 +289,9 @@ public class IEDPlanExcelListenner extends AnalysisEventListener<ExtIEDPlanExcel ...@@ -289,6 +289,9 @@ public class IEDPlanExcelListenner extends AnalysisEventListener<ExtIEDPlanExcel
} }
extIEDPlanVO.setEditor(extIEDPlanExcelVO.getEditor()); extIEDPlanVO.setEditor(extIEDPlanExcelVO.getEditor());
Map<String,Object> dynamicAttrs = new HashMap<>();
dynamicAttrs.put("editorName",userUtils.getUserById(Long.valueOf(extIEDPlanExcelVO.getEditor())));
extIEDPlanVO.setDynamicAttrs(dynamicAttrs);
extIEDPlanVO.setChecker(extIEDPlanExcelVO.getChecker()); extIEDPlanVO.setChecker(extIEDPlanExcelVO.getChecker());
extIEDPlanVO.setAuditor(extIEDPlanExcelVO.getAuditor()); extIEDPlanVO.setAuditor(extIEDPlanExcelVO.getAuditor());
extIEDPlanVO.setInvestigator(extIEDPlanExcelVO.getInvestigator()); extIEDPlanVO.setInvestigator(extIEDPlanExcelVO.getInvestigator());
...@@ -299,6 +302,7 @@ public class IEDPlanExcelListenner extends AnalysisEventListener<ExtIEDPlanExcel ...@@ -299,6 +302,7 @@ public class IEDPlanExcelListenner extends AnalysisEventListener<ExtIEDPlanExcel
extIEDPlanVO.setSecretCode(secretCode); extIEDPlanVO.setSecretCode(secretCode);
extIEDPlanVO.setDxContextId(Long.parseLong(projectId)); extIEDPlanVO.setDxContextId(Long.parseLong(projectId));
} }
public ExtIEDPlanVO getIEDPlanByFileNumber(String fileNumber) { public ExtIEDPlanVO getIEDPlanByFileNumber(String fileNumber) {
......
...@@ -206,13 +206,13 @@ public class ExtIEDPlanServiceImpl<V extends ExtIEDPlanVO> implements ExtIEDPlan ...@@ -206,13 +206,13 @@ public class ExtIEDPlanServiceImpl<V extends ExtIEDPlanVO> implements ExtIEDPlan
dynamicAttrs.put("editor", extIEDPlanVO.getEditor()); dynamicAttrs.put("editor", extIEDPlanVO.getEditor());
//设置动态属性 //设置动态属性
dxDocumentVO.setDynamicAttrs(dynamicAttrs); dxDocumentVO.setDynamicAttrs(dynamicAttrs);
//设备号
// dxDocumentExpand.setOwnedEquipment(extIEDPlanVO.getDeviceNumber());
//创建时间 //创建时间
dxDocumentVO.setCreateTime(LocalDateTime.now()); dxDocumentVO.setCreateTime(LocalDateTime.now());
//文档扩展类的设备号
dxDocumentExpand.setOwnedEquipment(extIEDPlanVO.getDeviceNumber());
//文档扩展类的项目代号
dxDocumentExpand.setProjectCode(extIEDPlanVO.getDxContext().getNumber());
//设置扩展属性 //设置扩展属性
//项目代号
//todo wq项目代号暂时还未取到
dxDocumentVO.setDxDocumentExpand(dxDocumentExpand); dxDocumentVO.setDxDocumentExpand(dxDocumentExpand);
dxDocumentVO.setOperator(OperatorType.ADD); dxDocumentVO.setOperator(OperatorType.ADD);
DxDocumentVO dxDocumentVOForDB = extDxDocumentServiceFeign.saveRecursion(dxDocumentVO); DxDocumentVO dxDocumentVOForDB = extDxDocumentServiceFeign.saveRecursion(dxDocumentVO);
......
...@@ -18,4 +18,8 @@ public class UserUtils { ...@@ -18,4 +18,8 @@ public class UserUtils {
public DxUserInfoVO getUserByName(String name){ public DxUserInfoVO getUserByName(String name){
return dxUserInfoFeign.getUserByName(name); return dxUserInfoFeign.getUserByName(name);
} }
public DxUserInfoVO getUserById(Long id){
return dxUserInfoFeign.getByUserId(id);
}
} }
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