用户信息采集新增用户性别，手机号后四位，姓名

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

@@ -76,7 +76,7 @@ public class FsUserInformationCollectionController extends BaseController
     {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         fsUserInformationCollection.setCompanyUserId(loginUser.getUser().getUserId());
-        return toAjax(fsUserInformationCollectionService.insertFsUserInformationCollection(fsUserInformationCollection));
+        return AjaxResult.success(fsUserInformationCollectionService.insertFsUserInformationCollection(fsUserInformationCollection));
     }
 
     /**
@@ -89,7 +89,7 @@ public class FsUserInformationCollectionController extends BaseController
     {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         fsUserInformationCollection.setCompanyUserId(loginUser.getUser().getUserId());
-        return toAjax(fsUserInformationCollectionService.updateFsUserInformationCollection(fsUserInformationCollection));
+        return AjaxResult.success(fsUserInformationCollectionService.updateFsUserInformationCollection(fsUserInformationCollection));
     }
 
     /**

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

@@ -80,4 +80,11 @@ public class FsUserInformationCollection extends BaseEntity{
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date doctorConfirmTime;
 
+    //用户性别 0女 1男
+    private Integer sex;
+    //用户姓名
+    private String userName;
+    //用户电话后四位
+    private String userPhoneFour;
+
 }

fs-service/src/main/java/com/fs/hisStore/param/FsUserInformationCollectionParam.java

@@ -32,4 +32,11 @@ public class FsUserInformationCollectionParam {
 
     //代收金额
     private BigDecimal amount;
+
+    //用户性别 0女 1男
+    private Integer sex;
+    //用户姓名
+    private String userName;
+    //用户电话后四位
+    private String userPhoneFour;
 }

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

@@ -40,7 +40,7 @@ public interface IFsUserInformationCollectionService extends IService<FsUserInfo
      * @param fsUserInformationCollection 用户信息采集
      * @return 结果
      */
-    int insertFsUserInformationCollection(FsUserInformationCollectionParam fsUserInformationCollection);
+    Long insertFsUserInformationCollection(FsUserInformationCollectionParam fsUserInformationCollection);
 
     /**
      * 修改用户信息采集
@@ -48,7 +48,7 @@ public interface IFsUserInformationCollectionService extends IService<FsUserInfo
      * @param fsUserInformationCollection 用户信息采集
      * @return 结果
      */
-    int updateFsUserInformationCollection(FsUserInformationCollectionParam fsUserInformationCollection);
+    Long updateFsUserInformationCollection(FsUserInformationCollectionParam fsUserInformationCollection);
 
     /**
      * 批量删除用户信息采集

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

@@ -191,12 +191,13 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
      * @return 结果
      */
     @Override
-    public int insertFsUserInformationCollection(FsUserInformationCollectionParam param)
+    public Long insertFsUserInformationCollection(FsUserInformationCollectionParam param)
     {
 
         FsUserInformationCollection fsUserInformationCollection = getFsUserInformationCollection(param);
         fsUserInformationCollection.setCreateTime(DateUtils.getNowDate());
-        return baseMapper.insertFsUserInformationCollection(fsUserInformationCollection);
+        baseMapper.insertFsUserInformationCollection(fsUserInformationCollection);
+        return fsUserInformationCollection.getId();
     }
 
     /**
@@ -206,7 +207,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
      * @return 结果
      */
     @Override
-    public int updateFsUserInformationCollection(FsUserInformationCollectionParam param)
+    public Long updateFsUserInformationCollection(FsUserInformationCollectionParam param)
     {
         if (param.getId() == null || param.getId() < 1) {
             throw new CustomException("参数错误");
@@ -226,7 +227,8 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
         fsUserInformationCollection.setDoctorConfirm(0);
         fsUserInformationCollection.setStatus(1);
         fsUserInformationCollection.setUpdateTime(DateUtils.getNowDate());
-        return baseMapper.updateFsUserInformationCollection(fsUserInformationCollection);
+        baseMapper.updateFsUserInformationCollection(fsUserInformationCollection);
+        return fsUserInformationCollection.getId();
     }
 
     /**
@@ -267,6 +269,9 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
             vo.setPackageId(fsUserInformationCollection.getPackageId());
             vo.setPayType(fsUserInformationCollection.getPayType());
             vo.setIsPackage(fsUserInformationCollection.getIsPackage());
+            vo.setSex(fsUserInformationCollection.getSex());
+            vo.setUserPhoneFour(fsUserInformationCollection.getUserPhoneFour());
+            vo.setUserName(fsUserInformationCollection.getUserName());
             if (map.getQuestionId() == null) {
                 FsQuestionAndAnswerVO questionAndAnswerVO = questionAndAnswerService.selectFsQuestionAndAnswerById(fsUserInformationCollection.getQuestionId());
                 List<AnswerVO> answerVOS = JSON.parseArray(fsUserInformationCollection.getJsonInfo(), AnswerVO.class);
@@ -828,6 +833,9 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
         fsUserInformationCollection.setPayType(param.getPayType());
         fsUserInformationCollection.setAmount(param.getAmount());
         fsUserInformationCollection.setIsPackage(param.getIsPackage());
+        fsUserInformationCollection.setUserName(param.getUserName());
+        fsUserInformationCollection.setUserPhoneFour(param.getUserPhoneFour());
+        fsUserInformationCollection.setSex(param.getSex());
         //获取医生信息
         CompanyUser companyUser = companyUserMapper.selectCompanyUserById(param.getCompanyUserId());
         if (companyUser == null) {

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

@@ -28,4 +28,11 @@ public class FsUserInformationCollectionVO {
     //是否关联套餐包 0-不关联 1-关联
     private Integer isPackage;
 
+    //用户性别 0女 1男
+    private Integer sex;
+    //用户姓名
+    private String userName;
+    //用户电话后四位
+    private String userPhoneFour;
+
 }

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

@@ -25,10 +25,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="userAdvice"    column="user_advice"    />
         <result property="doctorAdvice"    column="doctor_advice"    />
         <result property="doctorConfirmTime"    column="doctor_confirm_time"    />
+        <result property="sex"    column="sex"    />
+        <result property="userName"    column="user_name"    />
+        <result property="userPhoneFour"    column="user_phone_four"    />
     </resultMap>
 
     <sql id="selectFsUserInformationCollectionVo">
-        select id, question_id, user_id, json_info, user_confirm, 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 from fs_user_information_collection
+        select id, question_id, user_id, json_info, user_confirm
+             , 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 from fs_user_information_collection
     </sql>
 
     <select id="selectFsUserInformationCollectionList" parameterType="FsUserInformationCollection" resultMap="FsUserInformationCollectionResult">
@@ -84,6 +90,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="packageOrderCode != null">package_order_code,</if>
             <if test="status != null">status,</if>
             <if test="doctorConfirmTime != null">doctor_confirm_time,</if>
+            <if test="userPhoneFour != null">user_phone_four,</if>
+            <if test="user_name != null">userName,</if>
+            <if test="sex != null">sex,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="questionId != null">#{questionId},</if>
@@ -105,6 +114,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="packageOrderCode != null">#{packageOrderCode},</if>
             <if test="status != null">#{status},</if>
             <if test="doctorConfirmTime != null">#{doctorConfirmTime},</if>
+            <if test="sex != null">#{sex},</if>
+            <if test="userName != null">#{userName},</if>
+            <if test="userPhoneFour != null">#{userPhoneFour},</if>
          </trim>
     </insert>
 
@@ -130,6 +142,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="packageOrderCode != null">package_order_code = #{packageOrderCode},</if>
             <if test="status != null">status = #{status},</if>
             <if test="doctorConfirmTime != null">doctor_confirm_time = #{doctorConfirmTime},</if>
+            <if test="sex != null">sex = #{sex},</if>
+            <if test="userName != null">user_name = #{userName},</if>
+            <if test="userPhoneFour != null">user_phone_four = #{userPhoneFour},</if>
         </trim>
         where id = #{id}
     </update>