销售端新增采集表个微字段

fs-service/src/main/java/com/fs/hisStore/domain/FsUserInformationCollection.java

@@ -122,4 +122,9 @@ public class FsUserInformationCollection extends BaseEntity{
      * 信息采集标识 0-企微信息采集 1-个微信息采集
      */
     private Integer qwTag;
+
+    /**
+     * 个微信息采集状态
+     * */
+    private Integer personalCollectStatus;
 }

fs-service/src/main/java/com/fs/hisStore/dto/FsUserInformationCollectionOverviewDTO.java

@@ -25,6 +25,9 @@ public class FsUserInformationCollectionOverviewDTO  extends BaseEntity {
     //完善状态 0-未完善 1-完善
     private Integer completeStatus;
 
+    //个微状态
+    private Integer personalCollectStatus;
+
     @ApiModelProperty(value = "页码,默认为1")
     private Integer pageNum =1;
 

fs-service/src/main/java/com/fs/hisStore/vo/FsUserInformationCollectionOverviewVo.java

@@ -75,6 +75,16 @@ public class FsUserInformationCollectionOverviewVo {
     @Excel(name = "处方图片URL")
     private String prescribeImgUrlString;
 
+    /**
+     * 信息采集标识 0-企微信息采集 1-个微信息采集
+     */
+    private Integer qwTag;
+
+    /**
+     * 个微信息采集状态
+     * */
+    private Integer personalCollectStatus;
+
     // 原始的List字段，用于内部处理
     private List<String> prescribeImgUrlList;
 

fs-service/src/main/resources/mapper/hisStore/FsUserInformationCollectionMapper.xml

@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fillFlag"    column="fill_flag"    />
         <result property="completeStatus"    column="complete_status"    />
         <result property="qwTag"    column="qw_tag"    />
+        <result property="personalCollectStatus"    column="personal_collect_status"    />
     </resultMap>
 
     <!-- 用户信息采集视图对象类的ResultMap -->
@@ -55,6 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
         <result property="companyUserName"    column="nick_name"    />
         <result property="doctorName"    column="doctor_name"    />
+        <result property="qwTag" column="qw_tag"/>
+        <result property="personalCollectStatus" column="personal_collect_status"/>
     </resultMap>
 
     <sql id="selectFsUserInformationCollectionVo">
@@ -62,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
              , doctor_confirm, create_time, update_time,doctor_id,company_user_id
              ,package_id,pay_type,amount,is_package,user_confirm2,package_order_code
              ,status,user_advice,doctor_advice,doctor_confirm_time,sex,user_name,user_phone_four
-             ,allergy,remark,age,info_source,third_party_user_id,fill_flag,complete_status,qw_tag  from fs_user_information_collection
+             ,allergy,remark,age,info_source,third_party_user_id,fill_flag,complete_status,qw_tag,personal_collect_status  from fs_user_information_collection
     </sql>
 
     <select id="selectFsUserInformationCollectionList" parameterType="FsUserInformationCollection" resultMap="FsUserInformationCollectionResult">
@@ -79,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fillFlag != null "> and fill_flag = #{fillFlag}</if>
             <if test="completeStatus != null "> and complete_status = #{completeStatus}</if>
             <if test="qwTag != null "> and qw_tag = #{qwTag}</if>
+            <if test="personalCollectStatus != null "> and personal_collect_status = #{personalCollectStatus}</if>
         </where>
     </select>
     
@@ -134,6 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         infocollect.allergy,
         infocollect.remark,
         infocollect.qw_tag,
+        infocollect.personal_collect_status,
         cu.nick_name,
         fd.doctor_name
         FROM fs_user_information_collection infocollect
@@ -150,6 +155,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="completeStatus != null">
                 AND infocollect.complete_status = #{completeStatus}
             </if>
+            <if test="personalCollectStatus != null">
+                AND infocollect.personal_collect_status = #{personalCollectStatus}
+            </if>
             <if test="userName != null and userName != ''">
                 AND infocollect.user_name LIKE CONCAT('%', #{userName}, '%')
             </if>
@@ -177,6 +185,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         infocollect.allergy,
         infocollect.remark,
         infocollect.qw_tag,
+        infocollect.personal_collect_status,
         cu.nick_name,
         fd.doctor_name
         FROM fs_user_information_collection infocollect
@@ -209,6 +218,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         infocollect.user_phone_four,
         infocollect.allergy,
         infocollect.remark,
+        infocollect.personal_collect_status,
         cu.nick_name,
         fd.doctor_name
         FROM fs_user_information_collection infocollect
@@ -262,6 +272,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fillFlag != null">fill_flag,</if>
             <if test="completeStatus != null">complete_status,</if>
             <if test="qwTag != null">qw_tag,</if>
+            <if test="personalCollectStatus != null">personal_collect_status,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="questionId != null">#{questionId},</if>
@@ -294,6 +305,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fillFlag != null">#{fillFlag},</if>
             <if test="completeStatus != null">#{completeStatus},</if>
             <if test="qwTag != null">#{qwTag},</if>
+            <if test="personalCollectStatus != null">#{personalCollectStatus},</if>
         </trim>
     </insert>
 
@@ -330,6 +342,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fillFlag != null">fill_flag = #{fillFlag},</if>
             <if test="completeStatus != null">complete_status = #{completeStatus},</if>
             <if test="qwTag != null">qw_tag = #{qwTag},</if>
+            <if test="personalCollectStatus != null">personal_collect_status = #{personalCollectStatus},</if>
         </trim>
         where id = #{id}
     </update>