完善企业管理,联系人管理

This commit is contained in:
梁琦涛
2021-08-30 14:10:33 +08:00
parent ca6acff6f3
commit e0e35b6758
11 changed files with 202 additions and 63 deletions
@@ -82,15 +82,21 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
if(!StringUtils.isBlank(msg)){
return Result.error(msg.toString());
}
// 新增企业前在次校验企业名称是否存在
LambdaQueryWrapper<PayCompanyManagement> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PayCompanyManagement::getCompanyName,payCompanyManagement.getCompanyName());
PayCompanyManagement payCompanyManagementNew = payCompanyManagementService.getOne(queryWrapper);
PayCompanyManagement payCompanyManagementNew = null;
try {
// 新增企业前在次校验企业名称是否存在
LambdaQueryWrapper<PayCompanyManagement> 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<PayCompanyMan
if(!StringUtils.isBlank(msg)){
return Result.error(msg.toString());
}
// 编辑保存企业前再次校验企业名称是否存在
LambdaQueryWrapper<PayCompanyManagement> 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<PayCompanyManagement> 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<PayCompanyMan
return Result.error("企业名称不能为空!");
}else{
if(companyName.length() > 50){
return Result.error("企业名称长度应小于50");
return Result.error("企业名称长度应小于50字符");
}
}
LambdaQueryWrapper<PayCompanyManagement> 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<PayCompanyManagement> 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<PayCompanyMan
if(!CollectionUtils.isEmpty(list)){
List<PayCompanyManagement> listSigning = new ArrayList<>();
List<PayCompanyManagement> listRemove = new ArrayList<>();
List<PayCompanyManagement> listAll = payCompanyManagementService.list();
List<String> companyList = list.stream().map(PayCompanyManagement::getCompanyName).collect(Collectors.toList());
List<PayCompanyManagement> listAll = payCompanyManagementService.listPayCompanyManagement(companyList);
List<String> listCompany = new ArrayList<>();
StringBuilder msg = new StringBuilder();
list.forEach(p->{
@@ -98,10 +98,16 @@ public class PayContactsManagementController extends JeroController<PayContactsM
if(!StringUtils.isBlank(msg)){
return Result.error(msg.toString());
}
// 新增企业前在次校验企业名称是否存在
LambdaQueryWrapper<PayContactsManagement> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PayContactsManagement::getPhone,payContactsManagement.getPhone());
PayContactsManagement payContactsManagementNew = payContactsManagementService.getOne(queryWrapper);
PayContactsManagement payContactsManagementNew = null;
try {
// 新增企业前在次校验企业名称是否存在
LambdaQueryWrapper<PayContactsManagement> 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<PayContactsM
if(!StringUtils.isBlank(msg)){
return Result.error(msg.toString());
}
// 编辑保存企业前再次校验企业名称是否存在
LambdaQueryWrapper<PayContactsManagement> 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<PayContactsManagement> 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<PayContactsM
return Result.error("手机号输入错误!");
}
}
LambdaQueryWrapper<PayContactsManagement> 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<PayContactsManagement> 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<PayContactsM
if(!CollectionUtils.isEmpty(list)){
List<PayContactsManagement> listSigning = new ArrayList<>();
List<PayContactsManagement> listRemove = new ArrayList<>();
List<PayContactsManagement> listContactsAll = payContactsManagementService.list();
List<PayCompanyManagement> listCompanyAll = payCompanyManagementService.list();
List<String> phoneList = list.stream().map(PayContactsManagement::getPhone).collect(Collectors.toList());
List<PayContactsManagement> listContactsAll = payContactsManagementService.listPayContactsManagement(phoneList);
List<String> companyList = list.stream().map(PayContactsManagement::getCompanyName).collect(Collectors.toList());
List<PayCompanyManagement> listCompanyAll = payCompanyManagementService.listPayCompanyManagement(companyList);
List<String> listContacts = new ArrayList<>();
StringBuilder msg = new StringBuilder();
list.forEach(p->{
@@ -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;
}
@@ -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<PayCompanyManagement> {
/**
* @Description 根据企业名称,查询企业信息
* @Author lqt
* @Date 2021/8/30
* @Param companyList 企业名称集合
* @Return
* @Exception
*/
List<PayCompanyManagement> listPayCompanyManagement(List<String> companyList);
}
@@ -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<PayContactsManag
*/
IPage<PayContactsManagement> queryPageList(Page<PayContactsManagement> page, @Param("payContactsManagement") PayContactsManagement payContactsManagement);
/**
* @Description 根据手机号查询联系人信息
* @Author lqt
* @Date 2021/8/30
* @Param phoneList 手机号集合
* @Return
* @Exception
*/
List<PayContactsManagement> listPayContactsManagement(List<String> phoneList);
}
@@ -2,4 +2,28 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.company.mapper.PayCompanyManagementMapper">
<select id="listPayCompanyManagement" resultType="com.jero.company.entity.PayCompanyManagement">
SELECT
id,
company_name AS companyName,
company_address AS companyAddress,
company_phone AS companyPhone,
postal_code AS postalCode,
bank_account_name AS bankAccountName,
opening_bank AS openingBank,
bank_account AS bankAccount,
duty_code AS dutyCode,
data_source AS dataSource,
signing_up AS signingUp,
remarks,
create_by AS createBy,
create_time AS createTime,
update_by AS updateBy,
update_time AS updateTime
FROM pay_company_management
where company_name IN
<foreach collection="companyList" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</select>
</mapper>
@@ -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
<where>
<if test="payContactsManagement.dataSource != null and payContactsManagement.dataSource != ''">
AND pcm.data_source = #{payContactsManagement.dataSource}
</if>
<if test="payContactsManagement.signingUp != null and payContactsManagement.signingUp != ''">
AND pcm.signing_up = #{payContactsManagement.signingUp}
</if>
<if test="payContactsManagement.name != null and payContactsManagement.name != ''">
AND pcm.name LIKE concat('%',concat(#{payContactsManagement.name}))
</if>
<if test="payContactsManagement.phone != null and payContactsManagement.phone != ''">
AND pcm.phone LIKE concat('%',concat(#{payContactsManagement.phone},'%'))
</if>
<if test="payContactsManagement.companyName != null and payContactsManagement.companyName != ''">
AND pcm1.company_name LIKE concat('%',concat(#{payContactsManagement.companyName},'%'))
</if>
</where>
ORDER BY pcm.create_time DESC
FROM pay_contacts_management pcm
LEFT JOIN pay_company_management pcm1 ON pcm.company_id = pcm1.id
<where>
<if test="payContactsManagement.dataSource != null and payContactsManagement.dataSource != ''">
AND pcm.data_source = #{payContactsManagement.dataSource}
</if>
<if test="payContactsManagement.signingUp != null and payContactsManagement.signingUp != ''">
AND pcm.signing_up = #{payContactsManagement.signingUp}
</if>
<if test="payContactsManagement.name != null and payContactsManagement.name != ''">
AND pcm.name LIKE concat('%',concat(#{payContactsManagement.name},'%'))
</if>
<if test="payContactsManagement.phone != null and payContactsManagement.phone != ''">
AND pcm.phone LIKE concat('%',concat(#{payContactsManagement.phone},'%'))
</if>
<if test="payContactsManagement.companyName != null and payContactsManagement.companyName != ''">
AND pcm1.company_name LIKE concat('%',concat(#{payContactsManagement.companyName},'%'))
</if>
</where>
ORDER BY pcm.create_time DESC
</select>
<select id="listPayContactsManagement" resultType="com.jero.company.entity.PayContactsManagement">
SELECT
pcm.id,
pcm.company_id AS companyId,
pcm.company_name AS companyName,
pcm.name,
pcm.gender,
pcm.post,
pcm.phone,
pcm.email,
pcm.contact_address AS contactAddress,
pcm.postal_code AS postalCode,
pcm.data_source AS dataSource,
pcm.signing_up AS signingUp,
pcm.remarks,
pcm.create_by AS createBy,
pcm.create_time AS createTime,
pcm.update_by AS updateBy,
pcm.update_time AS updateTime
FROM pay_contacts_management pcm
WHERE pcm.phone IN
<foreach collection="phoneList" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</select>
</mapper>
@@ -23,4 +23,15 @@ public interface IPayCompanyManagementService extends IService<PayCompanyManagem
* @Exception
*/
void updateCompanyData(List<PayCompanyManagement> listSigning,List<PayCompanyManagement> list);
/**
* @Description 根据企业名称,查询企业信息
* @Author lqt
* @Date 2021/8/30
* @Param companyList 企业名称集合
* @Return
* @Exception
*/
List<PayCompanyManagement> listPayCompanyManagement(List<String> companyList);
}
@@ -38,4 +38,14 @@ public interface IPayContactsManagementService extends IService<PayContactsManag
*/
void updateContactsData(List<PayContactsManagement> listSigning,List<PayContactsManagement> list);
/**
* @Description 根据手机号查询联系人信息
* @Author lqt
* @Date 2021/8/30
* @Param phoneList 手机号集合
* @Return
* @Exception
*/
List<PayContactsManagement> listPayContactsManagement(List<String> phoneList);
}
@@ -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<PayCompanyManag
@Autowired
IPayCompanyManagementService iPayCompanyManagementService;
@Resource
PayCompanyManagementMapper payCompanyManagementMapper;
@Override
@Transactional
public void updateCompanyData(List<PayCompanyManagement> listSigning, List<PayCompanyManagement> list) {
@@ -35,4 +39,9 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
iPayCompanyManagementService.saveBatch(list);
}
}
@Override
public List<PayCompanyManagement> listPayCompanyManagement(List<String> companyList) {
return payCompanyManagementMapper.listPayCompanyManagement(companyList);
}
}
@@ -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<PayContactsMan
iPayContactsManagementService.saveBatch(list);
}
}
@Override
public List<PayContactsManagement> listPayContactsManagement(List<String> phoneList) {
return payContactsManagementMapper.listPayContactsManagement(phoneList);
}
}