|
|
@@ -35,7 +35,6 @@
|
|
|
<result property="expenseSuperExamine" column="expense_super_examine" jdbcType="INTEGER"/>
|
|
|
<result property="publicCarbonCopy" column="public_carbon_copy" jdbcType="VARCHAR"/>
|
|
|
<result property="callNo" column="call_no" jdbcType="VARCHAR"/>
|
|
|
- <result property="teamId" column="team_id" jdbcType="INTEGER"/>
|
|
|
</resultMap>
|
|
|
|
|
|
<sql id="AdminAllSql">
|
|
|
@@ -52,12 +51,12 @@
|
|
|
|
|
|
<!--新增所有列-->
|
|
|
<insert id="insert" keyProperty="id" useGeneratedKeys="true">
|
|
|
- insert into admin(mobile, name, password, email, create_time, number, province, position, superior_id, city,
|
|
|
+ insert into admin(id,mobile, name, password, email, create_time, number, province, position, superior_id, city,
|
|
|
department_id, status, user_no, duty, district, head_portrait_url, contact_mobile,
|
|
|
last_login_time, open_id, type, reviewer, amb_id, amb_role, amb_manage, manager_id,
|
|
|
senior_staff, public_purview, expense_open_id, expense_super_examine, public_carbon_copy,
|
|
|
call_no, team_id)
|
|
|
- values (#{mobile}, #{name}, #{password}, #{email}, #{createTime}, #{number}, #{province}, #{position},
|
|
|
+ values (#{id},#{mobile}, #{name}, #{password}, #{email}, #{createTime}, #{number}, #{province}, #{position},
|
|
|
#{superiorId}, #{city}, #{departmentId}, #{status}, #{userNo}, #{duty}, #{district}, #{headPortraitUrl},
|
|
|
#{contactMobile}, #{lastLoginTime}, #{openId}, #{type}, #{reviewer}, #{ambId}, #{ambRole}, #{ambManage},
|
|
|
#{managerId}, #{seniorStaff}, #{publicPurview}, #{expenseOpenId}, #{expenseSuperExamine},
|
|
|
@@ -94,7 +93,7 @@
|
|
|
#{entity.headPortraitUrl}, #{entity.contactMobile}, #{entity.lastLoginTime}, #{entity.openId},
|
|
|
#{entity.type}, #{entity.reviewer}, #{entity.ambId}, #{entity.ambRole}, #{entity.ambManage},
|
|
|
#{entity.managerId}, #{entity.seniorStaff}, #{entity.publicPurview}, #{entity.expenseOpenId},
|
|
|
- #{entity.expenseSuperExamine}, #{entity.publicCarbonCopy}, #{entity.callNo}, #{entity.teamId})
|
|
|
+ #{entity.expenseSuperExamine}, #{entity.publicCarbonCopy}, #{entity.callNo})
|
|
|
</foreach>
|
|
|
on duplicate key update
|
|
|
mobile = values(mobile),
|
|
|
@@ -487,14 +486,13 @@
|
|
|
<!--*************************************************************************-->
|
|
|
<select id="selectAdminListByPage" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.AdminListBo">
|
|
|
select a.id, a.mobile, a.name, a.position, a.email, a.province, a.city, a.create_time as createTime, aa.name as superior,dep.name departmentName,
|
|
|
- a.superior_id as superiorId, a.department_id as departmentId, a.last_login_time as lastLoginTime, a.contact_mobile as contactMobile,st.name teamName,a.team_id teamId,
|
|
|
+ a.superior_id as superiorId, a.department_id as departmentId, a.last_login_time as lastLoginTime, a.contact_mobile as contactMobile,
|
|
|
a.duty,a.status, a.type, ambs.id ambId,ambs.name ambName,ambs.ancestors_names ancestorsNames ,a.amb_role ambRole,a.senior_staff seniorStaff,a.public_purview publicPurview
|
|
|
from admin a
|
|
|
left join admin_location al on a.id = al.admin_id
|
|
|
left join admin aa on aa.id = a.superior_id
|
|
|
left join amb_system ambs on a.amb_id=ambs.id
|
|
|
left join department dep on a.department_id = dep.id
|
|
|
- left join sales_team st on a.team_id=st.id
|
|
|
<if test="rid != null">
|
|
|
RIGHT join (select uid from user_role where rid=#{rid,jdbcType=VARCHAR}) ur on a.id=ur.uid
|
|
|
</if>
|
|
|
@@ -528,9 +526,6 @@
|
|
|
<if test="ambId != null">
|
|
|
and a.amb_id = #{ambId}
|
|
|
</if>
|
|
|
- <if test="teamId !=null">
|
|
|
- and a.team_id=#{teamId}
|
|
|
- </if>
|
|
|
<if test="seniorStaff != null">
|
|
|
and a.senior_staff = #{seniorStaff}
|
|
|
</if>
|
|
|
@@ -588,9 +583,6 @@
|
|
|
<if test="ambId != null">
|
|
|
and a.amb_id = #{ambId}
|
|
|
</if>
|
|
|
- <if test="teamId !=null">
|
|
|
- and a.team_id= #{teamId}
|
|
|
- </if>
|
|
|
<if test="seniorStaff != null">
|
|
|
and a.senior_staff = #{seniorStaff}
|
|
|
</if>
|
|
|
@@ -642,10 +634,9 @@
|
|
|
a.department_id as departmentId, a.status,a.user_no as userNo,a.duty,a.district,a.expense_super_examine expenseSuperExamine,
|
|
|
a.head_portrait_url as headPortraitUrl, a.contact_mobile as contactMobile,a.senior_staff seniorStaff,
|
|
|
b.name superior,c.name reviewerName,a.type,a.amb_id ambId,a.manager_id managerId ,d.name managerName,
|
|
|
- a.public_carbon_copy publicCarbonCopy,e.name publicCarbonCopyName,a.team_id teamId,st.name teamName
|
|
|
+ a.public_carbon_copy publicCarbonCopy,e.name publicCarbonCopyName
|
|
|
from admin a left join admin b on a.superior_id =b.id left join admin c on a.reviewer =c.id
|
|
|
left join admin d on a.manager_id=d.id left join admin e on a.public_carbon_copy=e.id
|
|
|
- left join sales_team st on a.team_id=st.id
|
|
|
where a.id= #{id,jdbcType=VARCHAR}
|
|
|
</select>
|
|
|
<select id="selectNameByid" parameterType="java.lang.String" resultType="java.lang.String">
|
|
|
@@ -1320,11 +1311,5 @@
|
|
|
from admin
|
|
|
where call_no = #{callStaffNo}
|
|
|
</select>
|
|
|
- <select id="queryByTeamId" resultMap="AdminMap">
|
|
|
- select
|
|
|
- <include refid="AdminAllSql"/>
|
|
|
- from admin
|
|
|
- where team_id = #{teamId}
|
|
|
- </select>
|
|
|
</mapper>
|
|
|
|