bug修改
This commit is contained in:
parent
a8970bb5c5
commit
118b059a19
|
|
@ -138,5 +138,19 @@ public interface TbTeamMapper {
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Long selectByDevId(Long id);
|
Long selectByDevId(Long id);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据id查询班组信息
|
||||||
|
* @param id
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
TbTeam selectById(Long id);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据班组长id修改班组信息
|
||||||
|
* @param id
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
int editPeople(Long id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,9 @@ import com.bonus.base.config.Constants;
|
||||||
import com.bonus.base.config.ExceptionEnum;
|
import com.bonus.base.config.ExceptionEnum;
|
||||||
import com.bonus.base.domain.TbPeople;
|
import com.bonus.base.domain.TbPeople;
|
||||||
import com.bonus.base.domain.TbPeopleDto;
|
import com.bonus.base.domain.TbPeopleDto;
|
||||||
|
import com.bonus.base.domain.TbTeam;
|
||||||
import com.bonus.base.mapper.TbPeopleMapper;
|
import com.bonus.base.mapper.TbPeopleMapper;
|
||||||
|
import com.bonus.base.mapper.TbTeamMapper;
|
||||||
import com.bonus.base.service.TbPeopleService;
|
import com.bonus.base.service.TbPeopleService;
|
||||||
import com.bonus.common.core.utils.StringUtils;
|
import com.bonus.common.core.utils.StringUtils;
|
||||||
import com.bonus.common.core.utils.encryption.Sm4Utils;
|
import com.bonus.common.core.utils.encryption.Sm4Utils;
|
||||||
|
|
@ -55,6 +57,9 @@ public class TbPeopleServiceImpl implements TbPeopleService {
|
||||||
@Resource
|
@Resource
|
||||||
private TbPeopleMapper tbPeopleDao;
|
private TbPeopleMapper tbPeopleDao;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private TbTeamMapper tbTeamDao;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通过ID查询单条数据
|
* 通过ID查询单条数据
|
||||||
*
|
*
|
||||||
|
|
@ -164,6 +169,11 @@ public class TbPeopleServiceImpl implements TbPeopleService {
|
||||||
tbPeople.setUpdateUser(SecurityUtils.getUserId());
|
tbPeople.setUpdateUser(SecurityUtils.getUserId());
|
||||||
tbPeople.setRelPhone(Sm4Utils.encode(tbPeople.getRelPhone()));
|
tbPeople.setRelPhone(Sm4Utils.encode(tbPeople.getRelPhone()));
|
||||||
int result = tbPeopleDao.update(tbPeople);
|
int result = tbPeopleDao.update(tbPeople);
|
||||||
|
//根据人员id去班组表中修改人员信息,先根据人员id去班组表中查询
|
||||||
|
TbTeam tbTeam = tbTeamDao.selectById(tbPeople.getId());
|
||||||
|
if (tbTeam != null) {
|
||||||
|
result += tbTeamDao.editPeople(tbPeople.getId());
|
||||||
|
}
|
||||||
if (result > 0) {
|
if (result > 0) {
|
||||||
return AjaxResult.success(ExceptionEnum.SUCCESS.getMsg(), result);
|
return AjaxResult.success(ExceptionEnum.SUCCESS.getMsg(), result);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -241,6 +241,23 @@
|
||||||
WHERE id = #{id}
|
WHERE id = #{id}
|
||||||
</update>
|
</update>
|
||||||
|
|
||||||
|
<update id="editPeople">
|
||||||
|
update tb_team
|
||||||
|
<set>
|
||||||
|
<if test="relName != null and relName != ''">
|
||||||
|
rel_name = #{relName},
|
||||||
|
</if>
|
||||||
|
<if test="relPhone != null and relPhone != ''">
|
||||||
|
rel_phone = #{relPhone},
|
||||||
|
</if>
|
||||||
|
update_time = NOW(),
|
||||||
|
<if test="updateUser != null">
|
||||||
|
update_user = #{updateUser},
|
||||||
|
</if>
|
||||||
|
</set>
|
||||||
|
where rel_id = #{id}
|
||||||
|
</update>
|
||||||
|
|
||||||
<select id="getTeamJoinPersonListByProId" resultType="com.bonus.screen.vo.TeamJoinPersonVo">
|
<select id="getTeamJoinPersonListByProId" resultType="com.bonus.screen.vo.TeamJoinPersonVo">
|
||||||
SELECT
|
SELECT
|
||||||
t.id AS teamId, t.team_name AS teamName, p.id AS peopleId, p.rel_name AS peopleName, p.rel_phone as peoplePhone
|
t.id AS teamId, t.team_name AS teamName, p.id AS peopleId, p.rel_name AS peopleName, p.rel_phone as peoplePhone
|
||||||
|
|
@ -267,5 +284,23 @@
|
||||||
tt.id = #{id}
|
tt.id = #{id}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="selectById" resultType="com.bonus.base.domain.TbTeam">
|
||||||
|
select id as id,
|
||||||
|
team_name as teamName,
|
||||||
|
rel_id as relId,
|
||||||
|
rel_name as relName,
|
||||||
|
rel_phone as relPhone,
|
||||||
|
pro_id as proId,
|
||||||
|
pro_name as proName,
|
||||||
|
create_time as createTime,
|
||||||
|
create_user as createUser,
|
||||||
|
update_time as updateTime,
|
||||||
|
js_time as jsTime,
|
||||||
|
update_user as updateUser,
|
||||||
|
del_flag as delFlag
|
||||||
|
from tb_team
|
||||||
|
where rel_id = #{id}
|
||||||
|
</select>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue