Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
cms
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
iuav
cms
Commits
e1ce9da7
提交
e1ce9da7
authored
12月 29, 2023
作者:
刘明祎-运维用途
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
返回用户对应的后台id
上级
bb9f27b0
流水线
#7776
已通过 于阶段
in 2 分 22 秒
变更
5
流水线
1
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
19 行增加
和
5 行删除
+19
-5
UserAccountVO.java
...c/main/java/com/mmc/iuav/user/model/vo/UserAccountVO.java
+2
-1
PilotCertificationDao.java
...m/mmc/iuav/user/dao/dronepilot/PilotCertificationDao.java
+6
-0
PilotCertificationServiceImpl.java
...ervice/dronepilot/impl/PilotCertificationServiceImpl.java
+1
-0
UserAccountServiceImpl.java
...om/mmc/iuav/user/service/impl/UserAccountServiceImpl.java
+1
-0
PilotCertificationDao.xml
...ain/resources/mapper/dronepilot/PilotCertificationDao.xml
+9
-4
没有找到文件。
cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/UserAccountVO.java
浏览文件 @
e1ce9da7
...
@@ -93,6 +93,7 @@ public class UserAccountVO implements Serializable {
...
@@ -93,6 +93,7 @@ public class UserAccountVO implements Serializable {
@ApiModelProperty
(
value
=
"飞手所属的飞手团队信息"
)
@ApiModelProperty
(
value
=
"飞手所属的飞手团队信息"
)
private
CompanyInfoVO
companyInfoVO
;
private
CompanyInfoVO
companyInfoVO
;
@ApiModelProperty
(
value
=
"用户对应的后台用户id"
)
private
Integer
backUserId
;
}
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/dronepilot/PilotCertificationDao.java
浏览文件 @
e1ce9da7
...
@@ -150,6 +150,12 @@ public interface PilotCertificationDao {
...
@@ -150,6 +150,12 @@ public interface PilotCertificationDao {
/**
/**
* 根据小程序的用户id查找对应的后台id
* @param userId
* @return {@link Integer}
*/
Integer
selectBackUserIdByUserId
(
Integer
userId
);
/**
* 获取审核通过飞手的电话号码
* 获取审核通过飞手的电话号码
* @param pilotId 飞手表id
* @param pilotId 飞手表id
* @return {@link String}
* @return {@link String}
...
...
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/dronepilot/impl/PilotCertificationServiceImpl.java
浏览文件 @
e1ce9da7
...
@@ -283,6 +283,7 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
...
@@ -283,6 +283,7 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
FlyingTeam
flyingTeam
=
certificationDao
.
selectCompanyNameByFlyingUserId
(
userAccountId
);
FlyingTeam
flyingTeam
=
certificationDao
.
selectCompanyNameByFlyingUserId
(
userAccountId
);
certificationDTO
.
setFlyingTeam
(
flyingTeam
.
getCompanyName
());
certificationDTO
.
setFlyingTeam
(
flyingTeam
.
getCompanyName
());
certificationDTO
.
setBackUserId
(
flyingTeam
.
getBackUserId
());
certificationDTO
.
setBackUserId
(
flyingTeam
.
getBackUserId
());
}
}
}
}
Integer
backUserId
=
param
.
getBackUserId
();
Integer
backUserId
=
param
.
getBackUserId
();
...
...
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/UserAccountServiceImpl.java
浏览文件 @
e1ce9da7
...
@@ -149,6 +149,7 @@ public class UserAccountServiceImpl implements UserAccountService {
...
@@ -149,6 +149,7 @@ public class UserAccountServiceImpl implements UserAccountService {
CompanyInfoVO
companyInfoVO
=
companyInfoDO
.
buildCompanyInfoVO
();
CompanyInfoVO
companyInfoVO
=
companyInfoDO
.
buildCompanyInfoVO
();
userAccountVO
.
setCompanyInfoVO
(
companyInfoVO
);
userAccountVO
.
setCompanyInfoVO
(
companyInfoVO
);
}
}
userAccountVO
.
setBackUserId
(
certificationDao
.
selectBackUserIdByUserId
(
userAccountId
));
return
userAccountVO
;
return
userAccountVO
;
}
}
...
...
csm-service/cms-service-user/src/main/resources/mapper/dronepilot/PilotCertificationDao.xml
浏览文件 @
e1ce9da7
...
@@ -195,9 +195,9 @@
...
@@ -195,9 +195,9 @@
<if
test=
"backUserId != null"
>
<if
test=
"backUserId != null"
>
and pjt.back_user_id = #{backUserId} and pjt.pilot_status = 1
and pjt.back_user_id = #{backUserId} and pjt.pilot_status = 1
</if>
</if>
<if
test=
"isTeam = 1"
>
<!-- <if test="isTeam = 1">--
>
and pjt.back_user_id is not null and pjt.pilot_status = 1
<!-- and pjt.back_user_id is not null and pjt.pilot_status = 1-->
</if
>
<!-- </if>--
>
order by pc.update_time desc, pc.create_time desc
order by pc.update_time desc, pc.create_time desc
limit #{pageNo}, #{pageSize}
limit #{pageNo}, #{pageSize}
</select>
</select>
...
@@ -509,7 +509,7 @@
...
@@ -509,7 +509,7 @@
<select
id=
"selectCompanyNameByFlyingUserId"
<select
id=
"selectCompanyNameByFlyingUserId"
resultType=
"com.mmc.iuav.user.model.dto.dronepilot.FlyingTeam"
>
resultType=
"com.mmc.iuav.user.model.dto.dronepilot.FlyingTeam"
>
select ci.company_name,
select ci.company_name,
cbu.back_user_account_id,
cbu.back_user_account_id
as backUserId
,
cm.user_account_id as messageId
cm.user_account_id as messageId
from company_info ci
from company_info ci
inner join company_back_user cbu on ci.id = cbu.company_info_id
inner join company_back_user cbu on ci.id = cbu.company_info_id
...
@@ -551,5 +551,10 @@
...
@@ -551,5 +551,10 @@
from user_account
from user_account
where id = #{userAccountId}
where id = #{userAccountId}
</select>
</select>
<select
id=
"selectBackUserIdByUserId"
resultType=
"java.lang.Integer"
>
select back_user_account_id from company_back_user
inner join company_member on company_member.company_info_id = company_back_user.company_info_id
where company_member.user_account_id = #{userId}
</select>
</mapper>
</mapper>
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论