diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java index 6890a5dc..802b9afa 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java @@ -252,7 +252,7 @@ public class SupCompanyController { return ResultVOUtils.error(500, "必传证书不齐全!"); } } - + String msg=""; //查询是否包含审核未通过的证书 if (companyEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || companyEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS) { @@ -263,10 +263,9 @@ public class SupCompanyController { List supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); if (CollUtil.isNotEmpty(supCertEntityList)) { for (SupCertEntity supCertEntity : supCertEntityList) { - supCertEntity.setAuditStatus(ConstantStatus.AUDIT_PASS); - supCertService.updateCompanyCert(supCertEntity); + msg+=supCertEntity.getName()+","; } -// return ResultVOUtils.error(500, "审核失败,剩余" + supCertEntityList.size() + "个证书还未审核或审核未通过!"); + return ResultVOUtils.error(500, "审核失败,还有" + msg.substring(0,msg.length()-1) + "证书还未确认!"); } } diff --git a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java index 98bab397..f339811e 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java @@ -350,7 +350,7 @@ public class SupManufacturerController { } } - + String msg=""; // 查询是否包含审核未通过的证书 if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS) { @@ -362,10 +362,9 @@ public class SupManufacturerController { List supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); if (CollUtil.isNotEmpty(supCertEntityList)) { for (SupCertEntity supCertEntity : supCertEntityList) { - supCertEntity.setAuditStatus(ConstantStatus.AUDIT_PASS); - supCertService.updateCompanyCert(supCertEntity); + msg+=supCertEntity.getName()+","; } -// return ResultVOUtils.error(500, "审核失败,剩余" + supCertEntityList.size() + "个证书还未审核或审核未通过!"); + return ResultVOUtils.error(500, "审核失败,还有" + msg.substring(0,msg.length()-1) + "证书还未确认!"); } } diff --git a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java index 9b98f2ca..d59b0961 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java @@ -314,7 +314,7 @@ public class SupProductController { return ResultVOUtils.error(500, "必传证书不齐全"); } } - + String msg=""; // 查询是否包含审核未通过的证书 if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS) { @@ -327,11 +327,9 @@ public class SupProductController { List supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); if (CollUtil.isNotEmpty(supCertEntityList)) { for (SupCertEntity supCertEntity : supCertEntityList) { - supCertEntity.setAuditStatus(ConstantStatus.AUDIT_PASS); - supCertService.updateCompanyCert(supCertEntity); + msg+=supCertEntity.getName()+","; } - -// return ResultVOUtils.error(500, "审核失败,剩余" + supCertEntityList.size() + "个证书还未审核或审核未通过!"); + return ResultVOUtils.error(500, "审核失败,还有" + msg.substring(0,msg.length()-1) + "证书还未确认!"); } }