中间合同

hx-customer/src/main/java/com/fjhx/customer/entity/customer/vo/CustomerVo.java

@@ -1,7 +1,5 @@
 package com.fjhx.customer.entity.customer.vo;
 
-import com.fjhx.area.service.ISetAreaName;
-import com.fjhx.area.service.SetCustomizeAreaId;
 import com.fjhx.area.service.SetCustomizeAreaName;
 import com.fjhx.customer.entity.customer.po.Customer;
 import com.fjhx.customer.entity.customer.po.CustomerFollowRecords;
@@ -55,4 +53,8 @@ public class CustomerVo extends Customer implements SetCustomizeAreaName {
      */
     private Integer isTop;
 
+    /**
+     * 客户状态 字典值
+     */
+    private String statusVal;
 }

hx-customer/src/main/java/com/fjhx/customer/service/customer/impl/CustomerServiceImpl.java

@@ -4,11 +4,13 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.area.utils.CustomizeAreaUtil;
+import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.entity.coding.bo.CustomerCodeAndCountryId;
 import com.fjhx.common.service.coding.CodingRuleCustomerService;
 import com.fjhx.customer.entity.customer.dto.CustomerDto;
@@ -41,6 +43,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -65,6 +68,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
     @Autowired
     private DictTenantDataService dictTenantDataService;
 
+
     /**
      * 查询客户的列表
      *
@@ -131,6 +135,14 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         List<CustomerVo> records = page.getRecords();
         CustomizeAreaUtil.setAreaName(records);
 
+        //获取客户类型字典
+        DynamicDataSourceContextHolder.push(SourceConstant.BASE);
+        DictTenantDataSelectDto dictTenantDataSelectDto = new DictTenantDataSelectDto();
+        dictTenantDataSelectDto.setDictCode("customer_status");
+        List<DictTenantDataVo> dictTenantDataVoList = dictTenantDataService.getList(dictTenantDataSelectDto);
+        Map<String, String> customerStatusDic = dictTenantDataVoList.stream().collect(Collectors.toMap(DictTenantDataVo::getDictKey, DictTenantDataVo::getDictValue));
+        DynamicDataSourceContextHolder.poll();
+
         // 赋值客户跟进记录
         for (CustomerVo record : records) {
             List<CustomerFollowRecords> customerFollowRecordsList = customerFollowRecordsService.list(q -> q
@@ -139,6 +151,9 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
                     .last("limit 3")
             );
             record.setCustomerFollowRecordsList(customerFollowRecordsList);
+
+            //赋值客户状态字典值
+            record.setStatusVal(customerStatusDic.get(record.getStatus()));
         }
 
         // 赋值是否置顶

hx-sale/src/main/java/com/fjhx/sale/entity/intermediate/vo/IntermediateContractVo.java

@@ -54,4 +54,6 @@ public class IntermediateContractVo extends IntermediateContract {
      */
     private String buyCorporationName;
 
+    private String opUserName;
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/intermediate/impl/IntermediateContractServiceImpl.java

@@ -19,6 +19,7 @@ import com.fjhx.sale.service.contract.ContractService;
 import com.fjhx.sale.service.documents.DocumentsService;
 import com.fjhx.sale.service.intermediate.IntermediateContractService;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -69,6 +70,8 @@ public class IntermediateContractServiceImpl extends ServiceImpl<IntermediateCon
         corporationService.attributeAssign(records, IntermediateContractVo::getSellCorporationId, (item, corporation) -> {
             item.setSellCorporationName(corporation.getName());
         });
+        //赋值最近操作用户
+        UserUtil.assignmentNickName(records, IntermediateContractVo::getUpdateUser, IntermediateContractVo::setOpUserName);
         return page;
     }
 

hx-sale/src/main/resources/mapper/intermediate/IntermediateContractMapper.xml

@@ -7,7 +7,7 @@
                c.currency,
                c.sell_corporation_id oldSellCorporationId,
                c.buy_corporation_id  oldBuyCorporationId,
-               ic.documents_id,
+               d.id                  documentsId,
                ic.sell_corporation_id,
                ic.sell_contact_name,
                ic.sell_contact_number,