fix：添加企业基本信息查询

crm/src/main/java/com/kakarote/crm/controller/CrmOpenApiController.java

@@ -0,0 +1,23 @@
+package com.kakarote.crm.controller;
+
+import com.kakarote.core.common.ParamAspect;
+import com.kakarote.core.common.R;
+import com.kakarote.core.common.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/openApi")
+@Api(tags = "crm对外接口")
+public class CrmOpenApiController {
+
+    @PostMapping("/crm/addCorporateSeas")
+    @ApiOperation("接口新增公海数据")
+    @ParamAspect
+    public Result addCorporateSeas(){
+        return R.ok();
+    }
+}

crm/src/main/java/com/kakarote/crm/controller/CrmQyjbxxController.java

@@ -0,0 +1,55 @@
+package com.kakarote.crm.controller;
+
+import com.kakarote.core.common.ParamAspect;
+import com.kakarote.core.common.R;
+import com.kakarote.core.common.Result;
+import com.kakarote.core.common.SubModelType;
+import com.kakarote.core.common.log.SysLog;
+import com.kakarote.crm.common.CrmModel;
+import com.kakarote.crm.common.log.CrmProductLog;
+import com.kakarote.crm.entity.BO.QyjbxxBo;
+import com.kakarote.crm.entity.PO.CrmQyjbxx;
+import com.kakarote.crm.service.ICrmQyjbxxService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/qyjbxx")
+@Api(tags = "企业基本信息")
+public class CrmQyjbxxController {
+    @Autowired
+    private ICrmQyjbxxService crmQyjbxxService;
+
+
+    @PostMapping("/queryById/{qyId}")
+    @ApiOperation("根据ID查询")
+    @ParamAspect
+    public Result<CrmQyjbxx> queryById(@PathVariable("qyId") @ApiParam(name = "id", value = "id") Integer qyId) {
+        CrmQyjbxx qyjbxx = crmQyjbxxService.getQyjbxx(qyId);
+        return R.ok(qyjbxx);
+    }
+
+    @PostMapping("/add")
+    @ApiOperation("保存数据")
+    public Result add(@RequestBody CrmQyjbxx crmQyjbxx) {
+        return R.ok(crmQyjbxxService.insertQyjbxx(crmQyjbxx));
+    }
+
+    @PostMapping("/queryByNsrxx")
+    @ApiOperation("根据纳税人识别号查询企业基本信息")
+    public Result<CrmQyjbxx> queryByNsrsbh(@RequestBody QyjbxxBo qyjbxxBo) {
+        CrmQyjbxx qyjbxxByNsrsbh = crmQyjbxxService.getQyjbxxByNsxx(qyjbxxBo);
+        return R.ok(qyjbxxByNsrsbh);
+    }
+
+//    @PostMapping("/queryByNsrmc/{nsrmc}")
+//    @ApiOperation("根据纳税人名称查询企业基本信息")
+//    public Result<CrmQyjbxx> queryByNsrmc(@PathVariable("nsrmc") @ApiParam(name = "nsrmc", value = "nsrmc") String nsrmc){
+//        CrmQyjbxx qyjbxxByNsrsbh = crmQyjbxxService.getQyjbxxByNsrmc(nsrmc);
+//        return R.ok(qyjbxxByNsrsbh);
+//    }
+
+}

crm/src/main/java/com/kakarote/crm/entity/BO/QyjbxxBo.java

@@ -0,0 +1,17 @@
+package com.kakarote.crm.entity.BO;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel("企业信息")
+public class QyjbxxBo {
+    /**
+     * 纳税人识别号
+     */
+    private String nsrsbh;
+    /**
+     * 纳税人名称
+     */
+    private String nsrmc;
+}

crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyjbxx.java

@@ -0,0 +1,434 @@
+package com.kakarote.crm.entity.PO;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @description wk_crm_qyjbxx
+ * @author https://www.json.cn/
+ * @date 2025-06-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("wk_crm_qyjbxx")
+@ApiModel(value="CrmQyjbxx对象", description="企业基本信息")
+public class CrmQyjbxx implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "qy_id", type = IdType.AUTO)
+    /**
+     * 企业Id     primary key
+     */
+    private Integer qyId;
+
+    /**
+     * 企业登记序号
+     */
+    private String djxh;
+
+    /**
+     * 纳税人识别号
+     */
+    private String nsrsbh;
+
+    /**
+     * 纳税人名称
+     */
+    private String nsrmc;
+
+    /**
+     * 课征主体登记类型代码
+     */
+    private String kzztdjlxDm;
+
+    /**
+     * 登记注册类型代码
+     */
+    private String djzclxDm;
+
+    /**
+     * 生产经营地址
+     */
+    private String scjydz;
+
+    /**
+     * 生产经营地址行政区划数字代码
+     */
+    private String scjydzxzqhszDm;
+
+    /**
+     * 纳税人状态代码
+     */
+    private String nsrztDm;
+
+    /**
+     * 行业代码
+     */
+    private String hyDm;
+
+    /**
+     * 注册地址
+     */
+    private String zcdz;
+
+    /**
+     * 注册地址行政区划数字代码
+     */
+    private String zcdzxzqhszDm;
+
+    /**
+     * 街道乡镇代码
+     */
+    private String jdxzDm;
+
+    /**
+     * 单位隶属关系代码
+     */
+    private String dwlsgxDm;
+
+    /**
+     * 登记日期
+     */
+    private String djrq;
+
+    /**
+     * 跨区财产税主体登记标志
+     */
+    private String kqccsztdjbz;
+
+    /**
+     * 主管税务局代码
+     */
+    private String zgswjDm;
+
+    /**
+     * 主管税务所（科、分局）代码
+     */
+    private String zgswskfjDm;
+
+    /**
+     * 税收管理员代码
+     */
+    private String ssglyDm;
+
+    /**
+     * 非居民企业标志
+     */
+    private String fjmqybz;
+
+    /**
+     * 有效标志
+     */
+    private String yxbz;
+
+    /**
+     * 工商注销日期
+     */
+    private String gszxrq;
+
+    /**
+     * 企业划型类别
+     */
+    private String qyhxlbDm;
+
+    /**
+     * 企业划型来源
+     */
+    private String qyhxly;
+
+    /**
+     * 经营范围
+     */
+    private String jyfw;
+
+    /**
+     * 注册地联系电话
+     */
+    private String zcdlxdh;
+
+    /**
+     * 注册地邮政编码
+     */
+    private String zcdyzbm;
+
+    /**
+     * 生产经营地联系电话
+     */
+    private String scjydlxdh;
+
+    /**
+     * 生产经营地邮政编码生产经营地邮政编码
+     */
+    private String scjydyzbm;
+
+    /**
+     * 核算方式代码
+     */
+    private String hsfsDm;
+
+    /**
+     * 从业人数
+     */
+    private String cyrs;
+
+    /**
+     * 外籍从业人数
+     */
+    private String wjcyrs;
+
+    /**
+     * 合伙人数
+     */
+    private String hhrs;
+
+    /**
+     * 雇工人数
+     */
+    private String ggrs;
+
+    /**
+     * 固定工人数
+     */
+    private String gdgrs;
+
+    /**
+     * 组织机构类型代码
+     */
+    private String zzjglxDm;
+
+    /**
+     * 会计制度（准则）代码
+     */
+    private String kjzdzzDm;
+
+    /**
+     * 税务代理人联系电话
+     */
+    private String swdlrlxdh;
+
+    /**
+     * 税务代理人电子信箱
+     */
+    private String swdlrdzxx;
+
+    /**
+     * 注册资本
+     */
+    private String zczb;
+
+    /**
+     * 投资总额
+     */
+    private String tzze;
+
+    /**
+     * 自然人投资比例
+     */
+    private String zrrtzbl;
+
+    /**
+     * 外资投资比例
+     */
+    private String wztzbl;
+
+    /**
+     * 国有投资比例
+     */
+    private String gytzbl;
+
+    /**
+     * 国有控股类型代码
+     */
+    private String gykglxDm;
+
+    /**
+     * 总分机构类型代码
+     */
+    private String zfjglxDm;
+
+    /**
+     * 法定代表人姓名
+     */
+    private String fddbrxm;
+
+    /**
+     * 法定代表人身份证件类型代码
+     */
+    private String fddbrsfzjlxDm;
+
+    /**
+     * 法定代表人身份证号码
+     */
+    private String fddbrsfzjhm;
+
+    /**
+     * 法定代表人固定电话
+     */
+    private String fddbrgddh;
+
+    /**
+     * 法定代表人移动电话
+     */
+    private String fddbryddh;
+
+    /**
+     * 法定代表人电子信箱
+     */
+    private String fddbrdzxx;
+
+    /**
+     * 财务负责人姓名
+     */
+    private String cwfzrxm;
+
+    /**
+     * 财务负责人身份证件种类代码
+     */
+    private String cwfzrsfzjzlDm;
+
+    /**
+     * 财务负责人身份证件号码
+     */
+    private String cwfzrsfzjhm;
+
+    /**
+     * 财务负责人固定电话
+     */
+    private String cwfzrgddh;
+
+    /**
+     * 财务负责人移动电话
+     */
+    private String cwfzryddh;
+
+    /**
+     * 财务负责人电子信箱
+     */
+    private String cwfzrdzxx;
+
+    /**
+     * 办税人姓名
+     */
+    private String bsrxm;
+
+    /**
+     * 办税人身份证件种类代码
+     */
+    private String bsrsfzjzlDm;
+
+    /**
+     * 办税人身份证件号码
+     */
+    private String bsrsfzjhm;
+
+    /**
+     * 办税人固定电话
+     */
+    private String bsrgddh;
+
+    /**
+     * 办税人移动电话
+     */
+    private String bsryddh;
+
+    /**
+     * 办税人电子信箱
+     */
+    private String bsrdzxx;
+
+    /**
+     * 临时税务登记有效期起
+     */
+    private String lsswdjyxqq;
+
+    /**
+     * 临时税务登记有效期止
+     */
+    private String lsswdjyxqz;
+
+    /**
+     * 税务代理人纳税人识别号
+     */
+    private String swdlrnsrsbh;
+
+    /**
+     * 税务代理人名称
+     */
+    private String swdlrmc;
+
+    /**
+     * 文化事业建设费缴费信息登记标志
+     */
+    private String whsyjsfjfxxdjbz;
+
+    /**
+     * 增值税经营类别
+     */
+    private String zzsjylb;
+
+    /**
+     * 印花税缴纳方式代码
+     */
+    private String yhsjnfsDm;
+
+    /**
+     * 征收项目城乡标志代码
+     */
+    private String zsxmcxbzDm;
+
+    /**
+     * 增值税企业类型代码
+     */
+    private String zzsqylxDm;
+
+    /**
+     * 国家或地区数字代码
+     */
+    private String gjhdqszDm;
+
+    /**
+     * 企业管理层级编号
+     */
+    private String qyglcjbh;
+
+    /**
+     * 企业所属集团代码
+     */
+    private String qyssjtDm;
+
+    /**
+     * 受托方社会信用代码
+     */
+    private String stfshxydm;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新人
+     */
+    private String updateBy;
+
+}

crm/src/main/java/com/kakarote/crm/mapper/CrmQyjbxxMapper.java

@@ -0,0 +1,12 @@
+package com.kakarote.crm.mapper;
+
+import com.kakarote.core.servlet.BaseMapper;
+import com.kakarote.crm.entity.PO.CrmQyjbxx;
+import feign.Param;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+@Mapper
+public interface CrmQyjbxxMapper extends BaseMapper<CrmQyjbxx> {
+    List<CrmQyjbxx> selectByExample(CrmQyjbxx example);
+}

crm/src/main/java/com/kakarote/crm/mapper/xml/CrmQyjbxxMapper.xml

@@ -0,0 +1,87 @@
+<?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="com.kakarote.crm.mapper.CrmQyjbxxMapper">
+    <resultMap id="BaseResultMap" type="com.kakarote.crm.entity.PO.CrmQyjbxx">
+        <result column="qy_id" jdbcType="INTEGER" property="qyId" />
+        <result column="djxh" jdbcType="VARCHAR" property="djxh" />
+        <result column="nsrsbh" jdbcType="VARCHAR" property="nsrsbh" />
+        <result column="nsrmc" jdbcType="VARCHAR" property="nsrmc" />
+        <result column="kzztdjlx_dm" jdbcType="VARCHAR" property="kzztdjlxDm" />
+        <result column="djzclx_dm" jdbcType="VARCHAR" property="djzclxDm" />
+        <result column="scjydz" jdbcType="VARCHAR" property="scjydz" />
+        <result column="scjydzxzqhsz_dm" jdbcType="VARCHAR" property="scjydzxzqhszDm" />
+        <result column="nsrzt_dm" jdbcType="VARCHAR" property="nsrztDm" />
+        <result column="hy_dm" jdbcType="VARCHAR" property="hyDm" />
+        <result column="zcdz" jdbcType="VARCHAR" property="zcdz" />
+        <result column="zcdzxzqhsz_dm" jdbcType="VARCHAR" property="zcdzxzqhszDm" />
+        <result column="jdxz_dm" jdbcType="VARCHAR" property="jdxzDm" />
+        <result column="dwlsgx_dm" jdbcType="VARCHAR" property="dwlsgxDm" />
+        <result column="djrq" jdbcType="VARCHAR" property="djrq" />
+        <result column="kqccsztdjbz" jdbcType="VARCHAR" property="kqccsztdjbz" />
+        <result column="zgswj_dm" jdbcType="VARCHAR" property="zgswjDm" />
+        <result column="zgswskfj_dm" jdbcType="VARCHAR" property="zgswskfjDm" />
+        <result column="ssgly_dm" jdbcType="VARCHAR" property="ssglyDm" />
+        <result column="fjmqybz" jdbcType="VARCHAR" property="fjmqybz" />
+        <result column="yxbz" jdbcType="VARCHAR" property="yxbz" />
+        <result column="gszxrq" jdbcType="VARCHAR" property="gszxrq" />
+        <result column="qyhxlb_dm" jdbcType="VARCHAR" property="qyhxlbDm" />
+        <result column="qyhxly" jdbcType="VARCHAR" property="qyhxly" />
+        <result column="jyfw" jdbcType="VARCHAR" property="jyfw" />
+        <result column="zcdlxdh" jdbcType="VARCHAR" property="zcdlxdh" />
+        <result column="zcdyzbm" jdbcType="VARCHAR" property="zcdyzbm" />
+        <result column="scjydlxdh" jdbcType="VARCHAR" property="scjydlxdh" />
+        <result column="scjydyzbm" jdbcType="VARCHAR" property="scjydyzbm" />
+        <result column="hsfs_dm" jdbcType="VARCHAR" property="hsfsDm" />
+        <result column="cyrs" jdbcType="VARCHAR" property="cyrs" />
+        <result column="wjcyrs" jdbcType="VARCHAR" property="wjcyrs" />
+        <result column="hhrs" jdbcType="VARCHAR" property="hhrs" />
+        <result column="ggrs" jdbcType="VARCHAR" property="ggrs" />
+        <result column="gdgrs" jdbcType="VARCHAR" property="gdgrs" />
+        <result column="zzjglx_dm" jdbcType="VARCHAR" property="zzjglxDm" />
+        <result column="kjzdzz_dm" jdbcType="VARCHAR" property="kjzdzzDm" />
+        <result column="swdlrlxdh" jdbcType="VARCHAR" property="swdlrlxdh" />
+        <result column="swdlrdzxx" jdbcType="VARCHAR" property="swdlrdzxx" />
+        <result column="zczb" jdbcType="VARCHAR" property="zczb" />
+        <result column="tzze" jdbcType="VARCHAR" property="tzze" />
+        <result column="zrrtzbl" jdbcType="VARCHAR" property="zrrtzbl" />
+        <result column="wztzbl" jdbcType="VARCHAR" property="wztzbl" />
+        <result column="gytzbl" jdbcType="VARCHAR" property="gytzbl" />
+        <result column="gykglx_dm" jdbcType="VARCHAR" property="gykglxDm" />
+        <result column="zfjglx_dm" jdbcType="VARCHAR" property="zfjglxDm" />
+        <result column="fddbrxm" jdbcType="VARCHAR" property="fddbrxm" />
+        <result column="fddbrsfzjlx_dm" jdbcType="VARCHAR" property="fddbrsfzjlxDm" />
+        <result column="fddbrsfzjhm" jdbcType="VARCHAR" property="fddbrsfzjhm" />
+        <result column="fddbrgddh" jdbcType="VARCHAR" property="fddbrgddh" />
+        <result column="fddbryddh" jdbcType="VARCHAR" property="fddbryddh" />
+        <result column="fddbrdzxx" jdbcType="VARCHAR" property="fddbrdzxx" />
+        <result column="cwfzrxm" jdbcType="VARCHAR" property="cwfzrxm" />
+        <result column="cwfzrsfzjzl_dm" jdbcType="VARCHAR" property="cwfzrsfzjzlDm" />
+        <result column="cwfzrsfzjhm" jdbcType="VARCHAR" property="cwfzrsfzjhm" />
+        <result column="cwfzrgddh" jdbcType="VARCHAR" property="cwfzrgddh" />
+        <result column="cwfzryddh" jdbcType="VARCHAR" property="cwfzryddh" />
+        <result column="cwfzrdzxx" jdbcType="VARCHAR" property="cwfzrdzxx" />
+        <result column="bsrxm" jdbcType="VARCHAR" property="bsrxm" />
+        <result column="bsrsfzjzl_dm" jdbcType="VARCHAR" property="bsrsfzjzlDm" />
+        <result column="bsrsfzjhm" jdbcType="VARCHAR" property="bsrsfzjhm" />
+        <result column="bsrgddh" jdbcType="VARCHAR" property="bsrgddh" />
+        <result column="bsryddh" jdbcType="VARCHAR" property="bsryddh" />
+        <result column="bsrdzxx" jdbcType="VARCHAR" property="bsrdzxx" />
+        <result column="lsswdjyxqq" jdbcType="VARCHAR" property="lsswdjyxqq" />
+        <result column="lsswdjyxqz" jdbcType="VARCHAR" property="lsswdjyxqz" />
+        <result column="swdlrnsrsbh" jdbcType="VARCHAR" property="swdlrnsrsbh" />
+        <result column="swdlrmc" jdbcType="VARCHAR" property="swdlrmc" />
+        <result column="whsyjsfjfxxdjbz" jdbcType="VARCHAR" property="whsyjsfjfxxdjbz" />
+        <result column="zzsjylb" jdbcType="VARCHAR" property="zzsjylb" />
+        <result column="yhsjnfs_dm" jdbcType="VARCHAR" property="yhsjnfsDm" />
+        <result column="zsxmcxbz_dm" jdbcType="VARCHAR" property="zsxmcxbzDm" />
+        <result column="zzsqylx_dm" jdbcType="VARCHAR" property="zzsqylxDm" />
+        <result column="gjhdqsz_dm" jdbcType="VARCHAR" property="gjhdqszDm" />
+        <result column="qyglcjbh" jdbcType="VARCHAR" property="qyglcjbh" />
+        <result column="qyssjt_dm" jdbcType="VARCHAR" property="qyssjtDm" />
+        <result column="stfshxydm" jdbcType="VARCHAR" property="stfshxydm" />
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+    </resultMap>
+</mapper>

crm/src/main/java/com/kakarote/crm/service/ICrmCustomerService.java

@@ -65,6 +65,7 @@ public interface ICrmCustomerService extends BaseService<CrmCustomer> {
      */
     public Map<String,Object> addOrUpdate(CrmModelSaveBO crmModel,boolean isExcel,Integer poolId);
 
+    CrmCustomer addOrUpdateByOpenApi(CrmModelSaveBO crmModel);
     /**
      * 删除客户数据
      *

crm/src/main/java/com/kakarote/crm/service/ICrmOpenApiService.java

@@ -0,0 +1,4 @@
+package com.kakarote.crm.service;
+
+public interface ICrmOpenApiService {
+}

crm/src/main/java/com/kakarote/crm/service/ICrmQyjbxxService.java

@@ -0,0 +1,55 @@
+package com.kakarote.crm.service;
+
+
+import com.kakarote.core.servlet.BaseService;
+import com.kakarote.crm.entity.BO.QyjbxxBo;
+import com.kakarote.crm.entity.PO.CrmQyjbxx;
+
+import java.util.List;
+
+public interface ICrmQyjbxxService extends BaseService<CrmQyjbxx> {
+    /**
+     * 通过企业Id查询企业基本信息
+     */
+    CrmQyjbxx getQyjbxx(Integer qyId);
+
+    /**
+     * 通过纳税人识别号获取企业基本信息
+     * @param qyjbxxBo
+     * @return
+     */
+    CrmQyjbxx getQyjbxxByNsxx(QyjbxxBo qyjbxxBo);
+
+    /**
+     * 通过纳税人名称获取企业基本信息
+     * @param nsrmc
+     * @return
+     */
+    CrmQyjbxx getQyjbxxByNsrmc(String nsrmc);
+
+    /**
+     * 插入企业基本信息
+     */
+    int insertQyjbxx(CrmQyjbxx crmQyjbxx);
+
+    /**
+     * 更新企业基本信息
+     * @param crmQyjbxx
+     * @return
+     */
+    int updateQyjbxx(CrmQyjbxx crmQyjbxx);
+
+    /**
+     * 删除企业基本信息
+     * @param qyId
+     * @return
+     */
+    int deleteQyjbxx(String qyId);
+
+    /**
+     * 查询企业基本信息列表
+     * @param crmQyjbxx
+     * @return
+     */
+    List<CrmQyjbxx> getQyjbxxList(CrmQyjbxx crmQyjbxx);
+}

crm/src/main/java/com/kakarote/crm/service/impl/CrmCustomerServiceImpl.java

@@ -439,6 +439,76 @@ public class CrmCustomerServiceImpl extends BaseServiceImpl<CrmCustomerMapper, C
         return map;
     }
 
+    /**
+     * 保存或新增信息（接口使用）
+     *
+     * @param crmModel model
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public CrmCustomer addOrUpdateByOpenApi(CrmModelSaveBO crmModel) {
+        CrmCustomer crmCustomer = BeanUtil.copyProperties(crmModel.getEntity(), CrmCustomer.class);
+        if (crmCustomer.getCustomerId() != null) {
+            if (!UserUtil.isAdmin() && getBaseMapper().queryIsRoUser(crmCustomer.getCustomerId(), UserUtil.getUserId()) > 0) {
+                throw new CrmException(SystemCodeEnum.SYSTEM_NO_AUTH);
+            }
+        }
+        String batchId = StrUtil.isNotEmpty(crmCustomer.getBatchId()) ? crmCustomer.getBatchId() : IdUtil.simpleUUID();
+        actionRecordUtil.updateRecord(crmModel.getField(), Dict.create().set("batchId", batchId).set("dataTableName", "wk_crm_customer_data"));
+        crmCustomerDataService.saveData(crmModel.getField(), batchId);
+        if (StrUtil.isEmpty(crmCustomer.getEmail())) {
+            crmCustomer.setEmail(null);
+        }
+        if (crmCustomer.getCustomerId() != null) {
+            crmBackLogDealService.deleteByType(crmCustomer.getOwnerUserId(), getLabel(), CrmBackLogEnum.TODAY_CUSTOMER, crmCustomer.getCustomerId());
+            crmBackLogDealService.deleteByType(crmCustomer.getOwnerUserId(), getLabel(), CrmBackLogEnum.FOLLOW_CUSTOMER, crmCustomer.getCustomerId());
+            crmCustomer.setUpdateTime(DateUtil.date());
+            actionRecordUtil.updateRecord(BeanUtil.beanToMap(getById(crmCustomer.getCustomerId())), BeanUtil.beanToMap(crmCustomer), CrmEnum.CUSTOMER, crmCustomer.getCustomerName(), crmCustomer.getCustomerId());
+            updateById(crmCustomer);
+            crmCustomer = getById(crmCustomer.getCustomerId());
+            ElasticUtil.batchUpdateEsData(elasticsearchRestTemplate.getClient(), "customer", crmCustomer.getCustomerId().toString(), crmCustomer.getCustomerName());
+        } else {
+            crmCustomer.setCreateTime(DateUtil.date());
+            crmCustomer.setUpdateTime(DateUtil.date());
+            crmCustomer.setReceiveTime(DateUtil.date());
+            crmCustomer.setCreateUserId(UserUtil.getUserId());
+            crmCustomer.setOwnerUserId(UserUtil.getUserId());
+//            if (!isExcel && crmCustomer.getOwnerUserId() == null) {
+//                //导入会手动选择负责人,需要判断
+//
+//            }
+            crmCustomer.setBatchId(batchId);
+            crmCustomer.setLastTime(new Date());
+            crmCustomer.setStatus(1);
+            crmCustomer.setDealStatus(0);
+            if (crmCustomer.getOwnerUserId() != null) {
+                if (!crmCustomerSettingService.queryCustomerSettingNum(1, crmCustomer.getOwnerUserId())) {
+                    throw new CrmException(CrmCodeEnum.CRM_CUSTOMER_SETTING_USER_ERROR);
+                }
+            }
+            save(crmCustomer);
+            crmActivityService.addActivity(2, CrmActivityEnum.CUSTOMER, crmCustomer.getCustomerId(), "");
+            actionRecordUtil.addRecord(crmCustomer.getCustomerId(), CrmEnum.CUSTOMER, crmCustomer.getCustomerName());
+//            if (isExcel && poolId != null) {
+//                CrmCustomerPoolRelation relation = new CrmCustomerPoolRelation();
+//                relation.setCustomerId(crmCustomer.getCustomerId());
+//                relation.setPoolId(poolId);
+//                customerPoolRelationService.save(relation);
+//            }
+        }
+        crmModel.setEntity(BeanUtil.beanToMap(crmCustomer));
+//        if (isExcel && poolId != null) {
+//            List<CrmCustomerPoolRelation> poolRelations = customerPoolRelationService.lambdaQuery()
+//                    .select(CrmCustomerPoolRelation::getPoolId)
+//                    .eq(CrmCustomerPoolRelation::getCustomerId, crmCustomer.getCustomerId())
+//                    .list();
+//            crmModel.getEntity().put("poolId", poolRelations.stream().map(CrmCustomerPoolRelation::getPoolId).collect(Collectors.toList()));
+//        }
+        savePage(crmModel, crmCustomer.getCustomerId(), false);
+        return crmCustomer;
+    }
+
+
     @Override
     public void setOtherField(Map<String, Object> map) {
         String ownerUserName = UserCacheUtil.getUserName((Long) map.get("ownerUserId"));

crm/src/main/java/com/kakarote/crm/service/impl/CrmOpenApiServiceImpl.java

@@ -0,0 +1,6 @@
+package com.kakarote.crm.service.impl;
+
+import com.kakarote.crm.service.ICrmOpenApiService;
+
+public class CrmOpenApiServiceImpl implements ICrmOpenApiService {
+}

crm/src/main/java/com/kakarote/crm/service/impl/CrmQyjbxxServiceImpl.java

@@ -0,0 +1,113 @@
+package com.kakarote.crm.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.aliyun.oss.ServiceException;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.kakarote.core.exception.CrmException;
+import com.kakarote.core.feign.crm.service.CrmService;
+import com.kakarote.core.servlet.BaseServiceImpl;
+import com.kakarote.crm.entity.BO.QyjbxxBo;
+import com.kakarote.crm.entity.PO.CrmQyjbxx;
+import com.kakarote.crm.mapper.CrmQyjbxxMapper;
+import com.kakarote.crm.service.ICrmQyjbxxService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+import static com.kakarote.core.common.SystemCodeEnum.SYSTEM_NO_VALID;
+
+@Service
+public class CrmQyjbxxServiceImpl extends BaseServiceImpl<CrmQyjbxxMapper, CrmQyjbxx> implements ICrmQyjbxxService {
+    @Autowired
+    private CrmQyjbxxMapper crmQyjbxxMapper;
+
+
+    /**
+     * 通过企业Id查询企业基本信息
+     *
+     * @param qyId
+     */
+    @Override
+    public CrmQyjbxx getQyjbxx(Integer qyId) {
+        return crmQyjbxxMapper.selectById(qyId);
+    }
+
+    /**
+     * 通过纳税人识别号获取企业基本信息
+     *
+     * @param qyjbxxBo
+     * @return
+     */
+    @Override
+    public CrmQyjbxx getQyjbxxByNsxx(QyjbxxBo qyjbxxBo) {
+        LambdaQueryChainWrapper<CrmQyjbxx> eq = new LambdaQueryChainWrapper<>(crmQyjbxxMapper);
+        if (StrUtil.isNotBlank(qyjbxxBo.getNsrsbh())) {
+            return eq.eq(CrmQyjbxx::getNsrsbh, qyjbxxBo.getNsrsbh()).last("limit 1").one();
+        }else if (StrUtil.isNotBlank(qyjbxxBo.getNsrmc())) {
+            return eq.eq(CrmQyjbxx::getNsrmc, qyjbxxBo.getNsrmc()).last("limit 1").one();
+        }else {
+           throw new CrmException(SYSTEM_NO_VALID);
+        }
+    }
+
+    /**
+     * 通过纳税人名称获取企业基本信息
+     *
+     * @param nsrmc
+     * @return
+     */
+    @Override
+    public CrmQyjbxx getQyjbxxByNsrmc(String nsrmc) {
+        CrmQyjbxx crmQyjbxx = new LambdaQueryChainWrapper<>(crmQyjbxxMapper)
+                .eq(CrmQyjbxx::getNsrmc, nsrmc)
+                .last("limit 1")
+                .one();
+        return crmQyjbxx;
+    }
+
+    /**
+     * 插入企业基本信息
+     *
+     * @param crmQyjbxx
+     */
+    @Override
+    public int insertQyjbxx(CrmQyjbxx crmQyjbxx) {
+        return crmQyjbxxMapper.insert(crmQyjbxx);
+    }
+
+    /**
+     * 更新企业基本信息
+     *
+     * @param crmQyjbxx
+     * @return
+     */
+    @Override
+    public int updateQyjbxx(CrmQyjbxx crmQyjbxx) {
+        return crmQyjbxxMapper.updateById(crmQyjbxx);
+    }
+
+    /**
+     * 删除企业基本信息
+     *
+     * @param qyId
+     * @return
+     */
+    @Override
+    public int deleteQyjbxx(String qyId) {
+        return crmQyjbxxMapper.deleteById(qyId);
+    }
+
+    /**
+     * 查询企业基本信息列表
+     *
+     * @param crmQyjbxx
+     * @return
+     */
+    @Override
+    public List<CrmQyjbxx> getQyjbxxList(CrmQyjbxx crmQyjbxx) {
+        QueryWrapper<CrmQyjbxx> crmQyjbxxQueryWrapper = new QueryWrapper<>();
+        return crmQyjbxxMapper.selectList(crmQyjbxxQueryWrapper);
+    }
+}

crm/src/main/java/com/kakarote/crm/util/CommentGenerator.java

@@ -0,0 +1,57 @@
+package com.kakarote.crm.util;
+
+import org.mybatis.generator.api.IntrospectedColumn;
+import org.mybatis.generator.api.IntrospectedTable;
+import org.mybatis.generator.api.dom.java.Field;
+import org.mybatis.generator.internal.DefaultCommentGenerator;
+import org.mybatis.generator.internal.util.StringUtility;
+
+import java.util.Properties;
+
+
+/**
+ * @Author: JCccc
+ * @Date: 2022-7-13 10:09
+ * @Description: 注释添加
+ */
+public class CommentGenerator extends DefaultCommentGenerator {
+    private boolean addRemarkComments = false;
+
+    /**
+     * 设置用户配置的参数
+     */
+    @Override
+    public void addConfigurationProperties(Properties properties) {
+        super.addConfigurationProperties(properties);
+        this.addRemarkComments = StringUtility.isTrue(properties.getProperty("addRemarkComments"));
+    }
+
+    /**
+     * 给字段添加注释
+     */
+    @Override
+    public void addFieldComment(Field field, IntrospectedTable introspectedTable,
+                                IntrospectedColumn introspectedColumn) {
+        String remarks = introspectedColumn.getRemarks();
+        //根据参数和备注信息判断是否添加备注信息
+        if (addRemarkComments && StringUtility.stringHasValue(remarks)) {
+            addFieldJavaDoc(field, remarks);
+        }
+    }
+
+    /**
+     * 给model的字段添加注释
+     */
+    private void addFieldJavaDoc(Field field, String remarks) {
+        //文档注释开始
+        field.addJavaDocLine("/**");
+        //获取数据库字段的备注信息
+        String[] remarkLines = remarks.split(System.getProperty("line.separator"));
+        for (String remarkLine : remarkLines) {
+            field.addJavaDocLine(" * " + remarkLine);
+        }
+        addJavadocTag(field, false);
+        field.addJavaDocLine(" */");
+    }
+
+}

crm/src/main/resources/mapper/CrmActionRecordMapper.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "https://www.72crm.com/mybatis-3.5.3-mapper.dtd">
+<mapper namespace="com.kakarote.crm.mapper.CrmActionRecordMapper">
+    <select id="queryRecordList" resultType="com.kakarote.crm.entity.VO.CrmActionRecordVO">
+      select a.*,b.realname,b.img
+      from wk_crm_action_record a join wk_admin_user b on a.create_user_id = b.user_id
+      where action_id = #{actionId} and types = #{types} and content is not null and content != '' order by create_time desc
+    </select>
+    <select id="queryFieldValue" resultType="com.kakarote.crm.entity.VO.CrmModelFiledVO">
+        select a.field_id, a.value,b.field_name,b.name,b.type from ${data.dataTableName} as a
+        join wk_crm_field b on a.field_id = b.field_id
+        where batch_id = #{data.batchId} and b.field_name is not null
+    </select>
+</mapper>

gateway/src/main/java/com/kakarote/gateway/service/impl/PermissionServiceImpl.java

@@ -45,7 +45,7 @@ public class PermissionServiceImpl implements PermissionService {
     /**
      * 不需要cookies
      */
-    private static final List<String> NOT_AUTH_URLS = Lists.newArrayList("/crmMarketing/queryMarketingId", "/crmMarketing/queryAddField", "/crmMarketing/saveMarketingInfo", "/adminUser/queryLoginUser", "/crmCall/upload","/adminUser/querySystemStatus","/adminUser/initUser","/crmCustomer/queryPageList");
+    private static final List<String> NOT_AUTH_URLS = Lists.newArrayList("/crmMarketing/queryMarketingId", "/crmMarketing/queryAddField", "/crmMarketing/saveMarketingInfo", "/adminUser/queryLoginUser", "/crmCall/upload","/adminUser/querySystemStatus","/adminUser/initUser","/crmCustomer/queryPageList","/openApi/crm/addCorporateSeas");
 
 
     /**

gateway/src/main/resources/bootstrap.yml

@@ -51,6 +51,7 @@ crm:
     ignoreUrl:
       - /adminSuite/dataReceive
       - /crmCustomer/queryPageList
+      - /openApi/crm/addCorporateSeas
 upgradeFile:
   #升级文件地址
   url: D:/工具/version.json