From d09997620cb6771ef76de973aa1d1699425ef31c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Fri, 11 Apr 2025 09:32:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=EF=BC=8C=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=9C=BA=EF=BC=8C=E9=BB=91=E5=90=8D=E5=8D=95=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TtPersonnelBlackController.java | 55 +++++++++++ .../basic/controller/TtSysUserController.java | 99 +++++++++++++++++++ .../basic/domain/TtPersonnelBlackReqVo.java | 25 +++++ .../base/basic/domain/TtSysUserReqVo.java | 34 +++++++ .../basic/domain/vo/TtPersonnelBlackVo.java | 59 +++++++++++ .../domain/vo/TtPersonnelEntryExitVo.java | 44 +++++++++ .../base/basic/domain/vo/TtSysUserVo.java | 16 +++ .../basic/mapper/TtPersonnelBlackMapper.java | 10 ++ .../mapper/TtPersonnelEntryExitMapper.java | 13 +++ .../base/basic/mapper/TtSysUserMapper.java | 7 ++ .../service/TtPersonnelBlackService.java | 12 +++ .../service/TtPersonnelEntryExitService.java | 14 +++ .../base/basic/service/TtSysUserService.java | 15 +++ .../impl/TtPersonnelBlackServiceImpl.java | 50 ++++++++++ .../impl/TtPersonnelEntryExitServiceImpl.java | 34 +++++++ .../service/impl/TtSysTeamServiceImpl.java | 3 + .../service/impl/TtSysUserServiceImpl.java | 68 +++++++++++++ .../basic/TtPersonnelBlackMapper.xml | 23 +++++ .../basic/TtPersonnelEntryExitMapper.xml | 38 +++++++ .../smartsite/basic/TtSysUserMapper.xml | 91 ++++++++++++++++- 20 files changed, 708 insertions(+), 2 deletions(-) create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtPersonnelBlackController.java create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtSysUserController.java create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/TtPersonnelBlackReqVo.java create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/TtSysUserReqVo.java create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/TtPersonnelBlackVo.java create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/TtPersonnelEntryExitVo.java create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/TtPersonnelBlackMapper.java create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/TtPersonnelEntryExitMapper.java create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/TtPersonnelBlackService.java create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/TtPersonnelEntryExitService.java create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtPersonnelBlackServiceImpl.java create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtPersonnelEntryExitServiceImpl.java create mode 100644 bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/TtPersonnelBlackMapper.xml create mode 100644 bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/TtPersonnelEntryExitMapper.xml diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtPersonnelBlackController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtPersonnelBlackController.java new file mode 100644 index 0000000..4da19a6 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtPersonnelBlackController.java @@ -0,0 +1,55 @@ +package com.bonus.base.basic.controller; + +import com.bonus.base.basic.domain.TtPersonnelBlackReqVo; +import com.bonus.base.basic.domain.TtSysUserReqVo; +import com.bonus.base.basic.domain.vo.TtPersonnelBlackVo; +import com.bonus.base.basic.domain.vo.TtSysUserVo; +import com.bonus.base.basic.service.TtPersonnelBlackService; +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.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 人员黑名单 + */ +@Slf4j +@RestController +@RequestMapping("/ttPersonnelBlack") +public class TtPersonnelBlackController extends BaseController { + + @Resource + private TtPersonnelBlackService ttPersonnelBlackService; + + @ApiOperation(value = "查询人员黑名单列表") + @PostMapping("/getTtPersonnelBlackList") + public TableDataInfo getTtPersonnelBlackList(@RequestBody TtPersonnelBlackReqVo ttPersonnelBlackReqVo) { + try { + startPage(); + List ttPersonnelBlackList = ttPersonnelBlackService.getTtPersonnelBlackList(ttPersonnelBlackReqVo); + return getDataTable(ttPersonnelBlackList); + }catch (Exception e){ + return getDataTableError(null); + } + } + + @ApiOperation(value = "查询人员黑名单详情") + @PostMapping("/getTtPersonnelBlackById") + public AjaxResult getTtPersonnelBlackById(@RequestBody TtPersonnelBlackReqVo ttPersonnelBlackReqVo) { + try { + + TtPersonnelBlackVo ttPersonnelBlack = ttPersonnelBlackService.getTtPersonnelBlackById(ttPersonnelBlackReqVo); + return success(ttPersonnelBlack); + }catch (Exception e){ + return error("获取详情失败"); + } + } +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtSysUserController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtSysUserController.java new file mode 100644 index 0000000..6a502ab --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtSysUserController.java @@ -0,0 +1,99 @@ +package com.bonus.base.basic.controller; + + +import com.bonus.base.basic.domain.TtSysUserReqVo; +import com.bonus.base.basic.domain.vo.TtSysTeamVo; +import com.bonus.base.basic.domain.vo.TtSysUserVo; +import com.bonus.base.basic.service.TtSysUserService; +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.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 人员管理 + */ +@Slf4j +@RestController +@RequestMapping("/ttSysUser") +public class TtSysUserController extends BaseController { + + @Resource + private TtSysUserService ttSysUserService; + + @ApiOperation(value = "查询人员列表") + @PostMapping("/getTtSysUserList") + public TableDataInfo getTtSysUserList(@RequestBody TtSysUserReqVo ttSysUserReqVo) { + try { + startPage(); + List ttSysUserVoList = ttSysUserService.getTtSysUserList(ttSysUserReqVo); + return getDataTable(ttSysUserVoList); + }catch (Exception e){ + + return getDataTableError(null); + } + } + + @ApiOperation(value = "获取人员详情") + @PostMapping("/getTtSysUserById") + public AjaxResult getTtSysUserById(@RequestBody TtSysUserReqVo ttSysUserReqVo) { + try { + TtSysUserVo ttSysUserVo = ttSysUserService.getTtSysUserById(ttSysUserReqVo); + return success(ttSysUserVo); + }catch (Exception e){ + return error("查询失败"); + } + } + + @ApiOperation(value = "新增人员") + @PostMapping("/addTtSysUser") + public AjaxResult addTtSysUser(@RequestBody TtSysUserVo ttSysUserVo) { + try { + ttSysUserService.addTtSysUser(ttSysUserVo); + return success("新增成功"); + }catch (Exception e){ + return error("新增失败"); + } + } + + @ApiOperation(value = "修改人员信息") + @PostMapping("/updateTtSysUser") + public AjaxResult updateTtSysUser(@RequestBody TtSysUserVo ttSysUserVo) { + try { + ttSysUserService.updateTtSysUser(ttSysUserVo); + return success("修改成功"); + }catch (Exception e){ + return error("修改失败"); + } + } + + @ApiOperation(value = "修改人员状态") + @PostMapping("/updateTtSysUserStatus") + public AjaxResult updateTtSysUserStatus(@RequestBody TtSysUserVo ttSysUserVo) { + try { + ttSysUserService.updateTtSysUserStatus(ttSysUserVo); + return success("修改成功"); + }catch (Exception e){ + return error("修改失败"); + } + } + + @ApiOperation(value = "删除人员") + @PostMapping("/deleteTtSysUser") + public AjaxResult deleteTtSysUser(@RequestBody TtSysUserVo ttSysUserVo) { + try { + ttSysUserService.deleteTtSysUser(ttSysUserVo); + return success("删除成功"); + }catch (Exception e){ + return error("删除失败"); + } + } +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/TtPersonnelBlackReqVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/TtPersonnelBlackReqVo.java new file mode 100644 index 0000000..1b2c9a7 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/TtPersonnelBlackReqVo.java @@ -0,0 +1,25 @@ +package com.bonus.base.basic.domain; + + +import lombok.Data; + +@Data +public class TtPersonnelBlackReqVo { + + + /** + *主键 + */ + private String id; + + + /** + * 执行状态（0.执行中，1已解除） + */ + private String status; + + /** + * 关键字 + */ + private String keyWord; +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/TtSysUserReqVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/TtSysUserReqVo.java new file mode 100644 index 0000000..39bee59 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/TtSysUserReqVo.java @@ -0,0 +1,34 @@ +package com.bonus.base.basic.domain; + + +import lombok.Data; + +@Data +public class TtSysUserReqVo { + + /** + *主键 + */ + 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/TtPersonnelBlackVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/TtPersonnelBlackVo.java new file mode 100644 index 0000000..60f5ec2 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/TtPersonnelBlackVo.java @@ -0,0 +1,59 @@ +package com.bonus.base.basic.domain.vo; + + +import com.bonus.base.basic.domain.BmFileInfo; +import jdk.internal.dynalink.linker.LinkerServices; +import lombok.Data; + +import java.util.List; + +@Data +public class TtPersonnelBlackVo { + + /** + * 主键 + */ + private Long id; + + /** + * 姓名 + */ + private String userName; + + /** + * 身份证号 + */ + private String idCode; + + /** + * 工程id + */ + private Long lotId; + + /** + * 岗位 + */ + private String post; + + /** + * 事件 + */ + private String event; + + /** + * 起止时间 + */ + private String startAndEndTime; + + /** + * 执行状态（0.执行中，1已解除） + */ + private String status; + + /** + * 所属公司 + */ + private String deptId; + + private List bmFileInfoList; +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/TtPersonnelEntryExitVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/TtPersonnelEntryExitVo.java new file mode 100644 index 0000000..d257c7e --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/TtPersonnelEntryExitVo.java @@ -0,0 +1,44 @@ +package com.bonus.base.basic.domain.vo; + +import lombok.Data; + +import java.util.Date; + +@Data +public class TtPersonnelEntryExitVo { + + /** + *主键 + */ + private Long id; + + /** + *人员Id + */ + private Long personnelId; + + /** + *工种 + */ + private String workType; + + /** + *工程id + */ + private Long lotId; + + /** + *入场时间 + */ + private Date entryDate; + + /** + *出场时间 + */ + private Date exitDate; + + /** + *状态（0.在场，1.离场） + */ + private Integer status; +} 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 index 0e77407..042d771 100644 --- 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 @@ -3,10 +3,16 @@ package com.bonus.base.basic.domain.vo; import lombok.Data; import java.util.Date; +import java.util.List; @Data public class TtSysUserVo { + /** + * 主键 + */ + private String id; + /** *用户名称 */ @@ -96,4 +102,14 @@ public class TtSysUserVo { *近期照片 */ private String photos; + + /** + *人员状态（0.在场，1.休息，2.离场） + */ + private Integer status; + + /** + * 出入场信息 + */ + List ttPersonnelEntryExitVoList; } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/TtPersonnelBlackMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/TtPersonnelBlackMapper.java new file mode 100644 index 0000000..e407e94 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/TtPersonnelBlackMapper.java @@ -0,0 +1,10 @@ +package com.bonus.base.basic.mapper; + +import com.bonus.base.basic.domain.TtPersonnelBlackReqVo; +import com.bonus.base.basic.domain.vo.TtPersonnelBlackVo; + +import java.util.List; + +public interface TtPersonnelBlackMapper { + List getTtPersonnelBlackList(TtPersonnelBlackReqVo ttPersonnelBlackReqVo); +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/TtPersonnelEntryExitMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/TtPersonnelEntryExitMapper.java new file mode 100644 index 0000000..70a1508 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/TtPersonnelEntryExitMapper.java @@ -0,0 +1,13 @@ +package com.bonus.base.basic.mapper; + +import com.bonus.base.basic.domain.vo.TtPersonnelEntryExitVo; + +import java.util.List; + +public interface TtPersonnelEntryExitMapper { + List getTtPersonnelEntryExitByUserId(String personnelId); + + void addTtPersonnelEntryExit(TtPersonnelEntryExitVo ttPersonnelEntryExitVo); + + void updateTtPersonnelEntryExit(TtPersonnelEntryExitVo ttPersonnelEntryExitVo); +} 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 index 6431f0f..954df80 100644 --- 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 @@ -1,5 +1,6 @@ package com.bonus.base.basic.mapper; +import com.bonus.base.basic.domain.TtSysUserReqVo; import com.bonus.base.basic.domain.vo.TtSysUserVo; import java.util.List; @@ -10,4 +11,10 @@ public interface TtSysUserMapper { void updateTtSysUserVoByTeam(TtSysUserVo ttSysUserVo); void delTtSysUserByTeam(String teamId); + + List getTtSysUserList(TtSysUserReqVo ttSysUserReqVo); + + void addTtSysUser(TtSysUserVo ttSysUserVo); + + void updateTtSysUser(TtSysUserVo ttSysUserVo); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/TtPersonnelBlackService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/TtPersonnelBlackService.java new file mode 100644 index 0000000..22608cc --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/TtPersonnelBlackService.java @@ -0,0 +1,12 @@ +package com.bonus.base.basic.service; + +import com.bonus.base.basic.domain.TtPersonnelBlackReqVo; +import com.bonus.base.basic.domain.vo.TtPersonnelBlackVo; + +import java.util.List; + +public interface TtPersonnelBlackService { + List getTtPersonnelBlackList(TtPersonnelBlackReqVo ttPersonnelBlackReqVo); + + TtPersonnelBlackVo getTtPersonnelBlackById(TtPersonnelBlackReqVo ttPersonnelBlackReqVo); +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/TtPersonnelEntryExitService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/TtPersonnelEntryExitService.java new file mode 100644 index 0000000..192ed28 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/TtPersonnelEntryExitService.java @@ -0,0 +1,14 @@ +package com.bonus.base.basic.service; + +import com.bonus.base.basic.domain.vo.TtPersonnelEntryExitVo; + +import java.util.List; + +public interface TtPersonnelEntryExitService { + + List getTtPersonnelEntryExitByUserId(String personnelId); + + void addTtPersonnelEntryExit(TtPersonnelEntryExitVo ttPersonnelEntryExitVo); + + void updateTtPersonnelEntryExit(TtPersonnelEntryExitVo ttPersonnelEntryExitVo); +} 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 index 78bf338..828488c 100644 --- 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 @@ -1,5 +1,8 @@ package com.bonus.base.basic.service; +import com.bonus.base.basic.domain.TtSysTeamReqVo; +import com.bonus.base.basic.domain.TtSysUserReqVo; +import com.bonus.base.basic.domain.vo.TtSysTeamVo; import com.bonus.base.basic.domain.vo.TtSysUserVo; import java.util.List; @@ -10,4 +13,16 @@ public interface TtSysUserService { void updateTtSysUserVoByTeam(TtSysUserVo ttSysUserVo); void delTtSysUserByTeam(String teamId); + + List getTtSysUserList(TtSysUserReqVo ttSysUserReqVo); + + TtSysUserVo getTtSysUserById(TtSysUserReqVo ttSysUserReqVo); + + void addTtSysUser(TtSysUserVo ttSysUserVo); + + void updateTtSysUser(TtSysUserVo ttSysUserVo); + + void updateTtSysUserStatus(TtSysUserVo ttSysUserVo); + + void deleteTtSysUser(TtSysUserVo ttSysUserVo); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtPersonnelBlackServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtPersonnelBlackServiceImpl.java new file mode 100644 index 0000000..65e6928 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtPersonnelBlackServiceImpl.java @@ -0,0 +1,50 @@ +package com.bonus.base.basic.service.impl; + +import com.bonus.base.basic.domain.BmFileInfo; +import com.bonus.base.basic.domain.TtPersonnelBlackReqVo; +import com.bonus.base.basic.domain.vo.TtPersonnelBlackVo; +import com.bonus.base.basic.mapper.TtPersonnelBlackMapper; +import com.bonus.base.basic.service.IBmFileInfoService; +import com.bonus.base.basic.service.TtPersonnelBlackService; +import lombok.extern.log4j.Log4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + + +@Log4j +@Service +public class TtPersonnelBlackServiceImpl implements TtPersonnelBlackService { + + @Resource + private TtPersonnelBlackMapper ttPersonnelBlackMapper; + + @Resource + private IBmFileInfoService bmFileInfoService; + + @Override + public List getTtPersonnelBlackList(TtPersonnelBlackReqVo ttPersonnelBlackReqVo) { + //获取黑名单列表 + List TtPersonnelBlackList = ttPersonnelBlackMapper.getTtPersonnelBlackList(ttPersonnelBlackReqVo); + //获取附件信息 + for (TtPersonnelBlackVo ttPersonnelBlackVo : TtPersonnelBlackList) { + BmFileInfo bmFileInfo = new BmFileInfo(); + bmFileInfo.setTaskId(ttPersonnelBlackVo.getId()); + List bmFileInfoList = bmFileInfoService.selectBmFileInfoList(bmFileInfo); + ttPersonnelBlackVo.setBmFileInfoList(bmFileInfoList); + } + return TtPersonnelBlackList; + } + + @Override + public TtPersonnelBlackVo getTtPersonnelBlackById(TtPersonnelBlackReqVo ttPersonnelBlackReqVo) { + TtPersonnelBlackVo ttPersonnelBlackVo = ttPersonnelBlackMapper.getTtPersonnelBlackList(ttPersonnelBlackReqVo).get(0); + BmFileInfo bmFileInfo = new BmFileInfo(); + bmFileInfo.setTaskId(ttPersonnelBlackVo.getId()); + List bmFileInfoList = bmFileInfoService.selectBmFileInfoList(bmFileInfo); + ttPersonnelBlackVo.setBmFileInfoList(bmFileInfoList); + return ttPersonnelBlackVo; + } +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtPersonnelEntryExitServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtPersonnelEntryExitServiceImpl.java new file mode 100644 index 0000000..f5a0bfe --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtPersonnelEntryExitServiceImpl.java @@ -0,0 +1,34 @@ +package com.bonus.base.basic.service.impl; + +import com.bonus.base.basic.domain.vo.TtPersonnelEntryExitVo; +import com.bonus.base.basic.mapper.TtPersonnelEntryExitMapper; +import com.bonus.base.basic.service.TtPersonnelEntryExitService; +import lombok.extern.log4j.Log4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + + +@Log4j +@Service +public class TtPersonnelEntryExitServiceImpl implements TtPersonnelEntryExitService { + + @Resource + private TtPersonnelEntryExitMapper ttPersonnelEntryExitMapper; + + @Override + public List getTtPersonnelEntryExitByUserId(String personnelId) { + return ttPersonnelEntryExitMapper.getTtPersonnelEntryExitByUserId(personnelId); + } + + @Override + public void addTtPersonnelEntryExit(TtPersonnelEntryExitVo ttPersonnelEntryExitVo) { + ttPersonnelEntryExitMapper.addTtPersonnelEntryExit(ttPersonnelEntryExitVo); + } + + @Override + public void updateTtPersonnelEntryExit(TtPersonnelEntryExitVo ttPersonnelEntryExitVo) { + ttPersonnelEntryExitMapper.updateTtPersonnelEntryExit(ttPersonnelEntryExitVo); + } +} 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 index bdbfbb6..9424e0e 100644 --- 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 @@ -9,6 +9,7 @@ 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 org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; @@ -46,6 +47,7 @@ public class TtSysTeamServiceImpl implements TtSysTeamService { * @param ttSysTeamVo */ @Override + @Transactional public void addTtSysTeam(TtSysTeamVo ttSysTeamVo) { //保存班组信息 ttSysTeamMapper.addTtSysTeam(ttSysTeamVo); @@ -75,6 +77,7 @@ public class TtSysTeamServiceImpl implements TtSysTeamService { * @param ttSysTeamVo */ @Override + @Transactional public void updateTtSysTeam(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 index 0337b9e..77e0c37 100644 --- 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 @@ -1,15 +1,21 @@ package com.bonus.base.basic.service.impl; +import com.bonus.base.basic.domain.TtSysUserReqVo; +import com.bonus.base.basic.domain.vo.TtPersonnelEntryExitVo; import com.bonus.base.basic.domain.vo.TtSysUserVo; import com.bonus.base.basic.mapper.TtSysUserMapper; +import com.bonus.base.basic.service.TtPersonnelEntryExitService; import com.bonus.base.basic.service.TtSysUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Date; import java.util.List; + @Slf4j @Service public class TtSysUserServiceImpl implements TtSysUserService { @@ -17,6 +23,9 @@ public class TtSysUserServiceImpl implements TtSysUserService { @Resource private TtSysUserMapper ttSysUserMapper; + @Resource + private TtPersonnelEntryExitService ttPersonnelEntryExitService; + /** * 获取班组下的人员信息 * @param teamId @@ -45,4 +54,63 @@ public class TtSysUserServiceImpl implements TtSysUserService { public void delTtSysUserByTeam(String teamId) { ttSysUserMapper.delTtSysUserByTeam(teamId); } + + @Override + public List getTtSysUserList(TtSysUserReqVo ttSysUserReqVo) { + //获取热源列表 + List ttSysUserList = ttSysUserMapper.getTtSysUserList(ttSysUserReqVo); + //获取人员出入场记录 + for (TtSysUserVo ttSysUserVo: ttSysUserList) { + List ttPersonnelEntryExitVoList = ttPersonnelEntryExitService.getTtPersonnelEntryExitByUserId(ttSysUserVo.getId()); + ttSysUserVo.setTtPersonnelEntryExitVoList(ttPersonnelEntryExitVoList); + } + return ttSysUserList; + } + + @Override + public TtSysUserVo getTtSysUserById(TtSysUserReqVo ttSysUserReqVo) { + return ttSysUserMapper.getTtSysUserList(ttSysUserReqVo).get(0); + } + + @Override + @Transactional + public void addTtSysUser(TtSysUserVo ttSysUserVo) { + //保存用户信息 + ttSysUserMapper.addTtSysUser(ttSysUserVo); + //保存出入场信息 + TtPersonnelEntryExitVo ttPersonnelEntryExitVo = new TtPersonnelEntryExitVo(); + ttPersonnelEntryExitVo.setPersonnelId(Long.valueOf(ttSysUserVo.getId())); + ttPersonnelEntryExitVo.setWorkType(ttSysUserVo.getWorkType()); + ttPersonnelEntryExitVo.setEntryDate(new Date()); + ttPersonnelEntryExitVo.setStatus(0); + ttPersonnelEntryExitService.addTtPersonnelEntryExit(ttPersonnelEntryExitVo); + } + + @Override + public void updateTtSysUser(TtSysUserVo ttSysUserVo) { + //修改用户信息 + ttSysUserMapper.updateTtSysUser(ttSysUserVo); + } + + @Override + @Transactional + public void updateTtSysUserStatus(TtSysUserVo ttSysUserVo) { + //修改用户信息 + ttSysUserMapper.updateTtSysUser(ttSysUserVo); + //如果是离场，修改进场记录 + if (ttSysUserVo.getStatus() ==2){ + //保存出入场信息 + TtPersonnelEntryExitVo ttPersonnelEntryExitVo = new TtPersonnelEntryExitVo(); + ttPersonnelEntryExitVo.setPersonnelId(Long.valueOf(ttSysUserVo.getId())); + ttPersonnelEntryExitVo.setExitDate(new Date()); + ttPersonnelEntryExitVo.setStatus(1); + ttPersonnelEntryExitService.updateTtPersonnelEntryExit(ttPersonnelEntryExitVo); + } + } + + @Override + public void deleteTtSysUser(TtSysUserVo ttSysUserVo) { + //修改用户信息 + ttSysUserMapper.updateTtSysUser(ttSysUserVo); + } } diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/TtPersonnelBlackMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/TtPersonnelBlackMapper.xml new file mode 100644 index 0000000..e760280 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/TtPersonnelBlackMapper.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/TtPersonnelEntryExitMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/TtPersonnelEntryExitMapper.xml new file mode 100644 index 0000000..d1ae147 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/TtPersonnelEntryExitMapper.xml @@ -0,0 +1,38 @@ + + + + + insert into tt_personnel_entry_exit + + personnel_id, + work_type, + lot_id, + entry_date, + status, + + + #{personnelId}, + #{workType}, + #{lotId}, + #{entryDate}, + #{status}, + + + + update tt_personnel_entry_exit + + exit_date = #{exitDate}, + status = #{status}, + + where personnel_id = #{personnelId} and status = 0 + + + + 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 index 7540b5f..694b2cc 100644 --- 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 @@ -3,11 +3,79 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + insert into tt_sys_user + + user_name, + user_phone, + id_car, + unit_id, + car_image, + post_unit, + work_type, + birthday, + sex, + nationality, + address, + iss_auth, + start_time, + end_time, + photos, + create_time, + del_flag, + status + + + #{userName}, + #{userPhone}, + #{idCar}, + #{unitId}, + #{teamId}, + #{carImage}, + #{postUnit}, + #{workType}, + #{birthday}, + #{sex}, + #{nationality}, + #{address}, + #{issAuth}, + #{startTime}, + #{remark}, + #{photos}, + NOW(), + 1, + 0 + + update tt_sys_user set team_id =#{teamId} where id = #{id} + + update tt_sys_user + + user_name = #{userName}, + user_phone = #{userPhone}, + id_car = #{idCar}, + unit_id = #{unitId}, + team_id = #{teamId}, + car_image = #{carImage}, + post_unit = #{postUnit}, + work_type = #{workType}, + birthday = #{birthday}, + sex = #{sex}, + nationality = #{nationality}, + address = #{address}, + iss_auth = #{issAuth}, + start_time = #{startTime}, + end_time = #{endTime}, + photos = #{photos}, + status = #{status}, + del_flag = #{delFlag}, + + where id = #{id} + update tt_sys_user set team_id = null where team_id =#{teamId} @@ -15,10 +83,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +