|
@@ -8,6 +8,7 @@ import ieven.server.webapp.domain.data.DataMap;
|
|
|
import ieven.server.webapp.domain.data.DataService;
|
|
|
import ieven.server.webapp.domain.data.Fields;
|
|
|
import ieven.server.webapp.domain.exporter.Exporter;
|
|
|
+import ieven.server.webapp.domain.file.LogicalFile;
|
|
|
import ieven.server.webapp.infrastructure.wrapper.Mapped;
|
|
|
import ieven.server.webapp.service.alipay.AlipayService;
|
|
|
import org.bson.Document;
|
|
@@ -160,6 +161,20 @@ public class AlipayController {
|
|
|
} else {
|
|
|
String filename = input.getFilename();
|
|
|
String fileId = input.getFileId();
|
|
|
+ Query query =
|
|
|
+ new Query(
|
|
|
+ Criteria.where("modelId")
|
|
|
+ .is(input.getModelId())
|
|
|
+ .and("generated")
|
|
|
+ .is(Boolean.TRUE)
|
|
|
+ .and("filename")
|
|
|
+ .in("反诈治安-交易明细", "五联单-账户明细", "财付通-交易明细"));
|
|
|
+ List<LogicalFile> resultList = this.mongoTemplate.find(query, LogicalFile.class);
|
|
|
+ List<String> fileids = new ArrayList<>();
|
|
|
+ for (LogicalFile logicalFile : resultList) {
|
|
|
+ fileids.add(logicalFile.getId());
|
|
|
+ }
|
|
|
+
|
|
|
Criteria criteria = this.resolveDetailQuery(filename, fileId, null, null);
|
|
|
if (criteria == null) {
|
|
|
return Mapped.ERROR("未查询到明细");
|
|
@@ -191,7 +206,6 @@ public class AlipayController {
|
|
|
if (fileIds.size() <= 1) {
|
|
|
return null;
|
|
|
}
|
|
|
-
|
|
|
criteria.in(fileIds);
|
|
|
}
|
|
|
|