1.0.29 客户添加本公司标识

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/OAStatusEnum.java

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

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/CrmCustomerInfo.java

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

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/bo/CrmCustomerInfoBo.java

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

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmCustomerInfoVo.java

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

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmCustomerInfoServiceImpl.java

@@ -2,9 +2,9 @@ package org.dromara.oa.crm.service.impl;
 
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
-    import org.dromara.common.mybatis.core.page.TableDataInfo;
-    import org.dromara.common.mybatis.core.page.PageQuery;
-    import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.toolkit.JoinWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -39,7 +39,7 @@ public class CrmCustomerInfoServiceImpl implements ICrmCustomerInfoService {
      * @return 客户信息
      */
     @Override
-    public CrmCustomerInfoVo queryById(Long customerId){
+    public CrmCustomerInfoVo queryById(Long customerId) {
         return baseMapper.selectVoById(customerId);
     }
 
@@ -53,7 +53,7 @@ public class CrmCustomerInfoServiceImpl implements ICrmCustomerInfoService {
     @Override
     public TableDataInfo<CrmCustomerInfoVo> queryPageList(CrmCustomerInfoBo bo, PageQuery pageQuery) {
         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);
     }
 
@@ -66,7 +66,7 @@ public class CrmCustomerInfoServiceImpl implements ICrmCustomerInfoService {
     @Override
     public List<CrmCustomerInfoVo> queryList(CrmCustomerInfoBo bo) {
         MPJLambdaWrapper<CrmCustomerInfo> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        return baseMapper.selectCustomCrmCustomerInfoVoList(lqw);
     }
 
     private MPJLambdaWrapper<CrmCustomerInfo> buildQueryWrapper(CrmCustomerInfoBo bo) {
@@ -83,7 +83,6 @@ public class CrmCustomerInfoServiceImpl implements ICrmCustomerInfoService {
             .eq(bo.getOwnerId() != null, CrmCustomerInfo::getOwnerId, bo.getOwnerId())
             .eq(StringUtils.isNotBlank(bo.getDetailedAddress()), CrmCustomerInfo::getDetailedAddress, bo.getDetailedAddress())
             .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.getLegalRepresentative()), CrmCustomerInfo::getLegalRepresentative, bo.getLegalRepresentative())
             .eq(StringUtils.isNotBlank(bo.getBusinessLicenseNumber()), CrmCustomerInfo::getBusinessLicenseNumber, bo.getBusinessLicenseNumber())
@@ -91,7 +90,10 @@ public class CrmCustomerInfoServiceImpl implements ICrmCustomerInfoService {
             .eq(StringUtils.isNotBlank(bo.getBankAccountOpening()), CrmCustomerInfo::getBankAccountOpening, bo.getBankAccountOpening())
             .eq(StringUtils.isNotBlank(bo.getBankNumber()), CrmCustomerInfo::getBankNumber, bo.getBankNumber())
             .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;
     }
 

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java

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