客户档案跟进修改

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

@@ -39,4 +39,9 @@ public class CustomerFollowRecordsVo extends CustomerFollowRecords {
      * 跟进类型
      */
     private String type;
+
+    /**
+     * 跟进人名称
+     */
+    private String followUpUserName;
 }

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

@@ -21,6 +21,7 @@ import com.fjhx.file.utils.ObsFileUtil;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 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;
 
@@ -62,6 +63,10 @@ public class CustomerFollowRecordsServiceImpl extends ServiceImpl<CustomerFollow
                 record.setFileList(obsFiles);
             }
         }
+
+        //赋值跟进人名称
+        UserUtil.assignmentNickName(records, CustomerFollowRecordsVo::getCreateUser, CustomerFollowRecordsVo::setFollowUpUserName);
+
         //赋值客户名称
         customerService.attributeAssign(records, CustomerFollowRecordsVo::getCustomerId, (item, customer) -> {
             item.setCustomerName(customer.getName());

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

@@ -152,6 +152,8 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
 //                    .last("limit 3")
 //            );
 //            record.setCustomerFollowRecordsList(customerFollowRecordsList);
+            //赋值跟进人名称
+            UserUtil.assignmentNickName(followUp, CustomerFollowRecordsVo::getCreateUser, CustomerFollowRecordsVo::setFollowUpUserName);
             record.setCustomerFollowRecordsList(followUp);
 
             //赋值客户状态字典值

hx-customer/src/main/resources/mapper/customer/CustomerFollowRecordsMapper.xml

@@ -8,7 +8,8 @@
                       create_time `date`,
                       NULL AS     contractCode,
                       10   AS     type,
-                      NULL AS     remark
+                      NULL AS     content,
+                      create_user
                FROM bytesailing_sale.sale_quotation sq
                WHERE sq.buy_corporation_id = #{id}
                  and sq.tenant_id = #{tenantId}
@@ -19,18 +20,20 @@
                       create_time `date`,
                       CODE AS     contractCode,
                       20   AS     type,
-                      NULL AS     remark
+                      NULL AS     content,
+                      create_user
                FROM bytesailing_sale.contract c
                WHERE c.buy_corporation_id = #{id}
                  and c.tenant_id = #{tenantId}
                  and c.del_flag = 0)
               UNION
               (SELECT id,
-                      NULL    AS amount,
+                      NULL AS amount,
                       `date`,
-                      NULL    AS contractCode,
-                      30      AS type,
-                      content AS remark
+                      NULL AS contractCode,
+                      30   AS type,
+                      content,
+                      create_user
                FROM customer_follow_records cfr
                WHERE cfr.customer_id = #{id})) t1
             ${ew.customSqlSegment}

hx-customer/src/main/resources/mapper/customer/CustomerMapper.xml

@@ -77,7 +77,8 @@
                       create_time `date`,
                       NULL AS     contractCode,
                       10   AS     type,
-                      NULL AS     content
+                      NULL AS     content,
+                      create_user
                FROM bytesailing_sale.sale_quotation sq
                WHERE sq.buy_corporation_id = #{id}
                  and sq.tenant_id = #{tenantId}
@@ -88,7 +89,8 @@
                       create_time `date`,
                       CODE AS     contractCode,
                       20   AS     type,
-                      NULL AS     content
+                      NULL AS     content,
+                      create_user
                FROM bytesailing_sale.contract c
                WHERE c.buy_corporation_id = #{id}
                  and c.tenant_id = #{tenantId}
@@ -99,7 +101,8 @@
                       `date`,
                       NULL AS contractCode,
                       30   AS type,
-                      content
+                      content,
+                      create_user
                FROM customer_follow_records cfr
                WHERE cfr.customer_id = #{id})) t1
         ORDER BY t1.date DESC LIMIT 3