diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/SupCertSetEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/SupCertSetEntity.java new file mode 100644 index 0000000..58811cc --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/SupCertSetEntity.java @@ -0,0 +1,25 @@ +package com.glxp.sale.admin.entity.sync; + +import cn.hutool.core.util.StrUtil; +import lombok.Data; + +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +@Data +public class SupCertSetEntity { + + private Integer id; + private String name; + private boolean need; + private Integer foreign; + private String cplx; + private String hchzsb; + private String flbm; + private Integer imports; + private String remark; + private Date updateTime; + private Integer type; + private boolean isPass; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/sync/SpsSyncDataResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/sync/SpsSyncDataResponse.java index 2bea1d8..3970b56 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/sync/SpsSyncDataResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/sync/SpsSyncDataResponse.java @@ -50,6 +50,7 @@ public class SpsSyncDataResponse { List supManufacturerEntities; List supProductEntities; List supCertEntities; + List supCertSetEntities; @Override public String toString() { @@ -125,6 +126,11 @@ public class SpsSyncDataResponse { if (CollUtil.isNotEmpty(supCertEntities)) { remark.append("相关证书总数:").append(supCertEntities.size()).append(" 条\n"); } + + + if (CollUtil.isNotEmpty(supCertSetEntities)) { + remark.append("证书设置:").append(supCertSetEntities.size()).append(" 条\n"); + } return remark.toString(); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/DlAllDataService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/DlAllDataService.java index 5d86e86..5ac12ae 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/DlAllDataService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/DlAllDataService.java @@ -81,7 +81,13 @@ public class DlAllDataService { || CollUtil.isNotEmpty(syncOrderResponse.getUdiInfoEntities()) || CollUtil.isNotEmpty(syncOrderResponse.getUdiRelevanceEntities()) || CollUtil.isNotEmpty(syncOrderResponse.getAuthAdminList()) - || CollUtil.isNotEmpty(syncOrderResponse.getDeptEntityList())) + || CollUtil.isNotEmpty(syncOrderResponse.getDeptEntityList()) + || CollUtil.isNotEmpty(syncOrderResponse.getSupCompanyEntities()) + || CollUtil.isNotEmpty(syncOrderResponse.getSupManufacturerEntities()) + || CollUtil.isNotEmpty(syncOrderResponse.getSupProductEntities()) + || CollUtil.isNotEmpty(syncOrderResponse.getSupCertEntities()) + || CollUtil.isNotEmpty(syncOrderResponse.getSupCertSetEntities())) + ) { String key = gennerOrderUtils.getAllProducts();