资质审核

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

@@ -733,8 +733,8 @@ public class SupCertController {
 //    private UserCertService userCertService;
 //    @Value("${file_path}")
 //    private String filePath;
-//    @Resource
-//    private UserCertSetService userCertSetService;
+    @Resource
+    private UserCertSetService userCertSetService;
 //    @Resource
 //    private SystemPDFTemplateService systemPDFTemplateService;
 //    @Resource
@@ -756,31 +756,31 @@ public class SupCertController {
 //    }
 //
 //
-//    //资质证书添加
-//    @ApiOperation(value = "资质证书添加",response = BaseResponse.class)
-//    @PostMapping("/sup/company/cert/isertCert")
-//    public BaseResponse isertCert(@RequestBody UserCertEntity userCert){
-//        userCert.setCreateTime(new Date());
-//        userCert.setUpdateTime(new Date());
-//        userCert.setStatus(1+"");
-//        userCert.setCheckStatus(0+"");
-//        userCert.setId(IdUtil.getSnowflakeNextId());
-//        userCertService.insertCert(userCert);
-//        return ResultVOUtils.success("成功");
-//    }
-//
-//    //删除
-//    @ApiOperation(value = "删除资质证书",response = BaseResponse.class)
-//    @PostMapping("/sup/company/cert/deleteCert")
-//    public BaseResponse deleteCert(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest){
-//        boolean b = userCertService.deleteById(deleteCompanyFileRequest.getId());
-//        String URL = filePath + "/register/file/image2/" + deleteCompanyFileRequest.getFilePath();
-//        File file = new File(URL);
-//        if (file.exists() && file.isFile()) {
-//            file.delete();
-//        }
-//        return ResultVOUtils.success("成功");
-//    }
+    //资质证书添加
+    @ApiOperation(value = "资质证书添加",response = BaseResponse.class)
+    @PostMapping("/sup/company/cert/isertCert")
+    public BaseResponse isertCert(@RequestBody UserCertEntity userCert){
+        userCert.setCreateTime(new Date());
+        userCert.setUpdateTime(new Date());
+        userCert.setStatus(1+"");
+        userCert.setCheckStatus(0+"");
+        userCert.setId(IdUtil.getSnowflakeNextId());
+        userCertService.insertCert(userCert);
+        return ResultVOUtils.success("成功");
+    }
+
+    //删除
+    @ApiOperation(value = "删除资质证书",response = BaseResponse.class)
+    @PostMapping("/sup/company/cert/deleteCert")
+    public BaseResponse deleteCert(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest){
+        boolean b = userCertService.deleteById(deleteCompanyFileRequest.getId());
+        String URL = filePath + "/register/file/image2/" + deleteCompanyFileRequest.getFilePath();
+        File file = new File(URL);
+        if (file.exists() && file.isFile()) {
+            file.delete();
+        }
+        return ResultVOUtils.success("成功");
+    }
 //
 //
 //
@@ -797,29 +797,30 @@ public class SupCertController {
 //        return ResultVOUtils.success(list);
 //    }
 //
-//    //修改
-//    @ApiOperation(value = "修改资质证书",response = BaseResponse.class)
-//    @PostMapping("/sup/info/updateCert")
-//    public BaseResponse updateCert(@RequestBody UserCertEntity userCert){
-//
-//        if (userCert.getValidDate() != null && userCert.getExpireDate() != null) {
-//            if (userCert.getValidDate().getTime() > userCert.getExpireDate().getTime()) {
-//                return ResultVOUtils.error(999, "生效期不能小于失效期！");
-//            }
-//        }
-//        userCertService.updateCert(userCert);
-//
-//        if("key".equals(userCert.getKey())){
-//            //插入记录表中
-//            UserCertSetEntity userCertSetEntity = new UserCertSetEntity();
-//            userCertSetEntity.setId(IdUtil.getSnowflakeNextId());
-//            userCertSetEntity.setCreateTime(new Date());
-//            userCertSetEntity.setCreateUser(userCert.getCreateUser());
-//            userCertSetEntity.setName(userCert.getName());
-//            userCertSetService.insert(userCertSetEntity);
-//
-//        }
-//
-//        return ResultVOUtils.success("修改成功");
-//    }
+    //修改
+    @ApiOperation(value = "修改资质证书",response = BaseResponse.class)
+    @PostMapping("/sup/info/updateCert")
+    public BaseResponse updateCert(@RequestBody UserCertEntity userCert){
+
+        if (userCert.getValidDate() != null && userCert.getExpireDate() != null) {
+            if (userCert.getValidDate().getTime() > userCert.getExpireDate().getTime()) {
+                return ResultVOUtils.error(999, "生效期不能小于失效期！");
+            }
+        }
+        userCertService.updateCert(userCert);
+
+        if("key".equals(userCert.getKey())){
+            //插入记录表中
+            UserCertSetEntity userCertSetEntity = new UserCertSetEntity();
+            userCertSetEntity.setId(IdUtil.getSnowflakeNextId());
+            userCertSetEntity.setCreateTime(new Date());
+            userCertSetEntity.setCreateUser(userCert.getCreateUser());
+            userCertSetEntity.setName(userCert.getName());
+            userCertSetService.insert(userCertSetEntity);
+
+        }
+
+        return ResultVOUtils.success("修改成功");
+    }
+
 }

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

@@ -315,6 +315,7 @@ public class UserRegisterController extends BaseController {
         userRegisterEntity.setId(Long.valueOf(registComPerResponse.getId()));
         userRegisterEntity.setCheckStatus(registComPerResponse.getCheckStatus());
         userCompanyEntity.setId(Long.valueOf(registComPerResponse.getUcId()));
+        userCompanyEntity.setCustomerId(registComPerResponse.getUcId());
         userCompanyEntity.setCheckStatus(registComPerResponse.getCheckStatus());
         userCompanyEntity.setReason(registComPerResponse.getReason());
         String queueName = "fanout_" + userCompanyEntity.getId() + "";
@@ -322,15 +323,6 @@ public class UserRegisterController extends BaseController {
         userRegisterService.updateById(userRegisterEntity);
         userCompanyService.updateById(userCompanyEntity);
         userCheckService.insert(userCheckEntity);
-        UserCompanyEntity company = userCompanyService.getById(registComPerResponse.getUcId());
-        supCompanyEntity.setCustomerId(String.valueOf(company.getId()));
-        supCompanyEntity.setCompanyName(company.getCompanyName());
-        supCompanyEntity.setAuditStatus(Integer.valueOf(userCompanyEntity.getCheckStatus()));
-        supCompanyEntity.setCreditNum(company.getCreditNum());
-        supCompanyEntity.setBussinessStatus(Integer.valueOf(company.getBussinessStatus()));
-        supCompanyEntity.setCreateTime(company.getRegisterTime());
-        supCompanyEntity.setAuditStatus(Integer.valueOf(company.getCheckStatus()));
-        supCompanyService.insertCompany(supCompanyEntity);
         //  userCertSetService.insert(userCertSetEntity);
         return ResultVOUtils.success();
     }