采购计划导入数据校验

dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtPuchasePlanExcelVO.java

@@ -28,17 +28,25 @@ public class ExtPuchasePlanExcelVO {
     @ExcelProperty(value = {"采购计划","操作*"},index = 0)
     @ColumnWidth(20)
     private String operation;
+
+    /**
+     * 计划编码
+     */
+    @ExcelProperty(value = {"采购计划","计划编号*"},index = 1)
+    @ColumnWidth(20)
+    private String planCode;
+
     /**
     * 外协项目名称
     */
-    @ExcelProperty(value = {"采购计划","外协（外购）项目名称*"},index = 1)
+    @ExcelProperty(value = {"采购计划","外协（外购）项目名称*"},index = 2)
     @ColumnWidth(20)
     private String outsourceProjectName;
 
     /**
     * 采购技术文件实际提交时间
     */
-    @ExcelProperty(value = {"采购计划","采购技术文件提交时间*"},index = 2)
+    @ExcelProperty(value = {"采购计划","采购技术文件提交时间*"},index = 3)
     @ColumnWidth(20)
     private LocalDateTime purDesignFileSubmitTime;
 
@@ -46,7 +54,7 @@ public class ExtPuchasePlanExcelVO {
     /**
     * 合同签订时间*
     */
-    @ExcelProperty(value = {"采购计划","合同签订时间*"},index = 3)
+    @ExcelProperty(value = {"采购计划","合同签订时间*"},index = 4)
     @ColumnWidth(20)
     private LocalDateTime contractActualSigningTime;
 
@@ -54,14 +62,14 @@ public class ExtPuchasePlanExcelVO {
     /**
      * 合同交付时间*
      */
-    @ExcelProperty(value = {"采购计划","合同交付时间*"},index = 4)
+    @ExcelProperty(value = {"采购计划","合同交付时间*"},index = 5)
     @ColumnWidth(20)
     private LocalDateTime contractActualDeliveryTime;
 
     /**
      * 采购技术文件负责人
      */
-    @ExcelProperty(value = {"采购计划","采购技术文件负责人*"},index = 5)
+    @ExcelProperty(value = {"采购计划","采购技术文件负责人*"},index = 6)
     @ColumnWidth(20)
     private String purDesignFileManager;
 
@@ -69,7 +77,7 @@ public class ExtPuchasePlanExcelVO {
     /**
      * 采购预算
      */
-    @ExcelProperty(value = {"采购计划","预算(万元)*"},index = 6)
+    @ExcelProperty(value = {"采购计划","预算(万元)*"},index = 7)
     @ColumnWidth(20)
     private String purchaseBudget;
 
@@ -84,16 +92,10 @@ public class ExtPuchasePlanExcelVO {
     /**
      * 密级
      */
-    @ExcelProperty(value = {"采购计划","密级*"},index = 7)
+    @ExcelProperty(value = {"采购计划","密级*"},index = 8)
     @ColumnWidth(20)
     private String secretCode;
 
-    /**
-     * 计划编码
-     */
-    @ExcelProperty(value = {"采购计划","计划编号*"},index = 8)
-    @ColumnWidth(20)
-    private String planCode;
 
 
     /**

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

@@ -290,7 +290,7 @@ 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())));
+        dynamicAttrs.put("editorName", userUtils.getUserById(Long.valueOf(extIEDPlanExcelVO.getEditor())).getName());
         extIEDPlanVO.setDynamicAttrs(dynamicAttrs);
         extIEDPlanVO.setChecker(extIEDPlanExcelVO.getChecker());
         extIEDPlanVO.setAuditor(extIEDPlanExcelVO.getAuditor());

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

@@ -208,6 +208,7 @@ public class ExtIEDPlanServiceImpl<V extends ExtIEDPlanVO> implements ExtIEDPlan
         dxDocumentVO.setDynamicAttrs(dynamicAttrs);
         //创建时间
         dxDocumentVO.setCreateTime(LocalDateTime.now());
+        //todo wq 设备号和项目代号需要产品解决，暂时注释
         //文档扩展类的设备号
         dxDocumentExpand.setOwnedEquipment(extIEDPlanVO.getDeviceNumber());
         //文档扩展类的项目代号