Merge branch 'dev-wechat-0105' into 'release'

Dev wechat 0105

See merge request !140

server/src/main/java/com/pica/cloud/account/account/server/entity/Account.java

@@ -103,6 +103,18 @@ public class Account {
     @ApiModelProperty("行政职称 名称")
     private String administerTitleName;
 
+
+    @ApiModelProperty("微信号")
+    private String wechatCode;
+
+    public String getWechatCode() {
+        return wechatCode;
+    }
+
+    public void setWechatCode(String wechatCode) {
+        this.wechatCode = wechatCode;
+    }
+
     public Integer getAdministerTitleId() {
         return administerTitleId;
     }

server/src/main/java/com/pica/cloud/account/account/server/req/HospitalSaasUserReq.java

@@ -62,6 +62,9 @@ public class HospitalSaasUserReq {
     @ApiModelProperty("行政职称 名称")
     private String administerTitleName;
 
+    @ApiModelProperty("微信号")
+    private String wechatCode;
+
     public void checkInsertParams() {
         if (StringUtils.isBlank(this.mobile)) {
             throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "手机号不能为空");

server/src/main/java/com/pica/cloud/account/account/server/resp/HospitalSaasUserDto.java

@@ -44,4 +44,7 @@ public class HospitalSaasUserDto {
     @ApiModelProperty("行政职称 名称")
     private String administerTitleName;
 
+    @ApiModelProperty("微信号")
+    private String wechatCode;
+
 }

server/src/main/java/com/pica/cloud/account/account/server/resp/HospitalSaasUserEditResp.java

@@ -32,4 +32,14 @@ public class HospitalSaasUserEditResp {
     private Integer  acctId;
 
     private Integer  status;
+
+
+    @ApiModelProperty("行政职称 ID")
+    private Integer administerTitleId;
+
+    @ApiModelProperty("行政职称 名称")
+    private String administerTitleName;
+
+    @ApiModelProperty("微信号")
+    private String wechatCode;
 }

server/src/main/java/com/pica/cloud/account/account/server/service/impl/HospitalSaasUserServiceImpl.java

@@ -324,6 +324,7 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
         if (StringUtil.isNotNull(req.getAdministerTitleName())) {
             account.setAdministerTitleName(req.getAdministerTitleName());
         }
+        account.setWechatCode(req.getWechatCode());
         accountService.updateAccountById(account);
 
         /** 修改密码 */
@@ -495,6 +496,7 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
         account.setRegisterSource(sourceType);
         account.setAdministerTitleId(hospitalSaasUserReq.getAdministerTitleId());
         account.setAdministerTitleName(hospitalSaasUserReq.getAdministerTitleName());
+        account.setWechatCode(hospitalSaasUserReq.getWechatCode());
         return account;
     }
 

server/src/main/resources/mybatis/AccountMapper.xml

@@ -168,6 +168,9 @@
             <if test="administerTitleName != null">
                 administer_title,
             </if>
+            <if test="wechatCode != null">
+                wechat_code,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sex != null">
@@ -284,6 +287,9 @@
             <if test="administerTitleName != null">
                 #{administerTitleName},
             </if>
+            <if test="wechatCode != null">
+                #{wechatCode},
+            </if>
         </trim>
     </insert>
     <update id="updateByIdSelective" parameterType="com.pica.cloud.account.account.server.entity.Account">
@@ -391,6 +397,7 @@
             <if test="administerTitleName != null">
                 administer_title = #{administerTitleName},
             </if>
+                wechat_code = #{wechatCode}
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
@@ -455,7 +462,8 @@
         p.comment as comment,
         p.status,
         p.administer_title_id as administerTitleId,
-        p.administer_title as administerTitleName
+        p.administer_title as administerTitleName,
+        p.wechat_code as wechatCode
         from p_doctor as p
         where
         <include refid="select_list_page"></include>
@@ -471,7 +479,10 @@
                p.comment      as comment,
                p.password     as password,
                p.acct_id      as  acctId,
-               p.status      as  status
+               p.status      as  status,
+               p.administer_title_id as administerTitleId,
+               p.administer_title as administerTitleName,
+               p.wechat_code as wechatCode
         from p_doctor as p
         where p.id = #{id, jdbcType=INTEGER}
           and p.delete_flag = 1