This commit is contained in:
parent
1956337ff2
commit
320d660789
|
|
@ -0,0 +1,88 @@
|
|||
package com.bonus.base.basic.controller;
|
||||
|
||||
|
||||
import com.bonus.base.basic.domain.TtSysTeamReqVo;
|
||||
import com.bonus.base.basic.domain.vo.TtSysTeamVo;
|
||||
import com.bonus.base.basic.service.TtSysTeamService;
|
||||
import com.bonus.common.core.web.controller.BaseController;
|
||||
import com.bonus.common.core.web.domain.AjaxResult;
|
||||
import com.bonus.common.core.web.page.TableDataInfo;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* 班组管理
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequestMapping("/ttSysTeam")
|
||||
public class TtSysTeamController extends BaseController {
|
||||
|
||||
|
||||
@Resource
|
||||
private TtSysTeamService ttSysTeamService;
|
||||
|
||||
@ApiOperation(value = "查询班组列表")
|
||||
@PostMapping("/getTtSysTeamList")
|
||||
public TableDataInfo getTtSysTeamList(@RequestBody TtSysTeamReqVo ttSysTeamReqVo) {
|
||||
try {
|
||||
startPage();
|
||||
List<TtSysTeamVo> ttSysTeamVoList = ttSysTeamService.getTtSysTeamList(ttSysTeamReqVo);
|
||||
return getDataTable(ttSysTeamVoList);
|
||||
}catch (Exception e){
|
||||
|
||||
return getDataTableError(null);
|
||||
}
|
||||
}
|
||||
|
||||
@ApiOperation(value = "班组详情")
|
||||
@PostMapping("/getTtSysTeamById")
|
||||
public AjaxResult getTtSysTeamById(@RequestBody TtSysTeamReqVo ttSysTeamReqVo) {
|
||||
try {
|
||||
TtSysTeamVo ttSysTeamVo = ttSysTeamService.getTtSysTeamById(ttSysTeamReqVo);
|
||||
return success(ttSysTeamVo);
|
||||
}catch (Exception e){
|
||||
return error("查询失败");
|
||||
}
|
||||
}
|
||||
|
||||
@ApiOperation(value = "新增班组")
|
||||
@PostMapping("/addTtSysTeam")
|
||||
public AjaxResult addTtSysTeam(@RequestBody TtSysTeamVo ttSysTeamVo) {
|
||||
try {
|
||||
ttSysTeamService.addTtSysTeam(ttSysTeamVo);
|
||||
return success("新增班组成功");
|
||||
}catch (Exception e){
|
||||
return error("新增班组失败");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation(value = "班组修改")
|
||||
@PostMapping("/updateTtSysTeam")
|
||||
public AjaxResult updateTtSysTeam(@RequestBody TtSysTeamVo ttSysTeamVo) {
|
||||
try {
|
||||
ttSysTeamService.updateTtSysTeam(ttSysTeamVo);
|
||||
return success("修改班组成功");
|
||||
}catch (Exception e){
|
||||
return error("修改班组失败");
|
||||
}
|
||||
}
|
||||
|
||||
@ApiOperation(value = "班组解散")
|
||||
@PostMapping("/deleteTtSysTeam")
|
||||
public AjaxResult deleteTtSysTeam(@RequestBody TtSysTeamVo ttSysTeamVo) {
|
||||
try {
|
||||
ttSysTeamService.deleteTtSysTeam(ttSysTeamVo);
|
||||
return success("解散班组成功");
|
||||
}catch (Exception e){
|
||||
return error("解散班组失败");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
package com.bonus.base.basic.domain;
|
||||
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class TtSysTeamReqVo {
|
||||
|
||||
/**
|
||||
*主键
|
||||
*/
|
||||
private String id;
|
||||
|
||||
|
||||
/**
|
||||
*班组长
|
||||
*/
|
||||
private String userId;
|
||||
|
||||
/**
|
||||
*班组类型
|
||||
*/
|
||||
private String teamType;
|
||||
|
||||
/**
|
||||
*参建单位
|
||||
*/
|
||||
private String unitName;
|
||||
|
||||
/**
|
||||
* 关键字
|
||||
*/
|
||||
private String keyWord;
|
||||
}
|
||||
|
|
@ -0,0 +1,56 @@
|
|||
package com.bonus.base.basic.domain.vo;
|
||||
|
||||
import com.bonus.base.basic.domain.vo.TtSysUserVo;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class TtSysTeamVo {
|
||||
|
||||
/**
|
||||
*主键
|
||||
*/
|
||||
private String id;
|
||||
|
||||
/**
|
||||
*班组名称
|
||||
*/
|
||||
private String teamName;
|
||||
|
||||
/**
|
||||
*班组长
|
||||
*/
|
||||
private String userId;
|
||||
|
||||
/**
|
||||
*班组类型
|
||||
*/
|
||||
private String teamType;
|
||||
|
||||
/**
|
||||
*参建单位
|
||||
*/
|
||||
private String unitName;
|
||||
|
||||
/**
|
||||
*创建时间
|
||||
*/
|
||||
private String createTime;
|
||||
|
||||
/**
|
||||
*删除状态
|
||||
*/
|
||||
private Integer delFlag;
|
||||
|
||||
/**
|
||||
*备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 人员列表
|
||||
*/
|
||||
List<TtSysUserVo> ttSysUserVoList;
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,99 @@
|
|||
package com.bonus.base.basic.domain.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class TtSysUserVo {
|
||||
|
||||
/**
|
||||
*用户名称
|
||||
*/
|
||||
private String userName;
|
||||
|
||||
/**
|
||||
*手机号
|
||||
*/
|
||||
private String userPhone;
|
||||
|
||||
/**
|
||||
*身份证
|
||||
*/
|
||||
private String idCar;
|
||||
|
||||
/**
|
||||
*参建单位
|
||||
*/
|
||||
private String unitId;
|
||||
|
||||
/**
|
||||
*班组
|
||||
*/
|
||||
private String teamId;
|
||||
|
||||
/**
|
||||
*身份证照片
|
||||
*/
|
||||
private String carImage;
|
||||
|
||||
/**
|
||||
*岗位
|
||||
*/
|
||||
private String postUnit;
|
||||
|
||||
/**
|
||||
*工种
|
||||
*/
|
||||
private String workType;
|
||||
|
||||
/**
|
||||
*出生日期
|
||||
*/
|
||||
private String birthday;
|
||||
|
||||
/**
|
||||
*性别
|
||||
*/
|
||||
private String sex;
|
||||
|
||||
/**
|
||||
*民族
|
||||
*/
|
||||
private String nationality;
|
||||
|
||||
/**
|
||||
*地址
|
||||
*/
|
||||
private String address;
|
||||
|
||||
/**
|
||||
*发证机关
|
||||
*/
|
||||
private String issAuth;
|
||||
|
||||
/**
|
||||
*有效开始日期
|
||||
*/
|
||||
private String startTime;
|
||||
|
||||
/**
|
||||
*有效结束日期
|
||||
*/
|
||||
private String endTime;
|
||||
|
||||
/**
|
||||
*创建时间
|
||||
*/
|
||||
private String createTime;
|
||||
|
||||
/**
|
||||
*删除状态
|
||||
*/
|
||||
private Integer delFlag;
|
||||
|
||||
/**
|
||||
*近期照片
|
||||
*/
|
||||
private String photos;
|
||||
}
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
package com.bonus.base.basic.mapper;
|
||||
|
||||
import com.bonus.base.basic.domain.TtSysTeamReqVo;
|
||||
import com.bonus.base.basic.domain.vo.TtSysTeamVo;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface TtSysTeamMapper {
|
||||
List<TtSysTeamVo> getTtSysTeamList(TtSysTeamReqVo ttSysTeamReqVo);
|
||||
|
||||
void addTtSysTeam(TtSysTeamVo ttSysTeamVo);
|
||||
|
||||
TtSysTeamVo getTtSysTeamById(TtSysTeamReqVo ttSysTeamReqVo);
|
||||
|
||||
void updateTtSysTeam(TtSysTeamVo ttSysTeamVo);
|
||||
}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
package com.bonus.base.basic.mapper;
|
||||
|
||||
import com.bonus.base.basic.domain.vo.TtSysUserVo;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface TtSysUserMapper {
|
||||
List<TtSysUserVo> getTtSysUserVoListByTeamId(String teamId);
|
||||
|
||||
void updateTtSysUserVoByTeam(TtSysUserVo ttSysUserVo);
|
||||
|
||||
void delTtSysUserByTeam(String teamId);
|
||||
}
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
package com.bonus.base.basic.service;
|
||||
|
||||
import com.bonus.base.basic.domain.TtSysTeamReqVo;
|
||||
import com.bonus.base.basic.domain.vo.TtSysTeamVo;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface TtSysTeamService {
|
||||
List<TtSysTeamVo> getTtSysTeamList(TtSysTeamReqVo ttSysTeamReqVo);
|
||||
|
||||
void addTtSysTeam(TtSysTeamVo ttSysTeamVo);
|
||||
|
||||
TtSysTeamVo getTtSysTeamById(TtSysTeamReqVo ttSysTeamReqVo);
|
||||
|
||||
void updateTtSysTeam(TtSysTeamVo ttSysTeamVo);
|
||||
|
||||
void deleteTtSysTeam(TtSysTeamVo ttSysTeamVo);
|
||||
}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
package com.bonus.base.basic.service;
|
||||
|
||||
import com.bonus.base.basic.domain.vo.TtSysUserVo;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface TtSysUserService {
|
||||
List<TtSysUserVo> getTtSysUserVoListByTeamId(String teamId);
|
||||
|
||||
void updateTtSysUserVoByTeam(TtSysUserVo ttSysUserVo);
|
||||
|
||||
void delTtSysUserByTeam(String teamId);
|
||||
}
|
||||
|
|
@ -0,0 +1,100 @@
|
|||
package com.bonus.base.basic.service.impl;
|
||||
|
||||
|
||||
import com.bonus.base.basic.domain.TtSysTeamReqVo;
|
||||
import com.bonus.base.basic.domain.vo.TtSysTeamVo;
|
||||
import com.bonus.base.basic.domain.vo.TtSysUserVo;
|
||||
import com.bonus.base.basic.mapper.TtSysTeamMapper;
|
||||
import com.bonus.base.basic.service.TtSysTeamService;
|
||||
import com.bonus.base.basic.service.TtSysUserService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
@Slf4j
|
||||
public class TtSysTeamServiceImpl implements TtSysTeamService {
|
||||
|
||||
@Resource
|
||||
private TtSysTeamMapper ttSysTeamMapper;
|
||||
|
||||
@Resource
|
||||
private TtSysUserService ttSysUserService;
|
||||
|
||||
/**
|
||||
* 查询班组列表
|
||||
* @param ttSysTeamReqVo
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<TtSysTeamVo> getTtSysTeamList(TtSysTeamReqVo ttSysTeamReqVo) {
|
||||
|
||||
//获取班组列表
|
||||
List<TtSysTeamVo> ttSysTeamList = ttSysTeamMapper.getTtSysTeamList(ttSysTeamReqVo);
|
||||
//获取班组人员信息
|
||||
for (TtSysTeamVo ttSysTeamVo : ttSysTeamList ) {
|
||||
List<TtSysUserVo> ttSysUserVoList = ttSysUserService.getTtSysUserVoListByTeamId(ttSysTeamVo.getId());
|
||||
ttSysTeamVo.setTtSysUserVoList(ttSysUserVoList);
|
||||
}
|
||||
return ttSysTeamList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增班组
|
||||
* @param ttSysTeamVo
|
||||
*/
|
||||
@Override
|
||||
public void addTtSysTeam(TtSysTeamVo ttSysTeamVo) {
|
||||
//保存班组信息
|
||||
ttSysTeamMapper.addTtSysTeam(ttSysTeamVo);
|
||||
//保存人员信息
|
||||
List<TtSysUserVo> ttSysUserVoList = ttSysTeamVo.getTtSysUserVoList();
|
||||
for (TtSysUserVo ttSysUserVo : ttSysUserVoList ) {
|
||||
ttSysUserVo.setTeamId(ttSysTeamVo.getId());
|
||||
ttSysUserService.updateTtSysUserVoByTeam(ttSysUserVo);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取班组详情
|
||||
* @param ttSysTeamReqVo
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public TtSysTeamVo getTtSysTeamById(TtSysTeamReqVo ttSysTeamReqVo) {
|
||||
TtSysTeamVo ttSysTeamVo = ttSysTeamMapper.getTtSysTeamById(ttSysTeamReqVo);
|
||||
List<TtSysUserVo> ttSysUserVoList = ttSysUserService.getTtSysUserVoListByTeamId(ttSysTeamVo.getId());
|
||||
ttSysTeamVo.setTtSysUserVoList(ttSysUserVoList);
|
||||
return ttSysTeamVo;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改班组信息
|
||||
* @param ttSysTeamVo
|
||||
*/
|
||||
@Override
|
||||
public void updateTtSysTeam(TtSysTeamVo ttSysTeamVo) {
|
||||
//修改班组信息
|
||||
ttSysTeamMapper.updateTtSysTeam(ttSysTeamVo);
|
||||
//先删后加
|
||||
ttSysUserService.delTtSysUserByTeam(ttSysTeamVo.getId());
|
||||
//保存人员信息
|
||||
List<TtSysUserVo> ttSysUserVoList = ttSysTeamVo.getTtSysUserVoList();
|
||||
for (TtSysUserVo ttSysUserVo : ttSysUserVoList ) {
|
||||
ttSysUserVo.setTeamId(ttSysTeamVo.getId());
|
||||
ttSysUserService.updateTtSysUserVoByTeam(ttSysUserVo);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 解散班组
|
||||
* @param ttSysTeamVo
|
||||
*/
|
||||
@Override
|
||||
public void deleteTtSysTeam(TtSysTeamVo ttSysTeamVo) {
|
||||
//修改班组信息
|
||||
ttSysTeamMapper.updateTtSysTeam(ttSysTeamVo);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
package com.bonus.base.basic.service.impl;
|
||||
|
||||
import com.bonus.base.basic.domain.vo.TtSysUserVo;
|
||||
import com.bonus.base.basic.mapper.TtSysUserMapper;
|
||||
import com.bonus.base.basic.service.TtSysUserService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Slf4j
|
||||
@Service
|
||||
public class TtSysUserServiceImpl implements TtSysUserService {
|
||||
|
||||
@Resource
|
||||
private TtSysUserMapper ttSysUserMapper;
|
||||
|
||||
/**
|
||||
* 获取班组下的人员信息
|
||||
* @param teamId
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<TtSysUserVo> getTtSysUserVoListByTeamId(String teamId) {
|
||||
List<TtSysUserVo> ttSysUserVoList = ttSysUserMapper.getTtSysUserVoListByTeamId(teamId);
|
||||
return ttSysUserVoList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 绑定和班组的关系
|
||||
* @param ttSysUserVo
|
||||
*/
|
||||
@Override
|
||||
public void updateTtSysUserVoByTeam(TtSysUserVo ttSysUserVo) {
|
||||
ttSysUserMapper.updateTtSysUserVoByTeam(ttSysUserVo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除和班组的关系
|
||||
* @param teamId
|
||||
*/
|
||||
@Override
|
||||
public void delTtSysUserByTeam(String teamId) {
|
||||
ttSysUserMapper.delTtSysUserByTeam(teamId);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,64 @@
|
|||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.bonus.base.basic.mapper.TtSysTeamMapper">
|
||||
<insert id="addTtSysTeam" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into tt_sys_team
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="teamName != null and teamName != ''">team_name,</if>
|
||||
<if test="userId != null">user_id,</if>
|
||||
<if test="teamType != null and teamType != ''">team_type,</if>
|
||||
<if test="unitName != null">unit_name,</if>
|
||||
<if test="remark != null and remark != ''">remark,</if>
|
||||
create_time,
|
||||
del_flag
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="teamName != null and teamName != ''">#{teamName},</if>
|
||||
<if test="userId != null">#{userId},</if>
|
||||
<if test="teamType != null and teamType != ''">#{teamType},</if>
|
||||
<if test="unitName != null">#{unitName},</if>
|
||||
<if test="remark != null and remark != ''">#{remark},</if>
|
||||
NOW(),
|
||||
1
|
||||
</trim>
|
||||
</insert>
|
||||
<update id="updateTtSysTeam">
|
||||
update tt_sys_team
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="teamName != null">team_name = #{teamName},</if>
|
||||
<if test="userId != null">user_id = #{userId},</if>
|
||||
<if test="teamType != null">team_type = #{teamType},</if>
|
||||
<if test="unitName != null">unit_name = #{unitName},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="delFlag != null">del_flag = #{delFlag},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
|
||||
<select id="getTtSysTeamList" resultType="com.bonus.base.basic.domain.vo.TtSysTeamVo">
|
||||
select team_name as teamName, user_id as userId,team_type as teamtype,unit_name as unitName,
|
||||
create_time as createTime,del_flag as delFlag,remark as remark,id sa id
|
||||
from tt_sys_team
|
||||
where 1=1
|
||||
<if test="teamName != '' and teamName != null"> and team_name = #{teamName}</if>
|
||||
<if test="teamType != '' and teamType != null"> and team_type = #{teamType}</if>
|
||||
<if test="unitName != '' and unitName != null"> and unit_name = #{unitName}</if>
|
||||
<if test="keyWord != null and keyWord != ''">
|
||||
and (
|
||||
build_before_desc like concat('%', #{keyWord}, '%') or
|
||||
build_under_desc like concat('%', #{keyWord}, '%') or
|
||||
build_after_desc like concat('%', #{keyWord}, '%') or
|
||||
build_place like concat('%', #{keyWord}, '%')
|
||||
)
|
||||
</if>
|
||||
</select>
|
||||
<select id="getTtSysTeamById" resultType="com.bonus.base.basic.domain.vo.TtSysTeamVo">
|
||||
select team_name as teamName, user_id as userId,team_type as teamtype,unit_name as unitName,
|
||||
create_time as createTime,del_flag as delFlag,remark as remark,id sa id
|
||||
from tt_sys_team
|
||||
where del_flag = '1' and id =#{id}
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.bonus.base.basic.mapper.TtSysUserMapper">
|
||||
<update id="updateTtSysUserVoByTeam">
|
||||
update tt_sys_user set team_id =#{teamId}
|
||||
where id = #{id}
|
||||
|
||||
</update>
|
||||
<delete id="delTtSysUserByTeam">
|
||||
update tt_sys_user set team_id = null
|
||||
where team_id =#{teamId}
|
||||
</delete>
|
||||
|
||||
|
||||
<select id="getTtSysUserVoListByTeamId" resultType="com.bonus.base.basic.domain.vo.TtSysUserVo">
|
||||
select user_name as userName,user_phone as userPhone,id_car as idCar, unit_id as unitId,
|
||||
team_id as teamId,car_image as carImage,post_unit as postUnit,work_type as workType,
|
||||
birthday as birthday,sex as sex,nationality as nationality,address as address,iss_auth as issAuth,
|
||||
start_time as startTime,end_time as endTime,photos as photos
|
||||
from tt_sys_user where team_id = #{teamId}
|
||||
</select>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue