新增简化版信息采集表功能

fs-company/src/main/java/com/fs/hisStore/controller/FsUserInformationCollectionController.java

@@ -93,6 +93,18 @@ public class FsUserInformationCollectionController extends BaseController
         return AjaxResult.success(fsUserInformationCollectionService.updateFsUserInformationCollection(fsUserInformationCollection));
     }
 
+    /**
+     * 新增简化版用户信息采集(临时无userId)
+     */
+    @Log(title = "新增简化版用户信息采集(临时无userId)", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult createSimpleUserInfo(@RequestBody FsUserInformationCollectionParam fsUserInformationCollection)
+    {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        fsUserInformationCollection.setCompanyUserId(loginUser.getUser().getUserId());
+        return AjaxResult.success(fsUserInformationCollectionService.createSimpleUserInfo(fsUserInformationCollection));
+    }
+
     /**
      * 删除用户信息采集
      */

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

@@ -108,4 +108,8 @@ public class FsUserInformationCollection extends BaseEntity{
      * */
     private Long thirdPartyUserId;
 
+    /**
+     * 填表标识 0-未填写 1-已填写
+     * */
+    private int fillFlag;
 }

fs-service/src/main/java/com/fs/hisStore/mapper/FsUserInformationCollectionMapper.java

@@ -97,7 +97,7 @@ public interface FsUserInformationCollectionMapper extends BaseMapper<FsUserInfo
     /**
      * 根据fs_user_id集合批量查询用户信息采集
      * */
-    List<FsUserInformationCollection> selectFsUserInformationCollectionListByUserIds(List<Long> fsUserIds);
+    List<FsUserInformationCollection> selectFsUserInformationCollectionListByUserIds(@Param("fsUserIds")List<Long> fsUserIds);
 
     /**
      * 修复手机号码和性别数据存储问题

fs-service/src/main/java/com/fs/hisStore/service/IFsUserInformationCollectionService.java

@@ -53,6 +53,13 @@ public interface IFsUserInformationCollectionService extends IService<FsUserInfo
      */
     Long updateFsUserInformationCollection(FsUserInformationCollectionParam fsUserInformationCollection);
 
+    /**
+     * 创建简化版用户采集信息
+     *
+     * @param fsUserInformationCollection 用户信息采集
+     * @return 用户信息采集集合
+     */
+    String createSimpleUserInfo(FsUserInformationCollectionParam fsUserInformationCollection);
     /**
      * 批量删除用户信息采集
      * 

fs-service/src/main/java/com/fs/hisStore/service/impl/FsUserInformationCollectionServiceImpl.java

@@ -323,6 +323,12 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
         return fsUserInformationCollection.getId();
     }
 
+
+    @Override
+    public String createSimpleUserInfo(FsUserInformationCollectionParam fsUserInformationCollection) {
+        return "";
+    }
+
     /**
      * 批量删除用户信息采集
      *

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

@@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="age"    column="age"    />
         <result property="infoSource"    column="info_source"    />
         <result property="thirdPartyUserId"    column="third_party_user_id"    />
+        <result property="fillFlag"    column="fill_flag"    />
     </resultMap>
 
     <!-- 用户信息采集视图对象类的ResultMap -->
@@ -58,7 +59,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  from fs_user_information_collection
+             ,allergy,remark,age,info_source,third_party_user_id,fill_flag  from fs_user_information_collection
     </sql>
 
     <select id="selectFsUserInformationCollectionList" parameterType="FsUserInformationCollection" resultMap="FsUserInformationCollectionResult">
@@ -72,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="packageOrderCode != null "> and package_order_code = #{packageOrderCode}</if>
             <if test="infoSource != null "> and info_source = #{infoSource}</if>
             <if test="thirdPartyUserId != null "> and third_party_user_id = #{thirdPartyUserId}</if>
+            <if test="fillFlag != null "> and fill_flag = #{fillFlag}</if>
         </where>
     </select>
     
@@ -100,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             resultMap="FsUserInformationCollectionResult">
         <include refid="selectFsUserInformationCollectionVo"/>
         WHERE user_id IN
-        <foreach collection="list" item="userId" open="(" separator="," close=")">
+        <foreach collection="fsUserIds" item="userId" open="(" separator="," close=")">
             #{userId}
         </foreach>
     </select>
@@ -177,6 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="age != null">age,</if>
             <if test="infoSource != null">info_source,</if>
             <if test="thirdPartyUserId != null">third_party_user_id,</if>
+            <if test="fillFlag != null">fill_flag,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="questionId != null">#{questionId},</if>
@@ -206,6 +209,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="age != null">#{age},</if>
             <if test="infoSource != null">#{infoSource},</if>
             <if test="thirdPartyUserId != null">#{thirdPartyUserId},</if>
+            <if test="fillFlag != null">#{fillFlag},</if>
          </trim>
     </insert>
 
@@ -239,6 +243,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="age != null">age = #{age},</if>
             <if test="infoSource != null">info_source = #{infoSource},</if>
             <if test="thirdPartyUserId != null">third_party_user_id = #{thirdPartyUserId},</if>
+            <if test="fillFlag != null">fill_flag = #{fillFlag},</if>
         </trim>
         where id = #{id}
     </update>