diff --git a/jwtech-system/src/main/java/com/kms/bind/controller/BindingController.java b/jwtech-system/src/main/java/com/kms/bind/controller/BindingController.java index 01050987..3ad8dfe1 100644 --- a/jwtech-system/src/main/java/com/kms/bind/controller/BindingController.java +++ b/jwtech-system/src/main/java/com/kms/bind/controller/BindingController.java @@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.jianwei.common.core.domain.SearchParam; import com.kms.earlyStage.domain.SpecialProjectPreDesign; import com.kms.earlyStage.service.SpecialProjectPreDesignService; +import com.kms.enterprise.domain.BsSgcYxjdEnterpriseInfo; +import com.kms.enterprise.service.BsSgcYxjdEnterpriseInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -16,15 +19,26 @@ public class BindingController { @Autowired private SpecialProjectPreDesignService specialProjectPreDesignService; + @Autowired + private BsSgcYxjdEnterpriseInfoService bsSgcYxjdEnterpriseInfoService; + @PostMapping("/listProject") - public IPage listProject(SearchParam sp) { + public IPage listProject(@RequestBody SearchParam sp) { IPage page=specialProjectPreDesignService.listProject(sp); return page; + } + + + @PostMapping("/listEnterprise") + public IPage listEnterprise(@RequestBody SearchParam sp) { + + IPage bsSgcYxjdEnterpriseInfoIPage = bsSgcYxjdEnterpriseInfoService.listEnterprise(sp); + return bsSgcYxjdEnterpriseInfoIPage; } diff --git a/jwtech-system/src/main/java/com/kms/common/api/CommonApi.java b/jwtech-system/src/main/java/com/kms/common/api/CommonApi.java index db7096e0..6b76185d 100644 --- a/jwtech-system/src/main/java/com/kms/common/api/CommonApi.java +++ b/jwtech-system/src/main/java/com/kms/common/api/CommonApi.java @@ -185,6 +185,16 @@ public class CommonApi { .map(x -> new SysUserPro(x, user.getId(), user.getId(), null,"0")) .collect(Collectors.toList()); + List list = sysUserProService.list(); + + List stringList = list.stream().map(x -> x.getProNo()).collect(Collectors.toList()); + + List proList1 = proList.stream().filter(x -> stringList.contains(x.getProNo())).collect(Collectors.toList()); + + if (CollectionUtil.isNotEmpty(proList1)) { + return AjaxResult.error("该项目已绑定,不可重复绑定!"); + } + return AjaxResult.success(sysUserProService.saveBatch(proList)); } diff --git a/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java b/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java index d30e06c7..f9f48437 100644 --- a/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java +++ b/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java @@ -154,4 +154,10 @@ public class BsSgcYxjdEnterpriseInfoService extends BaseService listEnterprise(SearchParam sp) { + + + return null; + } }