diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java index 1c4ac34f..c58a2676 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java @@ -82,15 +82,21 @@ public class PayCompanyManagementController extends JeroController queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PayCompanyManagement::getCompanyName,payCompanyManagement.getCompanyName()); - PayCompanyManagement payCompanyManagementNew = payCompanyManagementService.getOne(queryWrapper); + PayCompanyManagement payCompanyManagementNew = null; + try { + // 新增企业前在次校验企业名称是否存在 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayCompanyManagement::getCompanyName,payCompanyManagement.getCompanyName()); + payCompanyManagementNew = payCompanyManagementService.getOne(queryWrapper); + }catch (Exception e){ + log.info("企业管理-添加异常",e); + return Result.error("该企业名称已存在！"); + } // 存在数据 if(!Objects.isNull(payCompanyManagementNew)){ // 如果是管理新增 && 已存在数据来源是报名，更新数据，变更来源为管理端 if(Objects.equals(payCompanyManagement.getDataSource(),PayCompanyManagementCommon.DATA_SOURCE1) - && Objects.equals(payCompanyManagementNew.getDataSource(),PayCompanyManagementCommon.DATA_SOURCE2)){ + && Objects.equals(payCompanyManagementNew.getDataSource(),PayCompanyManagementCommon.DATA_SOURCE2)){ payCompanyManagement.setId(payCompanyManagementNew.getId()); payCompanyManagement.setDataSource(PayCompanyManagementCommon.DATA_SOURCE1); payCompanyManagement.setSigningUp(payCompanyManagementNew.getSigningUp()); @@ -116,12 +122,17 @@ public class PayCompanyManagementController extends JeroController queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PayCompanyManagement::getCompanyName,payCompanyManagement.getCompanyName()); - PayCompanyManagement payCompanyManagementNew = payCompanyManagementService.getOne(queryWrapper); - // 企业名称存在，并且编辑id与查询不同，则校验不通过 - if(!Objects.isNull(payCompanyManagementNew) && !Objects.equals(payCompanyManagementNew.getId(),payCompanyManagement.getId())) { + try { + // 编辑保存企业前再次校验企业名称是否存在 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayCompanyManagement::getCompanyName,payCompanyManagement.getCompanyName()); + PayCompanyManagement payCompanyManagementNew = payCompanyManagementService.getOne(queryWrapper); + // 企业名称存在，并且编辑id与查询不同，则校验不通过 + if(!Objects.isNull(payCompanyManagementNew) && !Objects.equals(payCompanyManagementNew.getId(),payCompanyManagement.getId())) { + return Result.error("企业名称已存在！"); + } + }catch (Exception e){ + log.info("企业管理-编辑异常",e); return Result.error("企业名称已存在！"); } payCompanyManagementService.updateById(payCompanyManagement); @@ -179,15 +190,20 @@ public class PayCompanyManagementController extends JeroController 50){ - return Result.error("企业名称长度应小于50！"); + return Result.error("企业名称长度应小于50字符！"); } } - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PayCompanyManagement::getCompanyName,companyName); - queryWrapper.eq(PayCompanyManagement::getDataSource,PayCompanyManagementCommon.DATA_SOURCE1); - PayCompanyManagement payCompanyManagement = payCompanyManagementService.getOne(queryWrapper); - if(Objects.isNull(payCompanyManagement)) { - return Result.OK("没有该企业名称！"); + try { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayCompanyManagement::getCompanyName,companyName); + queryWrapper.eq(PayCompanyManagement::getDataSource,PayCompanyManagementCommon.DATA_SOURCE1); + PayCompanyManagement payCompanyManagement = payCompanyManagementService.getOne(queryWrapper); + if(Objects.isNull(payCompanyManagement)) { + return Result.OK("没有该企业名称！"); + } + }catch (Exception e){ + log.info("企业管理-通过企业名称查询异常",e); + return Result.error("该企业名称已存在！"); } return Result.error("该企业名称已存在！"); } @@ -258,7 +274,8 @@ public class PayCompanyManagementController extends JeroController listSigning = new ArrayList<>(); List listRemove = new ArrayList<>(); - List listAll = payCompanyManagementService.list(); + List companyList = list.stream().map(PayCompanyManagement::getCompanyName).collect(Collectors.toList()); + List listAll = payCompanyManagementService.listPayCompanyManagement(companyList); List listCompany = new ArrayList<>(); StringBuilder msg = new StringBuilder(); list.forEach(p->{ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index c0abfe53..0416129a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -98,10 +98,16 @@ public class PayContactsManagementController extends JeroController queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PayContactsManagement::getPhone,payContactsManagement.getPhone()); - PayContactsManagement payContactsManagementNew = payContactsManagementService.getOne(queryWrapper); + PayContactsManagement payContactsManagementNew = null; + try { + // 新增企业前在次校验企业名称是否存在 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayContactsManagement::getPhone,payContactsManagement.getPhone()); + payContactsManagementNew = payContactsManagementService.getOne(queryWrapper); + }catch (Exception e){ + log.info("联系人管理-添加异常",e); + return Result.error("手机号已存在！"); + } // 存在数据 if(!Objects.isNull(payContactsManagementNew)){ // 如果是管理新增 && 已存在数据来源是报名，更新数据，变更来源为管理端 @@ -132,12 +138,17 @@ public class PayContactsManagementController extends JeroController queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PayContactsManagement::getPhone,payContactsManagement.getPhone()); - PayContactsManagement payContactsManagementNew = payContactsManagementService.getOne(queryWrapper); - // 企业名称存在，并且编辑id与查询不同，则校验不通过 - if(!Objects.isNull(payContactsManagementNew) && !Objects.equals(payContactsManagementNew.getId(),payContactsManagement.getId())) { + try { + // 编辑保存企业前再次校验企业名称是否存在 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayContactsManagement::getPhone,payContactsManagement.getPhone()); + 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("手机号已存在！"); } payContactsManagementService.updateById(payContactsManagement); @@ -200,12 +211,17 @@ public class PayContactsManagementController extends JeroController queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PayContactsManagement::getPhone,phone); - queryWrapper.eq(PayContactsManagement::getDataSource,PayContactsManagementCommon.DATA_SOURCE1); - PayContactsManagement payContactsManagement = payContactsManagementService.getOne(queryWrapper); - if(Objects.isNull(payContactsManagement)) { - return Result.OK("没有该手机号！"); + try { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayContactsManagement::getPhone,phone); + 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("该机号已存在！"); } @@ -291,8 +307,10 @@ public class PayContactsManagementController extends JeroController listSigning = new ArrayList<>(); List listRemove = new ArrayList<>(); - List listContactsAll = payContactsManagementService.list(); - List listCompanyAll = payCompanyManagementService.list(); + List phoneList = list.stream().map(PayContactsManagement::getPhone).collect(Collectors.toList()); + List listContactsAll = payContactsManagementService.listPayContactsManagement(phoneList); + List companyList = list.stream().map(PayContactsManagement::getCompanyName).collect(Collectors.toList()); + List listCompanyAll = payCompanyManagementService.listPayCompanyManagement(companyList); List listContacts = new ArrayList<>(); StringBuilder msg = new StringBuilder(); list.forEach(p->{ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java index 4e696035..9a34e487 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java @@ -106,16 +106,16 @@ public class PayContactsManagement implements Serializable { @ApiModelProperty(value = "创建人") private String createBy; /**创建时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建时间") private Date createTime; /**更新人*/ @ApiModelProperty(value = "更新人") private String updateBy; /**更新时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间") private Date updateTime; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayCompanyManagementMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayCompanyManagementMapper.java index 8a02533b..36a32a80 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayCompanyManagementMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayCompanyManagementMapper.java @@ -4,6 +4,8 @@ package com.jero.company.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.company.entity.PayCompanyManagement; +import java.util.List; + /** * @Description: pay_company_management * @Author: jeecg-boot @@ -11,5 +13,13 @@ import com.jero.company.entity.PayCompanyManagement; * @Version: V1.0 */ public interface PayCompanyManagementMapper extends BaseMapper { - + /** + * @Description 根据企业名称，查询企业信息 + * @Author lqt + * @Date 2021/8/30 + * @Param companyList 企业名称集合 + * @Return + * @Exception + */ + List listPayCompanyManagement(List companyList); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayContactsManagementMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayContactsManagementMapper.java index 6dacf709..0c528409 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayContactsManagementMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayContactsManagementMapper.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.company.entity.PayContactsManagement; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @Description: pay_contacts_management * @Author: jeecg-boot @@ -25,4 +27,13 @@ public interface PayContactsManagementMapper extends BaseMapper queryPageList(Page page, @Param("payContactsManagement") PayContactsManagement payContactsManagement); + /** + * @Description 根据手机号查询联系人信息 + * @Author lqt + * @Date 2021/8/30 + * @Param phoneList 手机号集合 + * @Return + * @Exception + */ + List listPayContactsManagement(List phoneList); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml index 9c898582..6bedfc1e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml @@ -2,4 +2,28 @@ + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml index cf48a8d8..b52a2d76 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml @@ -21,25 +21,50 @@ pcm.create_time AS createTime, pcm.update_by AS updateBy, pcm.update_time AS updateTime - FROM pay_contacts_management pcm - LEFT JOIN pay_company_management pcm1 ON pcm.company_id = pcm1.id - - - AND pcm.data_source = #{payContactsManagement.dataSource} - - - AND pcm.signing_up = #{payContactsManagement.signingUp} - - - AND pcm.name LIKE concat('%',concat(#{payContactsManagement.name})) - - - AND pcm.phone LIKE concat('%',concat(#{payContactsManagement.phone},'%')) - - - AND pcm1.company_name LIKE concat('%',concat(#{payContactsManagement.companyName},'%')) - - - ORDER BY pcm.create_time DESC + FROM pay_contacts_management pcm + LEFT JOIN pay_company_management pcm1 ON pcm.company_id = pcm1.id + + + AND pcm.data_source = #{payContactsManagement.dataSource} + + + AND pcm.signing_up = #{payContactsManagement.signingUp} + + + AND pcm.name LIKE concat('%',concat(#{payContactsManagement.name},'%')) + + + AND pcm.phone LIKE concat('%',concat(#{payContactsManagement.phone},'%')) + + + AND pcm1.company_name LIKE concat('%',concat(#{payContactsManagement.companyName},'%')) + + + ORDER BY pcm.create_time DESC + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java index c1dea8bd..29e164e9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java @@ -23,4 +23,15 @@ public interface IPayCompanyManagementService extends IService listSigning,List list); + + /** + * @Description 根据企业名称，查询企业信息 + * @Author lqt + * @Date 2021/8/30 + * @Param companyList 企业名称集合 + * @Return + * @Exception + */ + List listPayCompanyManagement(List companyList); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayContactsManagementService.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayContactsManagementService.java index 37871eeb..fa92f946 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayContactsManagementService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayContactsManagementService.java @@ -38,4 +38,14 @@ public interface IPayContactsManagementService extends IService listSigning,List list); + /** + * @Description 根据手机号查询联系人信息 + * @Author lqt + * @Date 2021/8/30 + * @Param phoneList 手机号集合 + * @Return + * @Exception + */ + List listPayContactsManagement(List phoneList); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java index e19e2dcb..4517cbd5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java @@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.List; /** @@ -23,6 +24,9 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl listSigning, List list) { @@ -35,4 +39,9 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl listPayCompanyManagement(List companyList) { + return payCompanyManagementMapper.listPayCompanyManagement(companyList); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java index d1f66e42..4845da49 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java @@ -1,7 +1,6 @@ package com.jero.company.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -47,4 +46,9 @@ public class PayContactsManagementServiceImpl extends ServiceImpl listPayContactsManagement(List phoneList) { + return payContactsManagementMapper.listPayContactsManagement(phoneList); + } }