Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
P
pica-cloud-account
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
1
合并请求
1
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
Close sidebar
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
com.pica.cloud.account
pica-cloud-account
提交
2d4a65a6
提交
2d4a65a6
编写于
11月 01, 2023
作者:
wangxinxu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
更新行政职称
上级
e65e006a
流水线
#53799
已失败 于阶段
变更
4
流水线
1
显示空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
56 行增加
和
0 行删除
+56
-0
Account.java
...com/pica/cloud/account/account/server/entity/Account.java
+22
-0
HospitalSaasUserReq.java
...cloud/account/account/server/req/HospitalSaasUserReq.java
+6
-0
HospitalSaasUserServiceImpl.java
...ount/server/service/impl/HospitalSaasUserServiceImpl.java
+10
-0
AccountMapper.xml
server/src/main/resources/mybatis/AccountMapper.xml
+18
-0
未找到文件。
server/src/main/java/com/pica/cloud/account/account/server/entity/Account.java
浏览文件 @
2d4a65a6
...
@@ -97,6 +97,28 @@ public class Account {
...
@@ -97,6 +97,28 @@ public class Account {
@ApiModelProperty
(
"乡镇名称"
)
@ApiModelProperty
(
"乡镇名称"
)
private
String
townName
;
private
String
townName
;
@ApiModelProperty
(
"行政职称 ID"
)
private
Integer
administerTitleId
;
@ApiModelProperty
(
"行政职称 名称"
)
private
String
administerTitleName
;
public
Integer
getAdministerTitleId
()
{
return
administerTitleId
;
}
public
void
setAdministerTitleId
(
Integer
administerTitleId
)
{
this
.
administerTitleId
=
administerTitleId
;
}
public
String
getAdministerTitleName
()
{
return
administerTitleName
;
}
public
void
setAdministerTitleName
(
String
administerTitleName
)
{
this
.
administerTitleName
=
administerTitleName
;
}
public
Long
getProvince
()
{
public
Long
getProvince
()
{
return
province
;
return
province
;
}
}
...
...
server/src/main/java/com/pica/cloud/account/account/server/req/HospitalSaasUserReq.java
浏览文件 @
2d4a65a6
...
@@ -56,6 +56,12 @@ public class HospitalSaasUserReq {
...
@@ -56,6 +56,12 @@ public class HospitalSaasUserReq {
@ApiModelProperty
(
"登录来源 0:运营平台 1:saas"
)
@ApiModelProperty
(
"登录来源 0:运营平台 1:saas"
)
private
Integer
loginFlag
=
0
;
private
Integer
loginFlag
=
0
;
@ApiModelProperty
(
"行政职称 ID"
)
private
Integer
administerTitleId
;
@ApiModelProperty
(
"行政职称 名称"
)
private
String
administerTitleName
;
public
void
checkInsertParams
()
{
public
void
checkInsertParams
()
{
if
(
StringUtils
.
isBlank
(
this
.
mobile
))
{
if
(
StringUtils
.
isBlank
(
this
.
mobile
))
{
throw
new
PicaWarnException
(
AccountExceptionEnum
.
PICA_NOT_EMPTY
.
getCode
(),
"手机号不能为空"
);
throw
new
PicaWarnException
(
AccountExceptionEnum
.
PICA_NOT_EMPTY
.
getCode
(),
"手机号不能为空"
);
...
...
server/src/main/java/com/pica/cloud/account/account/server/service/impl/HospitalSaasUserServiceImpl.java
浏览文件 @
2d4a65a6
...
@@ -175,6 +175,8 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
...
@@ -175,6 +175,8 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
}
}
if
(
updateNameOrPwd
)
{
if
(
updateNameOrPwd
)
{
account
.
setId
(
byMobilePhone
.
getId
());
account
.
setId
(
byMobilePhone
.
getId
());
account
.
setAdministerTitleId
(
req
.
getAdministerTitleId
());
account
.
setAdministerTitleName
(
req
.
getAdministerTitleName
());
account
.
setModifyId
(
picaUser
.
getId
().
longValue
());
account
.
setModifyId
(
picaUser
.
getId
().
longValue
());
account
.
setModifyTime
(
new
Date
());
account
.
setModifyTime
(
new
Date
());
accountMapper
.
updateByIdSelective
(
account
);
accountMapper
.
updateByIdSelective
(
account
);
...
@@ -316,6 +318,12 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
...
@@ -316,6 +318,12 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
if
(
StringUtil
.
isNotNull
(
req
.
getName
()))
{
if
(
StringUtil
.
isNotNull
(
req
.
getName
()))
{
account
.
setName
(
req
.
getName
());
account
.
setName
(
req
.
getName
());
}
}
if
(
StringUtil
.
isNotNull
(
req
.
getAdministerTitleId
()))
{
account
.
setAdministerTitleId
(
req
.
getAdministerTitleId
());
}
if
(
StringUtil
.
isNotNull
(
req
.
getAdministerTitleName
()))
{
account
.
setAdministerTitleName
(
req
.
getAdministerTitleName
());
}
accountService
.
updateAccountById
(
account
);
accountService
.
updateAccountById
(
account
);
/** 修改密码 */
/** 修改密码 */
...
@@ -485,6 +493,8 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
...
@@ -485,6 +493,8 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
account
.
setFirstLoginTime
(
currentTime
);
account
.
setFirstLoginTime
(
currentTime
);
account
.
setLastLoginTime
(
currentTime
);
account
.
setLastLoginTime
(
currentTime
);
account
.
setRegisterSource
(
sourceType
);
account
.
setRegisterSource
(
sourceType
);
account
.
setAdministerTitleId
(
hospitalSaasUserReq
.
getAdministerTitleId
());
account
.
setAdministerTitleName
(
hospitalSaasUserReq
.
getAdministerTitleName
());
return
account
;
return
account
;
}
}
...
...
server/src/main/resources/mybatis/AccountMapper.xml
浏览文件 @
2d4a65a6
...
@@ -162,6 +162,12 @@
...
@@ -162,6 +162,12 @@
<if
test=
"townName != null"
>
<if
test=
"townName != null"
>
town_name,
town_name,
</if>
</if>
<if
test=
"administerTitleId != null"
>
administer_title_id,
</if>
<if
test=
"administerTitleName != null"
>
administer_title,
</if>
</trim>
</trim>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"sex != null"
>
<if
test=
"sex != null"
>
...
@@ -272,6 +278,12 @@
...
@@ -272,6 +278,12 @@
<if
test=
"townName != null"
>
<if
test=
"townName != null"
>
#{townName},
#{townName},
</if>
</if>
<if
test=
"administerTitleId != null"
>
#{administerTitleId},
</if>
<if
test=
"administerTitleName != null"
>
#{administerTitleName},
</if>
</trim>
</trim>
</insert>
</insert>
<update
id=
"updateByIdSelective"
parameterType=
"com.pica.cloud.account.account.server.entity.Account"
>
<update
id=
"updateByIdSelective"
parameterType=
"com.pica.cloud.account.account.server.entity.Account"
>
...
@@ -373,6 +385,12 @@
...
@@ -373,6 +385,12 @@
<if
test=
"acctId != null"
>
<if
test=
"acctId != null"
>
acct_id = #{acctId,jdbcType=INTEGER},
acct_id = #{acctId,jdbcType=INTEGER},
</if>
</if>
<if
test=
"administerTitleId != null"
>
administer_title_id = #{administerTitleId,jdbcType=INTEGER},
</if>
<if
test=
"administerTitleName != null"
>
administer_title = #{administerTitleName},
</if>
</set>
</set>
where id = #{id,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER}
</update>
</update>
...
...
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录