LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加校验企业下姓名重复接口

Browse Source
This commit is contained in:
梁琦涛
2021-09-08 10:13:14 +08:00
parent 54531c5af6
commit 2b24e6bb34
3 changed files with 84 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+64 -4
View File
@@ -123,13 +123,12 @@ public class PayContactsManagementController extends JeroController<PayContactsM
return Result.error("企业不存在！");
}
payContactsManagement.setCompanyName(payCompanyManagement.getCompanyName());
PayContactsManagement payContactsManagementNew;
try {
String phone = PasswordUtil.encrypt(payContactsManagement.getPhone());
// 新增联系人前在次校验手机号是否存在
LambdaQueryWrapper<PayContactsManagement> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PayContactsManagement::getPhone,phone);
payContactsManagementNew = payContactsManagementService.getOne(queryWrapper);
PayContactsManagement payContactsManagementNew = payContactsManagementService.getOne(queryWrapper);
// 手机号存在，并且编辑id与查询不同，则校验不通过
if(!Objects.isNull(payContactsManagementNew)) {
return Result.error("手机号已存在！");
@@ -138,6 +137,20 @@ public class PayContactsManagementController extends JeroController<PayContactsM
log.info("联系人管理-添加异常",e);
return Result.error("手机号已存在！");
}
try {
// 新增联系人前校验同企业下联系人是否存在
LambdaQueryWrapper<PayContactsManagement> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PayContactsManagement::getName,payContactsManagement.getName());
queryWrapper.eq(PayContactsManagement::getCompanyId,payContactsManagement.getCompanyId());
PayContactsManagement payContactsManagementNew = payContactsManagementService.getOne(queryWrapper);
// 姓名存在，则校验不通过
if(!Objects.isNull(payContactsManagementNew)) {
return Result.error("联系人姓名已存在！");
}
}catch (Exception e){
log.info("联系人管理-添加异常",e);
return Result.error("联系人姓名已存在！");
}
// 存在数据
try {
if (!StringUtils.isBlank(payContactsManagement.getPhone())){
@@ -185,6 +198,20 @@ public class PayContactsManagementController extends JeroController<PayContactsM
log.info("联系人管理-编辑异常",e);
return Result.error("手机号已存在！");
}
try {
// 新增联系人前校验同企业下联系人是否存在
LambdaQueryWrapper<PayContactsManagement> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PayContactsManagement::getName,payContactsManagement.getName());
queryWrapper.eq(PayContactsManagement::getCompanyId,payContactsManagement.getCompanyId());
PayContactsManagement payContactsManagementNew = payContactsManagementService.getOne(queryWrapper);
// 姓名存在，并且编辑id与查询不同，则校验不通过
if(!Objects.isNull(payContactsManagementNew) && !Objects.equals(payContactsManagementNew.getId(),payContactsManagement.getId())) {
return Result.error("联系人姓名已存在！");
}
}catch (Exception e){
log.info("联系人管理-编辑异常",e);
return Result.error("联系人姓名已存在！");
}
try {
if (!StringUtils.isBlank(payContactsManagement.getPhone())){
payContactsManagement.setPhone(PasswordUtil.encrypt(payContactsManagement.getPhone()));
@@ -266,9 +293,42 @@ public class PayContactsManagementController extends JeroController<PayContactsM
}
}catch (Exception e){
log.info("联系人管理-通过手机号查询异常",e);
return Result.error("该机号已存在！");
return Result.error("该手机号已存在！");
}
return Result.error("该机号已存在！");
return Result.error("该手机号已存在！");
}
/**
* 通过联系人姓名查询
*
* @param name 联系人姓名
* @return
*/
@ApiOperation(value="联系人管理-通过联系人姓名查询", notes="联系人管理-通过联系人姓名查询")
@GetMapping(value = "/queryByName")
public Result<?> queryByName(@RequestParam(name="name") String name,@RequestParam(name="companyId") String companyId) {
if(StringUtils.isBlank(name)){
return Result.error("联系人姓名不能为空！");
}
if(StringUtils.isBlank(companyId)){
return Result.error("企业id不能为空！");
}
if(name.length() > 20){
return Result.error("姓名长度不能大于20个字符!");
}
try {
LambdaQueryWrapper<PayContactsManagement> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PayContactsManagement::getName,name);
queryWrapper.eq(PayContactsManagement::getCompanyId,companyId);
queryWrapper.eq(PayContactsManagement::getDataSource,PayContactsManagementCommon.DATA_SOURCE1);
PayContactsManagement payContactsManagement = payContactsManagementService.getOne(queryWrapper);
if(Objects.isNull(payContactsManagement)) {
return Result.OK("没有该联系人姓名！");
}
}catch (Exception e){
log.info("联系人管理-通过联系人姓名查询异常",e);
return Result.error("该联系人姓名已存在！");
}
return Result.error("该联系人姓名已存在！");
}
/**
jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java
+4
View File
@@ -6,6 +6,10 @@ public class PayProjectCommon {
* 打包（1：是，0：否）
*/
public final static Integer PACKAGING0 = 0;
/**
* 打包（1：是，0：否）
*/
public final static Integer PACKAGING1 = 1;
/**
* 到账（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））
*/
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
+16 -1
View File
@@ -19,8 +19,11 @@ import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.ValidUtil;
import com.jero.contract.entity.PayIncomeContract;
import com.jero.contract.entity.PayIncomeContractAssociated;
import com.jero.contract.service.IPayIncomeContractAssociatedService;
import com.jero.contract.service.IPayIncomeContractService;
import com.jero.pack.service.IPayPackCompanyService;
import com.jero.project.common.PayProjectCommon;
import com.jero.project.entity.PayWorkingGroup;
import com.jero.project.service.IPayCommonProjectService;
@@ -56,6 +59,10 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
private ISysBaseAPI sysBaseAPI;
@Autowired
private IPayIncomeContractAssociatedService payIncomeContractAssociatedService;
@Autowired
private IPayIncomeContractService payIncomeContractService;
@Autowired
private IPayPackCompanyService payPackCompanyService;
/**
* 分页列表查询
*
@@ -86,19 +93,26 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
* 收入合同-列表
*
* @param payCommonProject 普通项目管理
* @param contractId 合同id
* @return
*/
@ApiOperation(value="普通项目管理-列表", notes="普通项目管理-列表")
@GetMapping(value = "/listAll")
public Result<?> listAll(PayCommonProject payCommonProject,HttpServletRequest req) {
public Result<?> listAll(PayCommonProject payCommonProject,String contractId,HttpServletRequest req) {
if(StringUtils.isBlank(payCommonProject.getChargeCompanyId())){
return Result.error("企业id不能为空！");
}
PayIncomeContract payIncomeContract = payIncomeContractService.getById(contractId);
if(Objects.isNull(payIncomeContract)){
return Result.error("合同不存在！");
}
QueryWrapper<PayCommonProject> queryWrapper = QueryGenerator.initQueryWrapper(payCommonProject, req.getParameterMap());
List<PayCommonProject> list = payCommonProjectService.list(queryWrapper);
List<PayCommonProjectOutput> listNew = new ArrayList<>();
List<PayCommonProjectOutput> listPayCommonProjectOutputNew = new ArrayList<>();
if(!CollectionUtils.isEmpty(list)){
// todo 获取打包项目对比数据
// payPackCompanyService.list();
List<String> listProjectId = list.stream().map(PayCommonProject::getId).collect(Collectors.toList());
// 获取已经关联合同的普通项目
LambdaQueryWrapper<PayIncomeContractAssociated> queryPayIncomeContractAssociated = new LambdaQueryWrapper<>();
@@ -113,6 +127,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
listNew = JSONArray.parseArray(str,PayCommonProjectOutput.class);
List<String> finalListProjectId = listProjectIdNew;
listNew.forEach(p->{
// 没有关联合同
if(!CollectionUtils.isEmpty(finalListProjectId) && finalListProjectId.contains(p.getId())){
return;