|
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.lantone.common.enums.IsDeleteEnum;
|
|
|
import com.lantone.common.util.BeanUtil;
|
|
|
import com.lantone.common.util.StringUtil;
|
|
|
+import com.lantone.daqe.dto.GetByIdColumnResultDTO;
|
|
|
import com.lantone.daqe.dto.GetColumnResultNumberDTO;
|
|
|
import com.lantone.daqe.dto.GetColumnResultPageDTO;
|
|
|
import com.lantone.daqe.entity.ColumnResult;
|
|
@@ -22,6 +23,7 @@ import com.lantone.daqe.facade.base.StandardvalueResultFacade;
|
|
|
import com.lantone.daqe.vo.GetColumnResultNumberVO;
|
|
|
import com.lantone.daqe.vo.GetColumnResultPageVO;
|
|
|
import com.lantone.daqe.vo.UpdateColumnResultVO;
|
|
|
+import com.lantone.daqe.vo.getByIdColumnResultVO;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
@@ -100,7 +102,7 @@ public class ColumnResultManagementFacade {
|
|
|
//非空校验结果表
|
|
|
Long resultId = columnResultFacadeById.getResultId();
|
|
|
String type = columnResultFacadeById.getType();
|
|
|
- if(ColumnVerifyTypeEnum.NONNULL_TYPE.getKey().equals(type)){
|
|
|
+ if (ColumnVerifyTypeEnum.NONNULL_TYPE.getKey().equals(type)) {
|
|
|
nonnullResultFacade.update(new UpdateWrapper<NonnullResult>()
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.eq("id", resultId)
|
|
@@ -109,7 +111,7 @@ public class ColumnResultManagementFacade {
|
|
|
);
|
|
|
}
|
|
|
//正则校验结果表
|
|
|
- if(ColumnVerifyTypeEnum.REGULAR_TYPE.getKey().equals(type)){
|
|
|
+ if (ColumnVerifyTypeEnum.REGULAR_TYPE.getKey().equals(type)) {
|
|
|
regularResultFacade.update(new UpdateWrapper<RegularResult>()
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.eq("id", resultId)
|
|
@@ -118,7 +120,7 @@ public class ColumnResultManagementFacade {
|
|
|
);
|
|
|
}
|
|
|
//关键字校验结果表
|
|
|
- if(ColumnVerifyTypeEnum.STANDARD_TYPE.getKey().equals(type)){
|
|
|
+ if (ColumnVerifyTypeEnum.STANDARD_TYPE.getKey().equals(type)) {
|
|
|
standardvalueResultFacade.update(new UpdateWrapper<StandardvalueResult>()
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.eq("id", resultId)
|
|
@@ -134,4 +136,50 @@ public class ColumnResultManagementFacade {
|
|
|
.set("gmt_modified", new Date())
|
|
|
);
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 根据ID查看字段校验问题明细
|
|
|
+ *
|
|
|
+ * @param getByIdColumnResultVO
|
|
|
+ * @return: 字段校验问题明细明细
|
|
|
+ */
|
|
|
+ public GetByIdColumnResultDTO getByIdColumnResult(getByIdColumnResultVO getByIdColumnResultVO) {
|
|
|
+ ColumnResult columnResult = columnResultFacade.getBaseMapper().selectById(getByIdColumnResultVO.getId());
|
|
|
+ String type = columnResult.getType();
|
|
|
+ GetByIdColumnResultDTO getByIdColumnResultDTO = new GetByIdColumnResultDTO();
|
|
|
+ //非空校验
|
|
|
+ if (ColumnVerifyTypeEnum.NONNULL_TYPE.getKey().equals(type)) {
|
|
|
+ getByIdColumnResultDTO.setType(type);
|
|
|
+ Long resultId = columnResult.getResultId();
|
|
|
+ NonnullResult nonnullResult = nonnullResultFacade.getBaseMapper().selectOne(new QueryWrapper<NonnullResult>()
|
|
|
+ .eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
+ .eq("id", resultId)
|
|
|
+ );
|
|
|
+ BeanUtil.copyProperties(nonnullResult, getByIdColumnResultDTO);
|
|
|
+ return getByIdColumnResultDTO;
|
|
|
+ }
|
|
|
+ //正则校验结果表
|
|
|
+ if (ColumnVerifyTypeEnum.REGULAR_TYPE.getKey().equals(type)) {
|
|
|
+ getByIdColumnResultDTO.setType(type);
|
|
|
+ Long resultId = columnResult.getResultId();
|
|
|
+ RegularResult regularResult = regularResultFacade.getBaseMapper().selectOne(new QueryWrapper<RegularResult>()
|
|
|
+ .eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
+ .eq("id", resultId)
|
|
|
+ );
|
|
|
+ BeanUtil.copyProperties(regularResult, getByIdColumnResultDTO);
|
|
|
+ return getByIdColumnResultDTO;
|
|
|
+ }
|
|
|
+ //关键字校验结果表
|
|
|
+ if (ColumnVerifyTypeEnum.STANDARD_TYPE.getKey().equals(type)) {
|
|
|
+ getByIdColumnResultDTO.setType(type);
|
|
|
+ Long resultId = columnResult.getResultId();
|
|
|
+ StandardvalueResult standardvalueResult = standardvalueResultFacade.getBaseMapper().selectOne(new QueryWrapper<StandardvalueResult>()
|
|
|
+ .eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
+ .eq("id", resultId)
|
|
|
+ );
|
|
|
+ BeanUtil.copyProperties(standardvalueResult, getByIdColumnResultDTO);
|
|
|
+ return getByIdColumnResultDTO;
|
|
|
+ }
|
|
|
+ return getByIdColumnResultDTO;
|
|
|
+ }
|
|
|
}
|