导入会员--新增呼叫状态 销售id 销售公司id

fs-service/src/main/java/com/fs/his/domain/FsImportMember.java

@@ -53,5 +53,12 @@ public class FsImportMember{
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 
+    /** 呼叫状态 0-未呼叫 1-已呼叫 */
+    private Integer callStatus;
 
+    /** 公司id */
+    private Long companyId;
+
+    /** 公司用户id */
+    private Long companyUserId;
 }

fs-service/src/main/java/com/fs/his/listenner/MemberImportListener.java

@@ -7,9 +7,7 @@ import com.fs.his.dto.MemberExcelDTO;
 import com.fs.his.service.IFsImportMemberService;
 import com.google.common.collect.Maps;
 import org.apache.commons.lang3.StringUtils;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.BeansException;
 import org.springframework.dao.DuplicateKeyException;
 
 import java.util.ArrayList;

fs-service/src/main/resources/mapper/his/FsImportMemberMapper.xml

@@ -12,10 +12,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status"    column="status"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="callStatus"    column="call_status"    />
+        <result property="companyUserId"    column="company_user_id"    />
+        <result property="companyId"    column="company_id"    />
     </resultMap>
 
     <sql id="selectFsImportMemberVo">
-        select id, member_name, address, member_phone, status, create_time, update_time from fs_import_member
+        select id, member_name, address, member_phone, status, create_time, update_time, call_status, company_user_id, company_id from fs_import_member
     </sql>
 
     <select id="selectFsImportMemberList" parameterType="FsImportMember" resultMap="FsImportMemberResult">
@@ -42,6 +45,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null">status,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="callStatus != null">call_status,</if>
+            <if test="companyUserId != null">company_user_id,</if>
+            <if test="companyId != null">company_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="memberName != null">#{memberName},</if>
@@ -50,6 +56,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null">#{status},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="callStatus != null">#{callStatus},</if>
+            <if test="companyUserId != null">#{companyUserId},</if>
+            <if test="companyId != null">#{companyId},</if>
          </trim>
     </insert>
 
@@ -62,6 +71,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null">status = #{status},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="callStatus != null">call_status = #{callStatus},</if>
+            <if test="companyUserId != null">company_user_id = #{companyUserId},</if>
+            <if test="companyId != null">company_id = #{companyId},</if>
         </trim>
         where id = #{id}
     </update>