修改ICM LINKVO的版本，将大版本修改为小版本

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

@@ -50,8 +50,8 @@ import com.yonde.dex.basedata.entity.users.DxUserVO;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @ToString(callSuper = true)
-@DexTypeVersionProp(propName = "target", join = @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.VERSION))
-@DexTypeVersionProp(propName = "source", join = @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.VERSION))
+@DexTypeVersionProp(propName = "target", join = @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.ITERATION))
+@DexTypeVersionProp(propName = "source", join = @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.ITERATION))
 public class ExtICMPlanDocLinkVO extends IdOnlyVO implements IdVO ,DxLinkDataVOHolder<ExtICMExternalInterfacePlanVO, DxDocumentVO> ,DxLogicDeleteVOHolder{
 
     public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";

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

@@ -99,7 +99,7 @@ public class ExtPuchasePlanExcelVO {
     /**
      * 备注
      */
-    @ExcelProperty(value = {"采购计划","备注*"},index = 9)
+    @ExcelProperty(value = {"采购计划","备注"},index = 9)
     @ColumnWidth(20)
     private String note;
 

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

@@ -190,8 +190,10 @@ public class ICMPlanExcelListenner extends AnalysisEventListener<ExtICMPlanExcel
         SearchItems icmPlanSearch = new SearchItems();
         SearchItem numberFilter = new SearchItem("planNumber", SearchItem.Operator.EQ, planNumber, (Object)null);
         SearchItem latestFilter = new SearchItem("latest", SearchItem.Operator.EQ, true, (Object)null);
+        SearchItem projectIdFilter = new SearchItem("dxContextId", SearchItem.Operator.EQ, projectId, (Object)null);
         icmPlanSearch.addItem(numberFilter);
         icmPlanSearch.addItem(latestFilter);
+        icmPlanSearch.addItem(projectIdFilter);
         SearchQueryCondition searchQuery = SearchQueryCondition.builder().searchItems(icmPlanSearch).sortItem(Lists.newArrayList(new SortItem[]{sortByModifyTime})).build();
         //根据计划编码查询出最新版本的计划
         DxPageImpl<ExtICMExternalInterfacePlanVO> ICMPlanPage = extICMExternalInterfacePlanService.findRecursion(searchQuery);

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

@@ -29,6 +29,8 @@ import org.springframework.util.ObjectUtils;
 import javax.servlet.ServletContextListener;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 @Component
 @Slf4j
@@ -43,6 +45,11 @@ public class PurchasePlanExcelReadListenner extends AnalysisEventListener<ExtPuc
 
     private String projectId;
 
+    /**
+     * 密级列别
+     */
+    private Map<Integer,String> securityList = new ConcurrentHashMap();
+
     /**
      * excel数据行数
      */