From 2e4adef6c10247bb3ec6fa12448d7936f1f4e835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Thu, 30 Mar 2023 10:45:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E8=B4=A8=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/SupCertController.java | 146 +++++++++--------- 1 file changed, 71 insertions(+), 75 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java index 442ad42a..a7d6c9c1 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -313,32 +313,31 @@ public class SupCertController { int i = 1; if (selectSupCertList != null && selectSupCertList.size() > 0) { for (SupCertEntity obj : selectSupCertList) { - //组装数据 - Map supData = new HashMap<>(); - supData.put("companyName", supCompanyEntity.getCompanyName() == null ? ' ' : supCompanyEntity.getCompanyName()); - supData.put("creditNum", supCompanyEntity.getCreditNum() == null ? ' ' : supCompanyEntity.getCreditNum()); - supData.put("classes", supCompanyEntity.getClasses().equals(1) ? "医院" : "经营企业"); - supData.put("area", supCompanyEntity.getArea() == null ? ' ' : supCompanyEntity.getArea()); - supData.put("contacts", supCompanyEntity.getContacts() == null ? ' ' : supCompanyEntity.getContacts()); - supData.put("detailAddr", supCompanyEntity.getDetailAddr() == null ? ' ' : supCompanyEntity.getDetailAddr()); - supData.put("mobile", supCompanyEntity.getMobile() == null ? ' ' : supCompanyEntity.getMobile()); - supData.put("email", supCompanyEntity.getEmail() == null ? ' ' : supCompanyEntity.getEmail()); - supData.put("index", String.valueOf(i)); - supData.put("name", obj.getName() == null ? ' ' : obj.getName()); - supData.put("code", obj.getCode() == null ? ' ' : obj.getCode()); - supData.put("vaiDate", obj.getVailDate() == null ? ' ' : formatter.format(obj.getVailDate())); - supData.put("expireDate", obj.getExpireDate() == null ? ' ' : formatter.format(obj.getExpireDate())); - supData.put("status", obj.getStatus() == 0 ? "有效" : "失效"); - supData.put("auditStatus", getAuditStatus(obj.getAuditStatus())); - supData.put("remark", obj.getRemark() == null ? ' ' : obj.getRemark()); List urlList=Arrays.asList(obj.getFilePath().split(",")); - List imglist = new ArrayList<>(); for (String url:urlList){ - imglist.add("d:/udi/udiwms/udiwmsfile/register/file/image2/" + url); + //组装数据 + Map supData = new HashMap<>(); + supData.put("companyName", supCompanyEntity.getCompanyName() == null ? ' ' : supCompanyEntity.getCompanyName()); + supData.put("creditNum", supCompanyEntity.getCreditNum() == null ? ' ' : supCompanyEntity.getCreditNum()); + supData.put("classes", supCompanyEntity.getClasses().equals(1) ? "医院" : "经营企业"); + supData.put("area", supCompanyEntity.getArea() == null ? ' ' : supCompanyEntity.getArea()); + supData.put("contacts", supCompanyEntity.getContacts() == null ? ' ' : supCompanyEntity.getContacts()); + supData.put("detailAddr", supCompanyEntity.getDetailAddr() == null ? ' ' : supCompanyEntity.getDetailAddr()); + supData.put("mobile", supCompanyEntity.getMobile() == null ? ' ' : supCompanyEntity.getMobile()); + supData.put("email", supCompanyEntity.getEmail() == null ? ' ' : supCompanyEntity.getEmail()); + supData.put("index", String.valueOf(i)); + supData.put("name", obj.getName() == null ? ' ' : obj.getName()); + supData.put("code", obj.getCode() == null ? ' ' : obj.getCode()); + supData.put("vaiDate", obj.getVailDate() == null ? ' ' : formatter.format(obj.getVailDate())); + supData.put("expireDate", obj.getExpireDate() == null ? ' ' : formatter.format(obj.getExpireDate())); + supData.put("status", obj.getStatus() == 0 ? "有效" : "失效"); + supData.put("auditStatus", getAuditStatus(obj.getAuditStatus())); + supData.put("remark", obj.getRemark() == null ? ' ' : obj.getRemark()); + supData.put("filePath", "d:/udi/udiwms/udiwmsfile/register/file/image2/" + url); + list.add(supData); + i++; } - supData.put("filePath", imglist); - list.add(supData); - i++; + } } @@ -428,34 +427,32 @@ public class SupCertController { int i = 1; if (selectSupCertList != null && selectSupCertList.size() > 0) { for (SupCertEntity obj : selectSupCertList) { - //组装数据 - Map supData = new HashMap<>(); - supData.put("customerName", supManufacturerEntity.getSupName() == null ? ' ' : supManufacturerEntity.getSupName()); - supData.put("companyName", supManufacturerEntity.getCompanyName() == null ? ' ' : supManufacturerEntity.getCompanyName()); - supData.put("companyType", supManufacturerEntity.getCompanyType().equals(1) ? "境内企业" : "境外企业"); - supData.put("creditCode", supManufacturerEntity.getCreditCode() == null ? ' ' : supManufacturerEntity.getCreditCode()); - supData.put("placeArea", supManufacturerEntity.getPlaceArea() == null ? ' ' : supManufacturerEntity.getPlaceArea()); - supData.put("productionArea", supManufacturerEntity.getProductionArea() == null ? ' ' : supManufacturerEntity.getProductionArea()); - supData.put("registerStatus", getRegisterStatus(supManufacturerEntity.getRegisterStatus())); - supData.put("placeAddress", supManufacturerEntity.getPlaceAddress() == null ? ' ' : supManufacturerEntity.getPlaceAddress()); - supData.put("productionAddress", supManufacturerEntity.getProductionAddress() == null ? ' ' : supManufacturerEntity.getProductionAddress()); - supData.put("remark1", supManufacturerEntity.getRemark() == null ? ' ' : supManufacturerEntity.getRemark()); - supData.put("index", String.valueOf(i)); - supData.put("name", obj.getName() == null ? ' ' : obj.getName()); - supData.put("code", obj.getCode() == null ? ' ' : obj.getCode()); - supData.put("vaiDate", formatter.format(obj.getVailDate())); - supData.put("expireDate", formatter.format(obj.getExpireDate())); - supData.put("status", obj.getStatus() == 0 ? "有效" : "失效"); - supData.put("auditStatus", getAuditStatus(obj.getAuditStatus())); - supData.put("remark2", obj.getRemark() == null ? ' ' : obj.getRemark()); List urlList=Arrays.asList(obj.getFilePath().split(",")); - List imglist = new ArrayList<>(); for (String url:urlList){ - imglist.add("d:/udi/udiwms/udiwmsfile/register/file/image2/" + url); + //组装数据 + Map supData = new HashMap<>(); + supData.put("customerName", supManufacturerEntity.getSupName() == null ? ' ' : supManufacturerEntity.getSupName()); + supData.put("companyName", supManufacturerEntity.getCompanyName() == null ? ' ' : supManufacturerEntity.getCompanyName()); + supData.put("companyType", supManufacturerEntity.getCompanyType().equals(1) ? "境内企业" : "境外企业"); + supData.put("creditCode", supManufacturerEntity.getCreditCode() == null ? ' ' : supManufacturerEntity.getCreditCode()); + supData.put("placeArea", supManufacturerEntity.getPlaceArea() == null ? ' ' : supManufacturerEntity.getPlaceArea()); + supData.put("productionArea", supManufacturerEntity.getProductionArea() == null ? ' ' : supManufacturerEntity.getProductionArea()); + supData.put("registerStatus", getRegisterStatus(supManufacturerEntity.getRegisterStatus())); + supData.put("placeAddress", supManufacturerEntity.getPlaceAddress() == null ? ' ' : supManufacturerEntity.getPlaceAddress()); + supData.put("productionAddress", supManufacturerEntity.getProductionAddress() == null ? ' ' : supManufacturerEntity.getProductionAddress()); + supData.put("remark1", supManufacturerEntity.getRemark() == null ? ' ' : supManufacturerEntity.getRemark()); + supData.put("index", String.valueOf(i)); + supData.put("name", obj.getName() == null ? ' ' : obj.getName()); + supData.put("code", obj.getCode() == null ? ' ' : obj.getCode()); + supData.put("vaiDate", formatter.format(obj.getVailDate())); + supData.put("expireDate", formatter.format(obj.getExpireDate())); + supData.put("status", obj.getStatus() == 0 ? "有效" : "失效"); + supData.put("auditStatus", getAuditStatus(obj.getAuditStatus())); + supData.put("remark2", obj.getRemark() == null ? ' ' : obj.getRemark()); + supData.put("filePath", "d:/udi/udiwms/udiwmsfile/register/file/image2/" + url); + list.add(supData); + i++; } - supData.put("filePath", imglist); - list.add(supData); - i++; } } @@ -493,36 +490,35 @@ public class SupCertController { int i = 1; if (selectSupCertList != null && selectSupCertList.size() > 0) { for (SupCertEntity obj : selectSupCertList) { - //组装数据 - Map supData = new HashMap<>(); - supData.put("customerName", supManufacturerEntity.getSupName() == null ? ' ' : supManufacturerEntity.getSupName()); - supData.put("manufacturerldFk", supManufacturerEntity.getCompanyName() == null ? ' ' : supManufacturerEntity.getCompanyName()); - supData.put("recordProductName", supProductEntity.getRecordProductName() == null ? ' ' : supProductEntity.getRecordProductName()); - supData.put("recordCode", supProductEntity.getRecordCode() == null ? ' ' : supProductEntity.getRecordCode()); - supData.put("recordPeopleName", supProductEntity.getRecordPeopleName() == null ? ' ' : supProductEntity.getRecordPeopleName()); - supData.put("hchzsb", supProductEntity.getHchzsb() == null ? ' ' : supProductEntity.getHchzsb()); - supData.put("productType", supProductEntity.getProductType() == null ? ' ' : supProductEntity.getProductType()); - supData.put("productDirectoryCode", supProductEntity.getProductDirectoryCode() == null ? ' ' : supProductEntity.getProductDirectoryCode()); - supData.put("specification", supProductEntity.getSpecification() == null ? ' ' : supProductEntity.getSpecification()); -// supData.put("cpms", supProductEntity.getCpms() == null ? ' ' : supProductEntity.getCpms()); - supData.put("remark1", supProductEntity.getRemark() == null ? ' ' : supProductEntity.getRemark()); - - supData.put("index", String.valueOf(i)); - supData.put("name", obj.getName() == null ? ' ' : obj.getName()); - supData.put("code", obj.getCode() == null ? ' ' : obj.getCode()); - supData.put("vaiDate", formatter.format(obj.getVailDate())); - supData.put("expireDate", formatter.format(obj.getExpireDate())); - supData.put("status", obj.getStatus() == 0 ? "有效" : "失效"); - supData.put("auditStatus", getAuditStatus(obj.getAuditStatus())); - supData.put("remark2", obj.getRemark() == null ? ' ' : obj.getRemark()); + List urlList=Arrays.asList(obj.getFilePath().split(",")); - List imglist = new ArrayList<>(); for (String url:urlList){ - imglist.add("d:/udi/udiwms/udiwmsfile/register/file/image2/" + url); + //组装数据 + Map supData = new HashMap<>(); + supData.put("customerName", supManufacturerEntity.getSupName() == null ? ' ' : supManufacturerEntity.getSupName()); + supData.put("manufacturerldFk", supManufacturerEntity.getCompanyName() == null ? ' ' : supManufacturerEntity.getCompanyName()); + supData.put("recordProductName", supProductEntity.getRecordProductName() == null ? ' ' : supProductEntity.getRecordProductName()); + supData.put("recordCode", supProductEntity.getRecordCode() == null ? ' ' : supProductEntity.getRecordCode()); + supData.put("recordPeopleName", supProductEntity.getRecordPeopleName() == null ? ' ' : supProductEntity.getRecordPeopleName()); + supData.put("hchzsb", supProductEntity.getHchzsb() == null ? ' ' : supProductEntity.getHchzsb()); + supData.put("productType", supProductEntity.getProductType() == null ? ' ' : supProductEntity.getProductType()); + supData.put("productDirectoryCode", supProductEntity.getProductDirectoryCode() == null ? ' ' : supProductEntity.getProductDirectoryCode()); + supData.put("specification", supProductEntity.getSpecification() == null ? ' ' : supProductEntity.getSpecification()); +// supData.put("cpms", supProductEntity.getCpms() == null ? ' ' : supProductEntity.getCpms()); + supData.put("remark1", supProductEntity.getRemark() == null ? ' ' : supProductEntity.getRemark()); + + supData.put("index", String.valueOf(i)); + supData.put("name", obj.getName() == null ? ' ' : obj.getName()); + supData.put("code", obj.getCode() == null ? ' ' : obj.getCode()); + supData.put("vaiDate", formatter.format(obj.getVailDate())); + supData.put("expireDate", formatter.format(obj.getExpireDate())); + supData.put("status", obj.getStatus() == 0 ? "有效" : "失效"); + supData.put("auditStatus", getAuditStatus(obj.getAuditStatus())); + supData.put("remark2", obj.getRemark() == null ? ' ' : obj.getRemark()); + supData.put("filePath", "d:/udi/udiwms/udiwmsfile/register/file/image2/" + url); + list.add(supData); + i++; } - supData.put("filePath", imglist); - list.add(supData); - i++; } }