资质证书填写

src/main/java/com/glxp/api/controller/purchase/SupCertController.java

@@ -295,6 +295,23 @@ public class SupCertController {
         return ResultVOUtils.success("成功");
     }
 
+    @AuthRuleAnnotation("")
+    @PostMapping("/sup/info/insertCompanyCert")
+    @Log(title = "资质证书", businessType = BusinessType.INSERT)
+    public BaseResponse cptInsertCompanyCert(@RequestBody SupCertEntity supCertEntity) {
+        supCertEntity.setCreateTime(new Date());
+        supCertEntity.setUpdateTime(new Date());
+        supCertEntity.setStatus(0);
+        supCertEntity.setId(IdUtil.getSnowflakeNextId());
+        if (supCertEntity.getVailDate() != null && supCertEntity.getExpireDate() != null) {
+            if (supCertEntity.getVailDate().getTime() > supCertEntity.getExpireDate().getTime()) {
+                return ResultVOUtils.error(999, "失效期不能小于生效期！");
+            }
+        }
+        boolean b = supCertService.insertCompanyCert(supCertEntity);
+        return ResultVOUtils.success("成功");
+    }
+
 
     @AuthRuleAnnotation("")
     @PostMapping("/sale/sup/cert/audit")

src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java

@@ -186,6 +186,104 @@ public class SupManufacturerController {
         }
     }
 
+    @AuthRuleAnnotation("")
+    @PostMapping("/directToCpt/sup/manufacturer/addCompany")
+    @Log(title = "资质证书", businessType = BusinessType.INSERT)
+    public BaseResponse directToCptAddCompany(@RequestBody SupManufacturerEntity supManufacturerEntity) {
+
+        //String customerId = getCustomerId();
+        //supManufacturerEntity.setCustomerId(customerId);
+        //判断用户名和社会信用代码不能重复
+        FilterSupManufacturerRequest filterSupManufacturerRequest = new FilterSupManufacturerRequest();
+        filterSupManufacturerRequest.setCompanyName(supManufacturerEntity.getCompanyName());
+        filterSupManufacturerRequest.setCustomerId(getCustomerId());
+        List<SupManufacturerEntity> companyEntities = supManufacturerService.getCompanyByNameAndCode(filterSupManufacturerRequest);
+        if (companyEntities.size() > 0) {
+            return ResultVOUtils.error(999, "企业名称不能重复！");
+        }
+        filterSupManufacturerRequest = new FilterSupManufacturerRequest();
+        filterSupManufacturerRequest.setCustomerId(getCustomerId());
+        filterSupManufacturerRequest.setCreditCode(supManufacturerEntity.getCreditCode());
+        companyEntities = supManufacturerService.getCompanyByNameAndCode(filterSupManufacturerRequest);
+        if (companyEntities.size() > 0) {
+            return ResultVOUtils.error(999, "统一社会信用代码不能重复！");
+        }
+        //提交审核
+        if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE || supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) {
+            //判断是否上级供应商是否审核通过
+            SupCompanyEntity supCompanyEntity = supCompanyService.findCompany(supManufacturerEntity.getCustomerId());
+            if (supCompanyEntity.getAuditStatus() == null || supCompanyEntity.getAuditStatus() != ConstantStatus.AUDIT_PASS
+            ) {
+                return ResultVOUtils.error(500, "所属配送企业资质未通过审核，暂时无法提交！");
+            }
+
+            //验证证书是否齐全
+            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.getForeign() != null && supCertSetEntity.getForeign() == 2
+                        && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2"))
+                        ||
+                        (
+                                supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 1
+                                        && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2"))
+                        ||
+                        (supCertSetEntity.getForeign() != null
+                                && supCertSetEntity.getForeign() == 1
+                                && supManufacturerEntity.getCompanyType().equals("1"))
+                        ||
+                        (supCertSetEntity.getForeign() != null
+                                && supCertSetEntity.getForeign() == 3
+                                && supManufacturerEntity.getCompanyType().equals("1"))) {
+                    for (SupCertEntity supCertEntity : supCertEntityList) {
+
+                        if (supCertEntity.getName().equals(supCertSetEntity.getName())) {
+                            if (StrUtil.isNotEmpty(supCertEntity.getFilePath())) {
+                                iterable.remove();
+                                break;
+                            }
+                        }
+                    }
+                } else {
+                    iterable.remove();
+                }
+
+
+            }
+            String errMsg = "";
+            if (supCertSetEntities.size() > 0) {
+                for (SupCertSetEntity supCertSetEntity : supCertSetEntities) {
+                    errMsg = errMsg + "," + supCertSetEntity.getName();
+                }
+                return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！");
+            }
+
+
+        }
+
+        supManufacturerEntity.setCreateTime(new Date());
+        supManufacturerEntity.setUpdateTime(new Date());
+        supManufacturerEntity.setId(IdUtil.getSnowflakeNextId());
+        boolean b = supManufacturerService.insertCompany(supManufacturerEntity);
+        if (b) {
+            return ResultVOUtils.success("添加成功");
+        } else {
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+        }
+    }
+
     @AuthRuleAnnotation("")
     @PostMapping("/sup/manufacturer/modifyCompany")
     @Log(title = "资质证书", businessType = BusinessType.UPDATE)

src/main/java/com/glxp/api/controller/sup/UserRegisterController.java

@@ -302,6 +302,7 @@ public class UserRegisterController extends BaseController {
         userCheckEntity.setCreateUser(registComPerResponse.getReviewer());
         if (!"isPass".equals(registComPerResponse.getIsPass())) {
             userCheckEntity.setCheckResult(0 + "");
+            //userCheckEntity.setResultExplain("不通过");
             userCheckEntity.setResultExplain(registComPerResponse.getReason());
         }
         userCheckEntity.setCreateTime(new Date());

src/main/java/com/glxp/api/service/purchase/SupCompanyService.java

@@ -19,15 +19,17 @@ public interface SupCompanyService extends IService<SupCompanyEntity> {
 
     SupCompanyEntity findCompany(String CustomerId);
 
-//    List<SupCompanyEntity> getSubCompany(FilterSupCompanyRequest commitRequest);
-//
-//    List<SupCompanyEntity> getSubCompany2(FilterSupCompanyRequest commitRequest);
-//
-//    SupCompanyEntity findCompanyByName(String companyName);
-
     boolean modifyCompany(SupCompanyEntity companyEntity);
 
-//    boolean insertCompany(SupCompanyEntity companyEntity);
-//
-//    boolean deleteCompany(String customerId);
+    SupCompanyEntity findCompanyByUnitFk(String unitFk);
+
+    List<SupCompanyEntity> getSubCompany(FilterSupCompanyRequest commitRequest);
+
+    List<SupCompanyEntity> getSubCompany2(FilterSupCompanyRequest commitRequest);
+
+    SupCompanyEntity findCompanyByName(String companyName);
+
+    boolean insertCompany(SupCompanyEntity companyEntity);
+
+    boolean deleteCompany(String customerId);
 }

src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java

@@ -106,4 +106,55 @@ public class SupCompanyServiceImpl extends ServiceImpl<SupCompanyDao, SupCompany
 //    public boolean deleteCompany(String customerId) {
 //        return supCompanyDao.deleteCompany(customerId);
 //    }
+@Override
+public SupCompanyEntity findCompanyByUnitFk(String unitFk) {
+    FilterSupCompanyRequest filterSupCompanyRequest = new FilterSupCompanyRequest();
+    filterSupCompanyRequest.setUnitIdFk(unitFk);
+    List<SupCompanyEntity> companyEntities = supCompanyDao.filterCompany(filterSupCompanyRequest);
+    if (companyEntities != null && companyEntities.size() > 0) {
+        return companyEntities.get(0);
+    }
+    return null;
+}
+
+    @Override
+    public List<SupCompanyEntity> getSubCompany(FilterSupCompanyRequest commitRequest) {
+        if (commitRequest == null) {
+            return Collections.emptyList();
+        }
+        if (commitRequest.getPage() != null) {
+            int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit();
+            PageHelper.offsetPage(offset, commitRequest.getLimit());
+        }
+
+        List<SupCompanyEntity> companyEntities = supCompanyDao.getSubCompany(commitRequest);
+        return companyEntities;
+    }
+
+    @Override
+    public List<SupCompanyEntity> getSubCompany2(FilterSupCompanyRequest commitRequest) {
+        if (commitRequest == null) {
+            return Collections.emptyList();
+        }
+        int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit();
+        PageHelper.offsetPage(offset, commitRequest.getLimit());
+        List<SupCompanyEntity> companyEntities = supCompanyDao.getSubCompany2(commitRequest);
+        return companyEntities;
+    }
+
+    @Override
+    public SupCompanyEntity findCompanyByName(String companyName) {
+        return supCompanyDao.findCompanyByName(companyName);
+    }
+
+    @Override
+    public boolean insertCompany(SupCompanyEntity companyEntity) {
+        return supCompanyDao.insertCompany(companyEntity);
+    }
+
+
+    @Override
+    public boolean deleteCompany(String customerId) {
+        return supCompanyDao.deleteCompany(customerId);
+    }
 }

src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml

@@ -58,7 +58,7 @@
         </where>
     </select>
     <select id="filterUserCompany" parameterType="com.glxp.api.req.purchase.FilterUserCompanyRequest"
-            resultType="com.glxp.api.entity.purchase.UserCompanyEntity">
+            resultType="com.glxp.api.entity.sup.UserCompanyEntity">
         SELECT
         *