迁移客户拜访相关、客户详情接口增加拜访相关数据

blade-service-api/blade-los-api/src/main/java/org/springblade/los/vgm/KeyValueVo.java

@@ -0,0 +1,19 @@
+package org.springblade.los.vgm;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Rain
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class KeyValueVo {
+
+	private String key;
+
+	private Object value;
+
+}

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/dto/CorpsVisitDTO.java

@@ -0,0 +1,18 @@
+package org.springblade.salesPart.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.salesPart.entity.CorpsVisit;
+
+/**
+ * 客户拜访表数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2025-02-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CorpsVisitDTO extends CorpsVisit {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/CorpsVisit.java

@@ -0,0 +1,116 @@
+package org.springblade.salesPart.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springblade.core.secure.utils.AuthUtil;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 客户拜访表实体类
+ *
+ * @author BladeX
+ * @since 2025-02-24
+ */
+@Data
+@TableName("pjpf_corps_visit")
+@ApiModel(value = "CorpsVisit对象", description = "客户拜访表")
+public class CorpsVisit implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private Long id;
+	/**
+	 * 创建人
+	 */
+	@ApiModelProperty(value = "创建人")
+	private Long createUser;
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 * 修改人
+	 */
+	@ApiModelProperty(value = "修改人")
+	private Long updateUser;
+	/**
+	 * 修改时间
+	 */
+	@ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+	/**
+	 * 是否已删除（0 否 1是）
+	 */
+	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	private Integer isDeleted;
+	/**
+	 * 租户id
+	 */
+	@ApiModelProperty(value = "租户id")
+	private String tenantId = AuthUtil.getTenantId();
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "备注")
+	private String remarks;
+	/**
+	 * 内容
+	 */
+	@ApiModelProperty(value = "内容")
+	private String content;
+	/**
+	 * 拜访日期
+	 */
+	@ApiModelProperty(value = "拜访日期")
+	private Date visitDate;
+	/**
+	 * 拜访人
+	 */
+	@ApiModelProperty(value = "拜访人")
+	private Long visitPeopleId;
+	/**
+	 * 拜访人
+	 */
+	@ApiModelProperty(value = "拜访人")
+	private String visitPeopleName;
+	/**
+	 * 拜访客户
+	 */
+	@ApiModelProperty(value = "拜访客户")
+	private Long customerId;
+	/**
+	 * 拜访客户
+	 */
+	@ApiModelProperty(value = "拜访客户")
+	private String customerName;
+	/**
+	 * 经度
+	 */
+	@ApiModelProperty(value = "经度")
+	private String longitude;
+	/**
+	 * 维度
+	 */
+	@ApiModelProperty(value = "维度")
+	private String dimension;
+	/**
+	 * 地址
+	 */
+	@ApiModelProperty(value = "地址")
+	private String address;
+
+	/**
+	 * 拜访日期
+	 */
+	@TableField(exist = false)
+	private List<String> visitDateList;
+
+
+}

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsDesc.java

@@ -339,4 +339,11 @@ public class PjCorpsDesc implements Serializable {
 	@TableField(exist = false)
 	private List<String> createTimeList;
 
+
+	/**
+	 * 客户拜访记录
+	 */
+	@TableField(exist = false)
+	List<CorpsVisit> corpsVisitList;
+
 }

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/vo/CorpsVisitVO.java

@@ -0,0 +1,20 @@
+package org.springblade.salesPart.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.salesPart.entity.CorpsVisit;
+
+/**
+ * 客户拜访表视图实体类
+ *
+ * @author BladeX
+ * @since 2025-02-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "CorpsVisitVO对象", description = "客户拜访表")
+public class CorpsVisitVO extends CorpsVisit {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/vo/CustomerTypeKeyValueVo.java

@@ -0,0 +1,18 @@
+package org.springblade.salesPart.vo;
+
+import lombok.Data;
+
+/**
+ * @author Rain
+ */
+@Data
+public class CustomerTypeKeyValueVo {
+
+
+	private Long id;
+
+
+	private String cname;
+
+
+}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/controller/CorpsVisitController.java

@@ -0,0 +1,138 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.salesPart.corps.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.salesPart.corps.service.ICorpsVisitService;
+import org.springblade.salesPart.entity.CorpsVisit;
+import org.springblade.salesPart.vo.CorpsVisitVO;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * 客户拜访表 控制器
+ *
+ * @author BladeX
+ * @since 2025-02-24
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/corpsvisit")
+@Api(value = "客户拜访表", tags = "客户拜访表接口")
+public class CorpsVisitController extends BladeController {
+
+	private final ICorpsVisitService corpsVisitService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入corpsVisit")
+	public R<CorpsVisit> detail(CorpsVisit corpsVisit) {
+		CorpsVisit detail = corpsVisitService.getOne(Condition.getQueryWrapper(corpsVisit));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 客户拜访表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入corpsVisit")
+	public R<IPage<CorpsVisit>> list(CorpsVisit corpsVisit, Query query) {
+		LambdaQueryWrapper<CorpsVisit> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(CorpsVisit::getTenantId, AuthUtil.getTenantId())
+			.eq(CorpsVisit::getIsDeleted, 0)
+			.eq(CorpsVisit::getCustomerName, corpsVisit.getCustomerName())
+			.eq(CorpsVisit::getVisitPeopleName, corpsVisit.getVisitPeopleName())
+			.orderByDesc(CorpsVisit::getVisitDate);
+		if (corpsVisit.getVisitDateList() != null && corpsVisit.getVisitDateList().size() > 1) {//拜访日期
+			lambdaQueryWrapper.ge(CorpsVisit::getVisitDateList, corpsVisit.getVisitDateList().get(0));
+			lambdaQueryWrapper.le(CorpsVisit::getVisitDateList, corpsVisit.getVisitDateList().get(1));
+		}
+		IPage<CorpsVisit> pages = corpsVisitService.page(Condition.getPage(query), lambdaQueryWrapper);
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 客户拜访表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入corpsVisit")
+	public R<IPage<CorpsVisitVO>> page(CorpsVisitVO corpsVisit, Query query) {
+		IPage<CorpsVisitVO> pages = corpsVisitService.selectCorpsVisitPage(Condition.getPage(query), corpsVisit);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 客户拜访表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入corpsVisit")
+	public R save(@Valid @RequestBody CorpsVisit corpsVisit) {
+		return R.status(corpsVisitService.save(corpsVisit));
+	}
+
+	/**
+	 * 修改 客户拜访表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入corpsVisit")
+	public R update(@Valid @RequestBody CorpsVisit corpsVisit) {
+		return R.status(corpsVisitService.updateById(corpsVisit));
+	}
+
+	/**
+	 * 新增或修改 客户拜访表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入corpsVisit")
+	public R submit(@Valid @RequestBody CorpsVisit corpsVisit) {
+		return corpsVisitService.submit(corpsVisit);
+	}
+
+
+	/**
+	 * 删除 客户拜访表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(corpsVisitService.removeByIds(Func.toLongList(ids)));
+	}
+
+
+}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/mapper/CorpsTypeDescMapper.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.salesPart.entity.PjCorpsTypeDesc;
 import org.springblade.salesPart.vo.CorpsTypeDescVO;
+import org.springblade.salesPart.vo.CustomerTypeKeyValueVo;
 
 import java.util.List;
 
@@ -57,4 +58,11 @@ public interface CorpsTypeDescMapper extends BaseMapper<PjCorpsTypeDesc> {
 	 */
 	String selectTypeName(@Param("corpId") Long corpId);
 
+
+	/**
+	 * 查询客户类别
+	 * @param customerId 客户id
+	 * @return 结果
+	 */
+	List<CustomerTypeKeyValueVo> getCustomerTypeKeyValueVoList(@Param("customerId") Long customerId);
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/mapper/CorpsTypeDescMapper.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--suppress ALL -->
 <mapper namespace="org.springblade.salesPart.corps.mapper.CorpsTypeDescMapper">
 
     <!-- 通用查询映射结果 -->
@@ -33,5 +34,17 @@
             left join pjpf_corps_type_desc t2 on t1.id = t2.corp_type_id
         where t2.corp_id = #{corpId}
     </select>
+    <select id="getCustomerTypeKeyValueVoList" resultType="org.springblade.salesPart.vo.CustomerTypeKeyValueVo"
+            parameterType="java.lang.Long">
+        SELECT
+            DISTINCT
+            ct.id,
+            ct.cname
+        FROM
+            pjpf_corps_type_desc ctd
+                INNER JOIN pjpf_corps_type ct ON ctd.corp_type_id = ct.id
+        where ctd.status = 0 and ctd.corp_id = #{customerId}
+          and ct.is_deleted = 0
+    </select>
 
 </mapper>

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/mapper/CorpsVisitMapper.java

@@ -0,0 +1,43 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.salesPart.corps.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.salesPart.entity.CorpsVisit;
+import org.springblade.salesPart.vo.CorpsVisitVO;
+
+import java.util.List;
+
+/**
+ * 客户拜访表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2025-02-24
+ */
+public interface CorpsVisitMapper extends BaseMapper<CorpsVisit> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param corpsVisit
+	 * @return
+	 */
+	List<CorpsVisitVO> selectCorpsVisitPage(IPage page, CorpsVisitVO corpsVisit);
+
+}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/mapper/CorpsVisitMapper.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.salesPart.corps.mapper.CorpsVisitMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="corpsVisitResultMap" type="org.springblade.salesPart.entity.CorpsVisit">
+        <id column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="remarks" property="remarks"/>
+        <result column="content" property="content"/>
+        <result column="visit_date" property="visitDate"/>
+        <result column="visit_people_id" property="visitPeopleId"/>
+        <result column="visit_people_name" property="visitPeopleName"/>
+        <result column="customer_id" property="customerId"/>
+        <result column="customer_name" property="customerName"/>
+        <result column="longitude" property="longitude"/>
+        <result column="dimension" property="dimension"/>
+        <result column="address" property="address"/>
+    </resultMap>
+
+
+    <select id="selectCorpsVisitPage" resultMap="corpsVisitResultMap">
+        select * from pjpf_corps_visit where is_deleted = 0
+    </select>
+
+</mapper>

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/service/ICorpsVisitService.java

@@ -0,0 +1,43 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.salesPart.corps.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.core.tool.api.R;
+import org.springblade.salesPart.entity.CorpsVisit;
+import org.springblade.salesPart.vo.CorpsVisitVO;
+
+/**
+ * 客户拜访表 服务类
+ *
+ * @author BladeX
+ * @since 2025-02-24
+ */
+public interface ICorpsVisitService extends IService<CorpsVisit> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param corpsVisit
+	 * @return
+	 */
+	IPage<CorpsVisitVO> selectCorpsVisitPage(IPage<CorpsVisitVO> page, CorpsVisitVO corpsVisit);
+
+	R submit(CorpsVisit corpsVisit);
+}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/service/impl/CorpsDescServiceImpl.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.salesPart.corps.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -28,11 +12,13 @@ import org.springblade.client.entity.CorpsDesc;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.salesPart.brand.service.IBrandDescService;
 import org.springblade.salesPart.corps.mapper.CorpsDescMapper;
 import org.springblade.salesPart.corps.mapper.CorpsTypeDescMapper;
 import org.springblade.salesPart.corps.mapper.CorpsTypeMapper;
+import org.springblade.salesPart.corps.mapper.CorpsVisitMapper;
 import org.springblade.salesPart.corps.service.ICorpsDescService;
 import org.springblade.salesPart.entity.*;
 import org.springblade.salesPart.excel.CorpsDescImportExcel;
@@ -43,6 +29,7 @@ import org.springblade.salesPart.settlement.mapper.SettlementMapper;
 import org.springblade.salesPart.ship.mapper.ShipMapper;
 import org.springblade.salesPart.storage.service.IStorageDescService;
 import org.springblade.salesPart.vo.CorpsDescVO;
+import org.springblade.salesPart.vo.CustomerTypeKeyValueVo;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.feign.ISysClient;
 import org.springblade.system.user.entity.User;
@@ -81,6 +68,8 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 
 	private final IBrandDescService brandDescService;
 
+	private final CorpsVisitMapper corpsVisitMapper;
+
 
 	static final int GB_SP_DIFF = 160;
 	// 存放国标一级汉字不同读音的起始区位码
@@ -99,28 +88,25 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 	@Override
 	public PjCorpsDesc getMessageByID(PjCorpsDesc corpsDesc) {
 		PjCorpsDesc desc = baseMapper.selectById(corpsDesc.getId());
-		if (desc != null) {
-			//获取客户联系人
-			desc.setCorpsAttnList(corpsAttnService.list(new QueryWrapper<PjCorpsAttn>().eq("pid", corpsDesc.getId()).eq("is_deleted", 0)));
-			//获取客户地址
-			desc.setCorpsAddrList(corpsAddrService.list(new QueryWrapper<PjCorpsAddr>().eq("pid", corpsDesc.getId()).eq("is_deleted", 0)));
-			//获取客户附件
-			desc.setCorpsFilesList(corpsFilesService.list(new QueryWrapper<PjCorpsFiles>().eq("pid", corpsDesc.getId()).eq("is_deleted", 0)));
-			//获取客户类别
-			List<String> longs = corpsTypeDescMapper.selectTypeId(corpsDesc.getId());
-			desc.setCorpsTypeId(String.join(",", longs));
-			StringBuilder corpsTypeName = new StringBuilder();
-			if (ObjectUtils.isNotNull(longs)) {
-				for (String id : longs) {
-					String name = corpsTypeMapper.selectById(Long.parseLong(id)) == null ? "" : corpsTypeMapper.selectById(Long.parseLong(id)).getCname();
-					corpsTypeName.append(name).append(",");
-				}
-				String corpsName = corpsTypeName.substring(0, corpsTypeName.length() - 1);
-				desc.setCorpsTypeName(corpsName);
-			} else {
-				desc.setCorpsTypeName("");
-			}
+		if (Objects.isNull(desc)){
+			return null;
+		}
+		//获取客户联系人
+		desc.setCorpsAttnList(corpsAttnService.list(new QueryWrapper<PjCorpsAttn>().eq("pid", corpsDesc.getId()).eq("is_deleted", 0)));
+		//获取客户地址
+		desc.setCorpsAddrList(corpsAddrService.list(new QueryWrapper<PjCorpsAddr>().eq("pid", corpsDesc.getId()).eq("is_deleted", 0)));
+		//获取客户附件
+		desc.setCorpsFilesList(corpsFilesService.list(new QueryWrapper<PjCorpsFiles>().eq("pid", corpsDesc.getId()).eq("is_deleted", 0)));
+		//获取客户类别
+		List<String> customerTypeIdList = corpsTypeDescMapper.selectTypeId(corpsDesc.getId());
+		List<CustomerTypeKeyValueVo> customerTypeKeyValueVoList = corpsTypeDescMapper.getCustomerTypeKeyValueVoList(corpsDesc.getId());
+		if (CollectionUtil.isNotEmpty(customerTypeKeyValueVoList)) {
+			desc.setCorpsTypeId(String.join(",", customerTypeIdList));
+			desc.setCorpsTypeId(customerTypeKeyValueVoList.stream().filter(ck -> Objects.nonNull(ck.getId())).map(ctk -> String.valueOf(ctk.getId())).collect(Collectors.joining(",")));
+			desc.setCorpsTypeName(customerTypeKeyValueVoList.stream().map(CustomerTypeKeyValueVo::getCname).filter(Objects::nonNull).collect(Collectors.joining(",")));
 		}
+		List<CorpsVisit> corpsVisitList = corpsVisitMapper.selectList(new LambdaQueryWrapper<CorpsVisit>().eq(CorpsVisit::getCustomerId, corpsDesc.getId()).eq(CorpsVisit::getIsDeleted, 0));
+		desc.setCorpsVisitList(corpsVisitList);
 		return desc;
 	}
 

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/service/impl/CorpsVisitServiceImpl.java

@@ -0,0 +1,68 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.salesPart.corps.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.secure.utils.SecureUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.salesPart.corps.mapper.CorpsVisitMapper;
+import org.springblade.salesPart.corps.service.ICorpsVisitService;
+import org.springblade.salesPart.entity.CorpsVisit;
+import org.springblade.salesPart.vo.CorpsVisitVO;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * 客户拜访表 服务实现类
+ *
+ * @author BladeX
+ * @since 2025-02-24
+ */
+@Service
+public class CorpsVisitServiceImpl extends ServiceImpl<CorpsVisitMapper, CorpsVisit> implements ICorpsVisitService {
+
+	@Override
+	public IPage<CorpsVisitVO> selectCorpsVisitPage(IPage<CorpsVisitVO> page, CorpsVisitVO corpsVisit) {
+		return page.setRecords(baseMapper.selectCorpsVisitPage(page, corpsVisit));
+	}
+
+	@Override
+	public R submit(CorpsVisit corpsVisit) {
+		Long userId = SecureUtil.getUserId();
+		if (corpsVisit.getId() == null) {
+			corpsVisit.setTenantId(SecureUtil.getTenantId());
+			corpsVisit.setCreateTime(new Date());
+			corpsVisit.setCreateUser(userId);
+			corpsVisit.setVisitDate(new Date());
+			corpsVisit.setVisitPeopleId(AuthUtil.getUserId());
+			corpsVisit.setVisitPeopleName(AuthUtil.getUserName());
+			baseMapper.insert(corpsVisit);
+		} else {
+			corpsVisit.setTenantId(SecureUtil.getTenantId());
+			corpsVisit.setUpdateTime(new Date());
+			corpsVisit.setUpdateUser(AuthUtil.getUserId());
+			corpsVisit.setVisitPeopleId(AuthUtil.getUserId());
+			corpsVisit.setVisitPeopleName(AuthUtil.getUserName());
+			baseMapper.updateById(corpsVisit);
+		}
+		return R.data(corpsVisit);
+	}
+
+}