|
@@ -8,6 +8,7 @@ import com.lantone.common.exception.Asserts;
|
|
|
import com.lantone.common.util.BeanUtil;
|
|
|
import com.lantone.common.util.ListUtil;
|
|
|
import com.lantone.common.util.StringUtil;
|
|
|
+import com.lantone.daqe.dto.GetByIdColumnVerifyDTO;
|
|
|
import com.lantone.daqe.dto.GetColumnInfoDTO;
|
|
|
import com.lantone.daqe.dto.GetColumnNameDTO;
|
|
|
import com.lantone.daqe.dto.GetColumnVerifyPageDTO;
|
|
@@ -30,6 +31,7 @@ import com.lantone.daqe.facade.base.StandardvalueInfoFacade;
|
|
|
import com.lantone.daqe.vo.AddColumnVerifyVO;
|
|
|
import com.lantone.daqe.vo.ColumnInfoVO;
|
|
|
import com.lantone.daqe.vo.DelColumnVerifyVO;
|
|
|
+import com.lantone.daqe.vo.GetByIdColumnVerifyVO;
|
|
|
import com.lantone.daqe.vo.GetColumnNameVO;
|
|
|
import com.lantone.daqe.vo.GetColumnVerifyPageVO;
|
|
|
import com.lantone.daqe.vo.GetRegularVO;
|
|
@@ -75,6 +77,22 @@ public class ColumnVerifyManagementFacade {
|
|
|
return columnVerifyFacade.getBaseMapper().getColumnVerifyPage(getColumnVerifyPageVO);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 根据ID获取字段校验规则明细数据
|
|
|
+ *
|
|
|
+ * @param getByIdColumnVerifyVO
|
|
|
+ * @return: 字段校验规则明细数据
|
|
|
+ */
|
|
|
+ public GetByIdColumnVerifyDTO getByIdColumnVerify(GetByIdColumnVerifyVO getByIdColumnVerifyVO) {
|
|
|
+ RegularMapping mappingFacadeOne = regularMappingFacade.getOne(new QueryWrapper<RegularMapping>()
|
|
|
+ .eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
+ .eq("column_id", getByIdColumnVerifyVO.getColumnId())
|
|
|
+ );
|
|
|
+ GetByIdColumnVerifyDTO byIdColumnVerify = columnVerifyFacade.getBaseMapper().getByIdColumnVerify(getByIdColumnVerifyVO);
|
|
|
+ byIdColumnVerify.setRegularId(mappingFacadeOne.getRegularId());
|
|
|
+ return byIdColumnVerify;
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 查询下拉框获取数据库表中列数据表名称信息
|
|
|
*
|
|
@@ -125,12 +143,12 @@ public class ColumnVerifyManagementFacade {
|
|
|
List<GetColumnNameDTO> getColumnNameDTOS = new ArrayList<GetColumnNameDTO>();
|
|
|
getTableNameDTO.setTableCname(columnInfo.getTableCname());
|
|
|
getTableNameDTO.setTableEname(columnInfo.getTableEname());
|
|
|
- if(columnString.contains(columnInfo.getTableCname())){
|
|
|
+ if (columnString.contains(columnInfo.getTableCname())) {
|
|
|
continue;
|
|
|
}
|
|
|
columnString.add(columnInfo.getTableCname());
|
|
|
for (GetColumnInfoDTO info : columnInfoList) {
|
|
|
- if(info.getTableCname().equals(columnInfo.getTableCname()) && info.getTableEname().equals(columnInfo.getTableEname())){
|
|
|
+ if (info.getTableCname().equals(columnInfo.getTableCname()) && info.getTableEname().equals(columnInfo.getTableEname())) {
|
|
|
GetColumnNameDTO getColumnNameDTO = new GetColumnNameDTO();
|
|
|
getColumnNameDTO.setId(info.getId());
|
|
|
getColumnNameDTO.setColumnCname(info.getColumnCname());
|