Merge remote-tracking branch 'origin/master'

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/listener/IEDPlanExcelListenner.java

@@ -289,6 +289,9 @@ public class IEDPlanExcelListenner extends AnalysisEventListener<ExtIEDPlanExcel
 
         }
         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.setAuditor(extIEDPlanExcelVO.getAuditor());
         extIEDPlanVO.setInvestigator(extIEDPlanExcelVO.getInvestigator());
@@ -299,6 +302,7 @@ public class IEDPlanExcelListenner extends AnalysisEventListener<ExtIEDPlanExcel
         extIEDPlanVO.setSecretCode(secretCode);
         extIEDPlanVO.setDxContextId(Long.parseLong(projectId));
 
+
     }
 
     public ExtIEDPlanVO getIEDPlanByFileNumber(String fileNumber) {

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/impl/ExtIEDPlanServiceImpl.java

@@ -206,13 +206,13 @@ public class ExtIEDPlanServiceImpl<V extends ExtIEDPlanVO> implements ExtIEDPlan
         dynamicAttrs.put("editor", extIEDPlanVO.getEditor());
         //设置动态属性
         dxDocumentVO.setDynamicAttrs(dynamicAttrs);
-        //设备号
-//        dxDocumentExpand.setOwnedEquipment(extIEDPlanVO.getDeviceNumber());
         //创建时间
         dxDocumentVO.setCreateTime(LocalDateTime.now());
+        //文档扩展类的设备号
+        dxDocumentExpand.setOwnedEquipment(extIEDPlanVO.getDeviceNumber());
+        //文档扩展类的项目代号
+        dxDocumentExpand.setProjectCode(extIEDPlanVO.getDxContext().getNumber());
         //设置扩展属性
-        //项目代号
-        //todo wq项目代号暂时还未取到
         dxDocumentVO.setDxDocumentExpand(dxDocumentExpand);
         dxDocumentVO.setOperator(OperatorType.ADD);
         DxDocumentVO dxDocumentVOForDB = extDxDocumentServiceFeign.saveRecursion(dxDocumentVO);

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/util/UserUtils.java

@@ -18,4 +18,8 @@ public class UserUtils {
     public DxUserInfoVO getUserByName(String name){
         return dxUserInfoFeign.getUserByName(name);
     }
+
+    public DxUserInfoVO getUserById(Long id){
+        return dxUserInfoFeign.getByUserId(id);
+    }
 }