|
@@ -348,37 +348,29 @@ public class ColumnVerifyManagementFacade {
|
|
|
}
|
|
|
//非空
|
|
|
if (ListUtil.isNotEmpty(nonnullId)) {
|
|
|
- nonnullInfo = nonnullInfoFacade.update(new UpdateWrapper<NonnullInfo>()
|
|
|
+ nonnullInfo = nonnullInfoFacade.remove(new UpdateWrapper<NonnullInfo>()
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.in("id", nonnullId)
|
|
|
- .set("is_deleted", IsDeleteEnum.Y.getKey())
|
|
|
- .set("gmt_modified", new Date())
|
|
|
);
|
|
|
}
|
|
|
//关键值
|
|
|
if (ListUtil.isNotEmpty(standardValueId)) {
|
|
|
- tandardvalueInfo = standardvalueInfoFacade.update(new UpdateWrapper<StandardvalueInfo>()
|
|
|
+ tandardvalueInfo = standardvalueInfoFacade.remove(new UpdateWrapper<StandardvalueInfo>()
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.in("id", standardValueId)
|
|
|
- .set("is_deleted", IsDeleteEnum.Y.getKey())
|
|
|
- .set("gmt_modified", new Date())
|
|
|
);
|
|
|
}
|
|
|
//正则
|
|
|
if (ListUtil.isNotEmpty(regularId)) {
|
|
|
- regular = regularMappingFacade.update(new UpdateWrapper<RegularMapping>()
|
|
|
+ regular = regularMappingFacade.remove(new UpdateWrapper<RegularMapping>()
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.in("id", regularId)
|
|
|
- .set("is_deleted", IsDeleteEnum.Y.getKey())
|
|
|
- .set("gmt_modified", new Date())
|
|
|
);
|
|
|
}
|
|
|
if (nonnullInfo && tandardvalueInfo && regular) {
|
|
|
- boolean update = columnVerifyFacade.update(new UpdateWrapper<ColumnVerify>()
|
|
|
+ boolean update = columnVerifyFacade.remove(new UpdateWrapper<ColumnVerify>()
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.in("column_id", ids)
|
|
|
- .set("is_deleted", IsDeleteEnum.Y.getKey())
|
|
|
- .set("gmt_modified", new Date())
|
|
|
);
|
|
|
if (update) {
|
|
|
return true;
|