Merge remote-tracking branch 'origin/master'

This commit is contained in:
hongchao 2025-07-03 15:30:28 +08:00
commit e7f077ba69
1 changed files with 16 additions and 17 deletions

View File

@ -453,22 +453,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!-- from `micro-tool`.bzgl_bz bzgl_bz--> <!-- from `micro-tool`.bzgl_bz bzgl_bz-->
<!-- left join `uni_org`.org_user org_user on bzgl_bz.bzz_idcard = org_user.id_card--> <!-- left join `uni_org`.org_user org_user on bzgl_bz.bzz_idcard = org_user.id_card-->
<!-- WHERE bzgl_bz.project_id = #{externalId}--> <!-- WHERE bzgl_bz.project_id = #{externalId}-->
<!-- </select>-->
<!-- <select id="getTeamList" resultType="com.bonus.material.common.domain.vo.SelectVo">-->
<!-- /*查询所有班组*/-->
<!-- select bzgl_bz.id,-->
<!-- bzgl_bz.bzmc as name,-->
<!-- bzgl_bz.bzz_name as teamLeaderName,-->
<!-- bzgl_bz.bzz_idcard as teamLeaderIdCard,-->
<!-- bzgl_bz.bz as remark,-->
<!-- bzgl_bz.bz_status as teamStatus,-->
<!-- bzgl_bz.project_id as projectId,-->
<!-- bzgl_bz.project_name as projectName-->
<!-- from `micro-tool`.bzgl_bz bzgl_bz-->
<!-- </select>--> <!-- </select>-->
<select id="getTeamList" resultType="com.bonus.material.common.domain.vo.SelectVo"> <select id="getTeamList" resultType="com.bonus.material.common.domain.vo.SelectVo">
SELECT id, select bzgl_bz.id,
team_name as `name` bzgl_bz.bzmc as name,
FROM `lease_team_info` bzgl_bz.bzz_name as teamLeaderName,
bzgl_bz.bzz_idcard as teamLeaderIdCard,
bzgl_bz.bz as remark,
bzgl_bz.bz_status as teamStatus,
bzgl_bz.project_id as projectId,
bzgl_bz.project_name as projectName
from `micro-tool`.bzgl_bz bzgl_bz
</select> </select>
<!-- <select id="getTeamList" resultType="com.bonus.material.common.domain.vo.SelectVo">-->
<!-- SELECT id,-->
<!-- team_name as `name`-->
<!-- FROM `lease_team_info`-->
<!-- </select>-->
</mapper> </mapper>