Merge branch 'dev/20220228_v3.0.1通用版_渠道管理第一期' into debug

daqe-center/src/main/java/com/lantone/daqe/facade/ColumnVerifyManagementFacade.java

@@ -19,6 +19,7 @@ import com.lantone.daqe.dto.GetRegularDTO;
 import com.lantone.daqe.dto.GetTableColumnNameDTO;
 import com.lantone.daqe.dto.GetTableNameDTO;
 import com.lantone.daqe.entity.ColumnInfo;
+import com.lantone.daqe.entity.ColumnResult;
 import com.lantone.daqe.entity.ColumnVerify;
 import com.lantone.daqe.entity.NonnullInfo;
 import com.lantone.daqe.entity.RegularInfo;
@@ -26,11 +27,15 @@ import com.lantone.daqe.entity.RegularMapping;
 import com.lantone.daqe.entity.StandardvalueInfo;
 import com.lantone.daqe.enums.ColumnVerifyTypeEnum;
 import com.lantone.daqe.facade.base.ColumnInfoFacade;
+import com.lantone.daqe.facade.base.ColumnResultFacade;
 import com.lantone.daqe.facade.base.ColumnVerifyFacade;
 import com.lantone.daqe.facade.base.NonnullInfoFacade;
+import com.lantone.daqe.facade.base.NonnullResultFacade;
 import com.lantone.daqe.facade.base.RegularInfoFacade;
 import com.lantone.daqe.facade.base.RegularMappingFacade;
+import com.lantone.daqe.facade.base.RegularResultFacade;
 import com.lantone.daqe.facade.base.StandardvalueInfoFacade;
+import com.lantone.daqe.facade.base.StandardvalueResultFacade;
 import com.lantone.daqe.vo.AddColumnVO;
 import com.lantone.daqe.vo.AddColumnVerifyVO;
 import com.lantone.daqe.vo.ColumnInfoVO;
@@ -71,6 +76,15 @@ public class ColumnVerifyManagementFacade {
     NonnullInfoFacade nonnullInfoFacade;
     @Autowired
     StandardvalueInfoFacade standardvalueInfoFacade;
+    @Autowired
+    ColumnResultFacade columnResultFacade;
+    @Autowired
+    StandardvalueResultFacade standardvalueResultFacade;
+    @Autowired
+    NonnullResultFacade nonnullResultFacade;
+    @Autowired
+    RegularResultFacade regularResultFacade;
+
 
     /**
      * 获取字段校验规则分页列表数据
@@ -171,6 +185,7 @@ public class ColumnVerifyManagementFacade {
      */
     public List<GetTableColumnNameDTO> getTableColumnName(GetTableColumnNameVO getTableColumnNameVO) {
         List<GetColumnInfoDTO> columnInfoList = columnInfoFacade.getBaseMapper().getNoVerifyColumnName(getTableColumnNameVO);
+        ColumnInfo columnById = columnInfoFacade.getById(getTableColumnNameVO.getColumnId());
         List<String> columnString = new ArrayList<>();
         List<GetTableColumnNameDTO> getTableColumnNameDTOS = new ArrayList<>();
         for (GetColumnInfoDTO columnInfo : columnInfoList) {
@@ -192,6 +207,16 @@ public class ColumnVerifyManagementFacade {
                     getColumnNameDTOS.add(getColumnNameDTO);
                 }
             }
+            //加入查看时的字段
+            if(columnById!=null) {
+                if (columnInfo.getTableEname().equals(columnById.getTableEname())) {
+                    GetColumnNameDTO getColumnNameDTO = new GetColumnNameDTO();
+                    getColumnNameDTO.setId(columnById.getId());
+                    getColumnNameDTO.setColumnCname(columnById.getColumnCname());
+                    getColumnNameDTO.setColumnEname(columnById.getColumnEname());
+                    getColumnNameDTOS.add(getColumnNameDTO);
+                }
+            }
             getTableColumnNameDTO.setGetTableNameDTO(getTableNameDTO);
             getTableColumnNameDTO.setGetColumnNameDTOList(getColumnNameDTOS);
             getTableColumnNameDTOS.add(getTableColumnNameDTO);

daqe-center/src/main/java/com/lantone/daqe/vo/GetTableColumnNameVO.java

@@ -30,5 +30,7 @@ public class GetTableColumnNameVO implements Serializable {
     @ApiModelProperty(value = "字段名称(英文)")
     private String columnEname;
 
+    @ApiModelProperty(value = "字段Id")
+    private Long columnId;
 
 }