修改选入资质证书bug

api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupManufacturerController.java

@@ -108,30 +108,30 @@ public class SupManufacturerController {
             //验证证书是否齐全
             FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
             filterCertSetsRequest.setType(ConstantStatus.CERT_MANUFACTURER);
-            filterCertSetsRequest.setNeed(0);
             List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
             List<SupCertEntity> supCertEntityList = supCertService.findAll(supManufacturerEntity.getCustomerId(), supManufacturerEntity.getManufacturerId());
+            //判断存在有草稿的未提交的就不能通过
+            for(SupCertEntity obj:supCertEntityList){
+                if (obj.getAuditStatus() == 0.) {
+                    return  ResultVOUtils.error(999,"资质证书存在草稿不能提交！");
+                }
+            }
             ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
             while (iterable.hasNext()) {
                 SupCertSetEntity supCertSetEntity = iterable.next();
 
-                if (supCertSetEntity.isNeed()
-                        ||
-                        (!supCertSetEntity.isNeed() &&
-                                supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 2
+                if ((           supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 2
                                 && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2"))
                         ||
-                        (!supCertSetEntity.isNeed() &&
+                        (
                         supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 1
                         && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2"))
                         ||
-                        (!supCertSetEntity.isNeed()
-                                && supCertSetEntity.getForeign() != null
+                        (       supCertSetEntity.getForeign() != null
                                 && supCertSetEntity.getForeign() == 1
                                 && supManufacturerEntity.getCompanyType().equals("1"))
                         ||
-                        (!supCertSetEntity.isNeed()
-                                && supCertSetEntity.getForeign() != null
+                        (       supCertSetEntity.getForeign() != null
                                 && supCertSetEntity.getForeign() == 3
                                 && supManufacturerEntity.getCompanyType().equals("1"))) {
                     for (SupCertEntity supCertEntity : supCertEntityList) {
@@ -190,30 +190,30 @@ public class SupManufacturerController {
             //验证证书是否齐全
             FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
             filterCertSetsRequest.setType(ConstantStatus.CERT_MANUFACTURER);
-            filterCertSetsRequest.setNeed(0);
             List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
             List<SupCertEntity> supCertEntityList = supCertService.findAll(supManufacturerEntity.getCustomerId(), supManufacturerEntity.getManufacturerId());
+            //判断存在有草稿的未提交的就不能通过
+            for(SupCertEntity obj:supCertEntityList){
+                if (obj.getAuditStatus() == 0.) {
+                    return  ResultVOUtils.error(999,"资质证书存在草稿不能提交！");
+                }
+            }
             ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
             while (iterable.hasNext()) {
                 SupCertSetEntity supCertSetEntity = iterable.next();
 
-                if (supCertSetEntity.isNeed()
-                        ||
-                        (!supCertSetEntity.isNeed() &&
-                                supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 2
-                                && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2"))
+                if ((           supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 2
+                        && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2"))
                         ||
-                        (!supCertSetEntity.isNeed() &&
+                        (
                                 supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 1
-                                && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2"))
+                                        && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2"))
                         ||
-                        (!supCertSetEntity.isNeed()
-                                && supCertSetEntity.getForeign() != null
+                        (       supCertSetEntity.getForeign() != null
                                 && supCertSetEntity.getForeign() == 1
                                 && supManufacturerEntity.getCompanyType().equals("1"))
                         ||
-                        (!supCertSetEntity.isNeed()
-                                && supCertSetEntity.getForeign() != null
+                        (       supCertSetEntity.getForeign() != null
                                 && supCertSetEntity.getForeign() == 3
                                 && supManufacturerEntity.getCompanyType().equals("1"))) {
                     for (SupCertEntity supCertEntity : supCertEntityList) {

api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml

@@ -16,6 +16,7 @@
             <if test="need!=null">
                 and `need` = #{need}
             </if>
+            AND `foreign` is not null
         </where>
         ORDER BY id DESC
     </select>