|
@@ -6,6 +6,7 @@ import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
+import com.diagbot.enums.IsDeleteEnum;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
@@ -66,7 +67,7 @@ public class RetrievalFacade extends RetrievalServiceImpl {
|
|
|
RetrievalMapping retrievalMapping = new RetrievalMapping();
|
|
|
retrievalMapping.setGmtModified(DateUtil.now());
|
|
|
retrievalMapping.setModifier(userId);
|
|
|
- retrievalMapping.setIsDeleted("Y");
|
|
|
+ retrievalMapping.setIsDeleted(IsDeleteEnum.Y.getKey());
|
|
|
|
|
|
retrievalMappingFacade.update(retrievalMapping, mappingQe);
|
|
|
return true;
|
|
@@ -87,7 +88,7 @@ public class RetrievalFacade extends RetrievalServiceImpl {
|
|
|
|
|
|
QueryWrapper<Retrieval> retrievalQe = new QueryWrapper<Retrieval>();
|
|
|
retrievalQe.in("name", retrievalNames);
|
|
|
- retrievalQe.eq("is_deleted", "N");
|
|
|
+ retrievalQe.eq("is_deleted", IsDeleteEnum.N.getKey());
|
|
|
Map<String,Retrieval> retrievalMap = this.list(retrievalQe).stream().collect(Collectors.toMap(Retrieval::getName,i->i));
|
|
|
|
|
|
List<Retrieval> saveOrUpdateRetrievals = new ArrayList<>();
|
|
@@ -147,7 +148,7 @@ public class RetrievalFacade extends RetrievalServiceImpl {
|
|
|
retrievalMapping.setShowType(detailMap.get(i.getName()).getRetrievalType());
|
|
|
retrievalMapping.setGmtModified(now);
|
|
|
retrievalMapping.setModifier(userId);
|
|
|
- retrievalMapping.setIsDeleted("N");
|
|
|
+ retrievalMapping.setIsDeleted(IsDeleteEnum.N.getKey());
|
|
|
addOrUpdateRetrievalMappings.add(retrievalMapping);
|
|
|
}
|
|
|
}
|