diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtSysTeamController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtSysTeamController.java new file mode 100644 index 0000000..4a74881 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtSysTeamController.java @@ -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 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("解散班组失败"); + } + } + +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/TtSysTeamReqVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/TtSysTeamReqVo.java new file mode 100644 index 0000000..a086122 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/TtSysTeamReqVo.java @@ -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; +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/TtSysTeamVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/TtSysTeamVo.java new file mode 100644 index 0000000..05beb60 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/TtSysTeamVo.java @@ -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 ttSysUserVoList; + +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/TtSysUserVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/TtSysUserVo.java new file mode 100644 index 0000000..0e77407 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/TtSysUserVo.java @@ -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; +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/TtSysTeamMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/TtSysTeamMapper.java new file mode 100644 index 0000000..02c049e --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/TtSysTeamMapper.java @@ -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 getTtSysTeamList(TtSysTeamReqVo ttSysTeamReqVo); + + void addTtSysTeam(TtSysTeamVo ttSysTeamVo); + + TtSysTeamVo getTtSysTeamById(TtSysTeamReqVo ttSysTeamReqVo); + + void updateTtSysTeam(TtSysTeamVo ttSysTeamVo); +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/TtSysUserMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/TtSysUserMapper.java new file mode 100644 index 0000000..6431f0f --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/TtSysUserMapper.java @@ -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 getTtSysUserVoListByTeamId(String teamId); + + void updateTtSysUserVoByTeam(TtSysUserVo ttSysUserVo); + + void delTtSysUserByTeam(String teamId); +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/TtSysTeamService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/TtSysTeamService.java new file mode 100644 index 0000000..8926f26 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/TtSysTeamService.java @@ -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 getTtSysTeamList(TtSysTeamReqVo ttSysTeamReqVo); + + void addTtSysTeam(TtSysTeamVo ttSysTeamVo); + + TtSysTeamVo getTtSysTeamById(TtSysTeamReqVo ttSysTeamReqVo); + + void updateTtSysTeam(TtSysTeamVo ttSysTeamVo); + + void deleteTtSysTeam(TtSysTeamVo ttSysTeamVo); +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/TtSysUserService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/TtSysUserService.java new file mode 100644 index 0000000..78bf338 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/TtSysUserService.java @@ -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 getTtSysUserVoListByTeamId(String teamId); + + void updateTtSysUserVoByTeam(TtSysUserVo ttSysUserVo); + + void delTtSysUserByTeam(String teamId); +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtSysTeamServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtSysTeamServiceImpl.java new file mode 100644 index 0000000..bdbfbb6 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtSysTeamServiceImpl.java @@ -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 getTtSysTeamList(TtSysTeamReqVo ttSysTeamReqVo) { + + //获取班组列表 + List ttSysTeamList = ttSysTeamMapper.getTtSysTeamList(ttSysTeamReqVo); + //获取班组人员信息 + for (TtSysTeamVo ttSysTeamVo : ttSysTeamList ) { + List ttSysUserVoList = ttSysUserService.getTtSysUserVoListByTeamId(ttSysTeamVo.getId()); + ttSysTeamVo.setTtSysUserVoList(ttSysUserVoList); + } + return ttSysTeamList; + } + + /** + * 新增班组 + * @param ttSysTeamVo + */ + @Override + public void addTtSysTeam(TtSysTeamVo ttSysTeamVo) { + //保存班组信息 + ttSysTeamMapper.addTtSysTeam(ttSysTeamVo); + //保存人员信息 + List 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 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 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); + } +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtSysUserServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtSysUserServiceImpl.java new file mode 100644 index 0000000..0337b9e --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtSysUserServiceImpl.java @@ -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 getTtSysUserVoListByTeamId(String teamId) { + List 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); + } +} diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/TtSysTeamMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/TtSysTeamMapper.xml new file mode 100644 index 0000000..2104187 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/TtSysTeamMapper.xml @@ -0,0 +1,64 @@ + + + + + insert into tt_sys_team + + team_name, + user_id, + team_type, + unit_name, + remark, + create_time, + del_flag + + + #{teamName}, + #{userId}, + #{teamType}, + #{unitName}, + #{remark}, + NOW(), + 1 + + + + update tt_sys_team + + team_name = #{teamName}, + user_id = #{userId}, + team_type = #{teamType}, + unit_name = #{unitName}, + remark = #{remark}, + del_flag = #{delFlag}, + + where id = #{id} + + + + + + diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/TtSysUserMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/TtSysUserMapper.xml new file mode 100644 index 0000000..7540b5f --- /dev/null +++ b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/TtSysUserMapper.xml @@ -0,0 +1,24 @@ + + + + + update tt_sys_user set team_id =#{teamId} + where id = #{id} + + + + update tt_sys_user set team_id = null + where team_id =#{teamId} + + + + +