yinq
/
hwbm-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.0.29 客户添加本公司标识

Browse Source
dev
yinq 1 month ago
parent 00ff015ccf
commit 5cc423f97d
6 changed files with 71 additions and 39 deletions
Show Stats Download Patch File Download Diff File

7
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/OAStatusEnum.java
Unescape Escape View File

@ -34,7 +34,12 @@ public enum OAStatusEnum {
/** /**
* 可用 * 可用
*/ */
COMPLETED("3", "可用"); COMPLETED("3", "可用"),
/**
* 作废
*/
INVALID("4", "作废");
/** /**
* 状态 * 状态

5
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/CrmCustomerInfo.java
Unescape Escape View File

@ -127,6 +127,11 @@ public class CrmCustomerInfo extends TenantEntity {
*/ */
private String activeFlag; private String activeFlag;
/**
* 本公司标识（1是 0否）
*/
private String ourCompanyFlag;
/** /**
* 删除标志（0代表存在 1代表删除） * 删除标志（0代表存在 1代表删除）
*/ */

5
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/bo/CrmCustomerInfoBo.java
Unescape Escape View File

@ -125,5 +125,10 @@ public class CrmCustomerInfoBo extends BaseEntity {
*/ */
private String activeFlag; private String activeFlag;
/**
* 本公司标识（1是 0否）
*/
private String ourCompanyFlag;
} }

13
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmCustomerInfoVo.java
Unescape Escape View File

@ -87,6 +87,12 @@ public class CrmCustomerInfoVo implements Serializable {
@ExcelProperty(value = "归属人员ID") @ExcelProperty(value = "归属人员ID")
private Long ownerId; private Long ownerId;
/**
* 归属人员名称
*/
@ExcelProperty(value = "客户经理")
private String ownerName;
/** /**
* 详细地址 * 详细地址
*/ */
@ -161,5 +167,12 @@ public class CrmCustomerInfoVo implements Serializable {
@ExcelDictFormat(dictType = "active_flag") @ExcelDictFormat(dictType = "active_flag")
private String activeFlag; private String activeFlag;
/**
* 本公司标识（1是 0否）
*/
@ExcelProperty(value = "本公司标识", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "active_flag")
private String ourCompanyFlag;
} }

78
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmCustomerInfoServiceImpl.java
Unescape Escape View File

@ -2,9 +2,9 @@ package org.dromara.oa.crm.service.impl;
import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@ -39,23 +39,23 @@ public class CrmCustomerInfoServiceImpl implements ICrmCustomerInfoService {
* @return 客户信息 * @return 客户信息
*/ */
@Override @Override
public CrmCustomerInfoVo queryById(Long customerId){ public CrmCustomerInfoVo queryById(Long customerId) {
return baseMapper.selectVoById(customerId); return baseMapper.selectVoById(customerId);
} }
/** /**
* 分页查询客户信息列表 * 分页查询客户信息列表
* *
* @param bo 查询条件 * @param bo 查询条件
* @param pageQuery 分页参数 * @param pageQuery 分页参数
* @return 客户信息分页列表 * @return 客户信息分页列表
*/ */
@Override @Override
public TableDataInfo<CrmCustomerInfoVo> queryPageList(CrmCustomerInfoBo bo, PageQuery pageQuery) { public TableDataInfo<CrmCustomerInfoVo> queryPageList(CrmCustomerInfoBo bo, PageQuery pageQuery) {
MPJLambdaWrapper<CrmCustomerInfo> lqw = buildQueryWrapper(bo); MPJLambdaWrapper<CrmCustomerInfo> lqw = buildQueryWrapper(bo);
Page<CrmCustomerInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); Page<CrmCustomerInfoVo> result = baseMapper.selectCustomCrmCustomerInfoVoList(pageQuery.build(), lqw);
return TableDataInfo.build(result); return TableDataInfo.build(result);
} }
/** /**
* 查询符合条件的客户信息列表 * 查询符合条件的客户信息列表
@ -66,32 +66,34 @@ public class CrmCustomerInfoServiceImpl implements ICrmCustomerInfoService {
@Override @Override
public List<CrmCustomerInfoVo> queryList(CrmCustomerInfoBo bo) { public List<CrmCustomerInfoVo> queryList(CrmCustomerInfoBo bo) {
MPJLambdaWrapper<CrmCustomerInfo> lqw = buildQueryWrapper(bo); MPJLambdaWrapper<CrmCustomerInfo> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw); return baseMapper.selectCustomCrmCustomerInfoVoList(lqw);
} }
private MPJLambdaWrapper<CrmCustomerInfo> buildQueryWrapper(CrmCustomerInfoBo bo) { private MPJLambdaWrapper<CrmCustomerInfo> buildQueryWrapper(CrmCustomerInfoBo bo) {
Map<String, Object> params = bo.getParams(); Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<CrmCustomerInfo> lqw = JoinWrappers.lambda(CrmCustomerInfo.class) MPJLambdaWrapper<CrmCustomerInfo> lqw = JoinWrappers.lambda(CrmCustomerInfo.class)
.selectAll(CrmCustomerInfo.class) .selectAll(CrmCustomerInfo.class)
.like(StringUtils.isNotBlank(bo.getCustomerName()), CrmCustomerInfo::getCustomerName, bo.getCustomerName()) .like(StringUtils.isNotBlank(bo.getCustomerName()), CrmCustomerInfo::getCustomerName, bo.getCustomerName())
.like(StringUtils.isNotBlank(bo.getMnemonicName()), CrmCustomerInfo::getMnemonicName, bo.getMnemonicName()) .like(StringUtils.isNotBlank(bo.getMnemonicName()), CrmCustomerInfo::getMnemonicName, bo.getMnemonicName())
.eq(bo.getIndustryId() != null, CrmCustomerInfo::getIndustryId, bo.getIndustryId()) .eq(bo.getIndustryId() != null, CrmCustomerInfo::getIndustryId, bo.getIndustryId())
.eq(bo.getCustomerType() != null, CrmCustomerInfo::getCustomerType, bo.getCustomerType()) .eq(bo.getCustomerType() != null, CrmCustomerInfo::getCustomerType, bo.getCustomerType())
.eq(bo.getCustomerStatus() != null, CrmCustomerInfo::getCustomerStatus, bo.getCustomerStatus()) .eq(bo.getCustomerStatus() != null, CrmCustomerInfo::getCustomerStatus, bo.getCustomerStatus())
.eq(bo.getCustomerLevel() != null, CrmCustomerInfo::getCustomerLevel, bo.getCustomerLevel()) .eq(bo.getCustomerLevel() != null, CrmCustomerInfo::getCustomerLevel, bo.getCustomerLevel())
.eq(bo.getCustomerSource() != null, CrmCustomerInfo::getCustomerSource, bo.getCustomerSource()) .eq(bo.getCustomerSource() != null, CrmCustomerInfo::getCustomerSource, bo.getCustomerSource())
.eq(bo.getOwnerId() != null, CrmCustomerInfo::getOwnerId, bo.getOwnerId()) .eq(bo.getOwnerId() != null, CrmCustomerInfo::getOwnerId, bo.getOwnerId())
.eq(StringUtils.isNotBlank(bo.getDetailedAddress()), CrmCustomerInfo::getDetailedAddress, bo.getDetailedAddress()) .eq(StringUtils.isNotBlank(bo.getDetailedAddress()), CrmCustomerInfo::getDetailedAddress, bo.getDetailedAddress())
.eq(bo.getCustomerScale() != null, CrmCustomerInfo::getCustomerScale, bo.getCustomerScale()) .eq(bo.getCustomerScale() != null, CrmCustomerInfo::getCustomerScale, bo.getCustomerScale())
.eq(bo.getParentCustomerId() != null, CrmCustomerInfo::getParentCustomerId, bo.getParentCustomerId()) .eq(StringUtils.isNotBlank(bo.getCustomerRelationship()), CrmCustomerInfo::getCustomerRelationship, bo.getCustomerRelationship())
.eq(StringUtils.isNotBlank(bo.getCustomerRelationship()), CrmCustomerInfo::getCustomerRelationship, bo.getCustomerRelationship()) .eq(StringUtils.isNotBlank(bo.getLegalRepresentative()), CrmCustomerInfo::getLegalRepresentative, bo.getLegalRepresentative())
.eq(StringUtils.isNotBlank(bo.getLegalRepresentative()), CrmCustomerInfo::getLegalRepresentative, bo.getLegalRepresentative()) .eq(StringUtils.isNotBlank(bo.getBusinessLicenseNumber()), CrmCustomerInfo::getBusinessLicenseNumber, bo.getBusinessLicenseNumber())
.eq(StringUtils.isNotBlank(bo.getBusinessLicenseNumber()), CrmCustomerInfo::getBusinessLicenseNumber, bo.getBusinessLicenseNumber()) .eq(StringUtils.isNotBlank(bo.getTaxNumber()), CrmCustomerInfo::getTaxNumber, bo.getTaxNumber())
.eq(StringUtils.isNotBlank(bo.getTaxNumber()), CrmCustomerInfo::getTaxNumber, bo.getTaxNumber()) .eq(StringUtils.isNotBlank(bo.getBankAccountOpening()), CrmCustomerInfo::getBankAccountOpening, bo.getBankAccountOpening())
.eq(StringUtils.isNotBlank(bo.getBankAccountOpening()), CrmCustomerInfo::getBankAccountOpening, bo.getBankAccountOpening()) .eq(StringUtils.isNotBlank(bo.getBankNumber()), CrmCustomerInfo::getBankNumber, bo.getBankNumber())
.eq(StringUtils.isNotBlank(bo.getBankNumber()), CrmCustomerInfo::getBankNumber, bo.getBankNumber()) .eq(StringUtils.isNotBlank(bo.getOssId()), CrmCustomerInfo::getOssId, bo.getOssId())
.eq(StringUtils.isNotBlank(bo.getOssId()), CrmCustomerInfo::getOssId, bo.getOssId()) .eq(StringUtils.isNotBlank(bo.getActiveFlag()), CrmCustomerInfo::getActiveFlag, bo.getActiveFlag())
.eq(StringUtils.isNotBlank(bo.getActiveFlag()), CrmCustomerInfo::getActiveFlag, bo.getActiveFlag()); .eq(StringUtils.isNotBlank(bo.getOurCompanyFlag()), CrmCustomerInfo::getOurCompanyFlag, bo.getOurCompanyFlag())
.eq(bo.getParentCustomerId() != null, CrmCustomerInfo::getParentCustomerId, bo.getParentCustomerId())
.eq("t.del_flag", "0");
return lqw; return lqw;
} }

2
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java
Unescape Escape View File

@ -252,6 +252,8 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService {
} }
if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.FINISH.getStatus())) { if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.FINISH.getStatus())) {
contractInfo.setContractStatus(OAStatusEnum.COMPLETED.getStatus()); contractInfo.setContractStatus(OAStatusEnum.COMPLETED.getStatus());
} else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.INVALID.getStatus())){
contractInfo.setContractStatus(OAStatusEnum.INVALID.getStatus());
} }
baseMapper.updateById(contractInfo); baseMapper.updateById(contractInfo);
}); });

Write Preview
Loading…
Cancel
Save