From 7223d7062bb7898725fd4de87b7b6e0a1bb949e4 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 11 Apr 2025 14:57:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=86=E9=A2=91=E8=AE=BE=E5=A4=87?=
=?UTF-8?q?=E3=80=81=E5=8D=95=E4=BD=8D=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/com/bonus/base/basic/domain/vo/DeviceVo.java | 4 ++--
.../src/main/resources/mapper/smartsite/basic/DevMapper.xml | 1 +
.../src/main/resources/mapper/smartsite/basic/UnitMapper.xml | 3 +++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/DeviceVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/DeviceVo.java
index fe9a603..24bc7ff 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/DeviceVo.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/DeviceVo.java
@@ -80,13 +80,13 @@ public class DeviceVo {
* 创建时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
/**
* 修改时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
/**
* 备注
diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/DevMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/DevMapper.xml
index 78b4ebf..a437c2a 100644
--- a/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/DevMapper.xml
+++ b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/DevMapper.xml
@@ -94,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND td.is_active = '1'
+ ORDER BY td.update_time DESC
From a850fe6ab8548c37d3818f491c3822a67843c04f Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 11 Apr 2025 15:10:37 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/bonus/base/basic/domain/vo/UnitVo.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/UnitVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/UnitVo.java
index 1b4fe23..28e7a63 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/UnitVo.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/UnitVo.java
@@ -44,25 +44,25 @@ public class UnitVo {
/**
* 联系人
*/
- @NotBlank(message = "联系人不能为空", groups = {Add.class, Edit.class})
+// @NotBlank(message = "联系人不能为空", groups = {Add.class, Edit.class})
@Length(max = 32, message = "联系人字符长度不能超过32", groups = {Add.class, Edit.class})
private String unitUser;
/**
* 联系电话
*/
- @NotBlank(message = "联系电话不能为空", groups = {Add.class, Edit.class})
+// @NotBlank(message = "联系电话不能为空", groups = {Add.class, Edit.class})
@Pattern(regexp = "^1[3-9]\\d{9}$", message = "联系电话格式不正确", groups = {Add.class, Edit.class})
private String unitPhone;
/**
* 法人姓名
*/
- @NotBlank(message = "法人姓名不能为空", groups = {Add.class, Edit.class})
+// @NotBlank(message = "法人姓名不能为空", groups = {Add.class, Edit.class})
@Length(max = 32, message = "法人姓名字符长度不能超过32", groups = {Add.class, Edit.class})
private String suffUser;
/**
* 法人手机号
*/
- @NotBlank(message = "法人手机号不能为空", groups = {Add.class, Edit.class})
+// @NotBlank(message = "法人手机号不能为空", groups = {Add.class, Edit.class})
@Pattern(regexp = "^1[3-9]\\d{9}$", message = "法人手机号格式不正确", groups = {Add.class, Edit.class})
private String suffPhone;
/**
@@ -78,7 +78,7 @@ public class UnitVo {
/**
* 公司成立日期
*/
- @NotBlank(message = "公司成立日期不能为空", groups = {Add.class, Edit.class})
+// @NotBlank(message = "公司成立日期不能为空", groups = {Add.class, Edit.class})
private String createDay;
/**
* 注册资本
From a1fa50f79537eb81b5edc49e9e08ffe4b7ef8183 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 15:15:42 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BA=BA=E5=91=98=EF=BC=8C=E5=87=BA?=
=?UTF-8?q?=E5=85=A5=E5=9C=BA=EF=BC=8C=E9=BB=91=E5=90=8D=E5=8D=95=E7=AE=A1?=
=?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../TtPersonnelBlackController.java | 55 +++++++++++++++++
.../basic/controller/TtSysTeamController.java | 15 ++++-
.../basic/controller/TtSysUserController.java | 15 +++++
.../basic/domain/vo/TtPersonnelBlackVo.java | 6 ++
.../base/basic/domain/vo/TtSysTeamVo.java | 3 +
.../base/basic/domain/vo/TtSysUserVo.java | 12 ++++
.../basic/mapper/TtPersonnelBlackMapper.java | 4 ++
.../basic/service/IBmFileInfoService.java | 18 +++---
.../service/TtPersonnelBlackService.java | 29 +++++++++
.../base/basic/service/TtSysTeamService.java | 22 +++++++
.../base/basic/service/TtSysUserService.java | 39 ++++++++++++
.../service/impl/BmFileInfoServiceImpl.java | 21 ++++---
.../impl/TtPersonnelBlackServiceImpl.java | 59 ++++++++++++++++++-
.../impl/TtPersonnelEntryExitServiceImpl.java | 3 +-
.../service/impl/TtSysUserServiceImpl.java | 26 ++++++++
.../basic/TtPersonnelBlackMapper.xml | 39 ++++++++++++
.../smartsite/basic/TtSysUserMapper.xml | 2 +-
17 files changed, 348 insertions(+), 20 deletions(-)
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
index 4da19a6..45a14e2 100644
--- 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
@@ -5,6 +5,7 @@ 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.utils.poi.ExcelUtil;
import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.core.web.page.TableDataInfo;
@@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -37,6 +39,7 @@ public class TtPersonnelBlackController extends BaseController {
List ttPersonnelBlackList = ttPersonnelBlackService.getTtPersonnelBlackList(ttPersonnelBlackReqVo);
return getDataTable(ttPersonnelBlackList);
}catch (Exception e){
+ log.info("查询失败",e.getMessage());
return getDataTableError(null);
}
}
@@ -49,7 +52,59 @@ public class TtPersonnelBlackController extends BaseController {
TtPersonnelBlackVo ttPersonnelBlack = ttPersonnelBlackService.getTtPersonnelBlackById(ttPersonnelBlackReqVo);
return success(ttPersonnelBlack);
}catch (Exception e){
+ log.info("查询失败",e.getMessage());
return error("获取详情失败");
}
}
+
+ @ApiOperation(value = "新增人员黑名单")
+ @PostMapping("/addTtPersonnelBlack")
+ public AjaxResult addTtPersonnelBlack(@RequestBody TtPersonnelBlackVo ttPersonnelBlackVo) {
+ try {
+
+ ttPersonnelBlackService.addTtPersonnelBlack(ttPersonnelBlackVo);
+ return success("新增成功");
+ }catch (Exception e){
+ log.info("新增失败",e.getMessage());
+ return error("新增失败");
+ }
+ }
+
+ @ApiOperation(value = "修改人员黑名单")
+ @PostMapping("/updateTtPersonnelBlack")
+ public AjaxResult updateTtPersonnelBlack(@RequestBody TtPersonnelBlackVo ttPersonnelBlackVo) {
+ try {
+
+ ttPersonnelBlackService.updateTtPersonnelBlack(ttPersonnelBlackVo);
+ return success("修改成功");
+ }catch (Exception e){
+ log.info("修改失败",e.getMessage());
+ return error("修改失败");
+ }
+ }
+
+ @ApiOperation(value = "删除人员黑名单")
+ @PostMapping("/delTtPersonnelBlack")
+ public AjaxResult delTtPersonnelBlack(@RequestBody TtPersonnelBlackVo ttPersonnelBlackVo) {
+ try {
+
+ ttPersonnelBlackService.delTtPersonnelBlack(ttPersonnelBlackVo);
+ return success("删除成功");
+ }catch (Exception e){
+ log.info("删除失败",e.getMessage());
+ return error("删除失败");
+ }
+ }
+
+ @ApiOperation(value = "人员黑名单导出")
+ @PostMapping("/ttPersonnelBlackExport")
+ public void ttPersonnelBlackExport(HttpServletResponse response, @RequestBody TtPersonnelBlackReqVo ttPersonnelBlackReqVo) {
+ try {
+ List ttPersonnelBlackList = ttPersonnelBlackService.getTtPersonnelBlackList(ttPersonnelBlackReqVo);
+ ExcelUtil util = new ExcelUtil(TtPersonnelBlackVo.class);
+ util.exportExcel(response, ttPersonnelBlackList, "重要事项及宣传照片");
+ }catch (Exception e){
+ log.info("导出失败",e.getMessage());
+ }
+ }
}
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
index 4a74881..b2c2fc0 100644
--- 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
@@ -1,9 +1,11 @@
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.utils.poi.ExcelUtil;
import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.core.web.page.TableDataInfo;
@@ -12,6 +14,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
@@ -84,5 +87,15 @@ public class TtSysTeamController extends BaseController {
return error("解散班组失败");
}
}
-
+ @ApiOperation(value = "班组导出")
+ @PostMapping("/ttSysTeamExport")
+ public void ttSysTeamExport(HttpServletResponse response, @RequestBody TtSysTeamReqVo ttSysTeamReqVo) {
+ try {
+ List ttSysTeamVoList = ttSysTeamService.getTtSysTeamList(ttSysTeamReqVo);
+ ExcelUtil util = new ExcelUtil(TtSysTeamVo.class);
+ util.exportExcel(response, ttSysTeamVoList, "班组");
+ }catch (Exception e){
+ log.info("导出失败",e.getMessage());
+ }
+ }
}
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
index 6a502ab..29bcad6 100644
--- 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
@@ -1,10 +1,12 @@
package com.bonus.base.basic.controller;
+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 com.bonus.base.basic.service.TtSysUserService;
+import com.bonus.common.core.utils.poi.ExcelUtil;
import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.core.web.page.TableDataInfo;
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -96,4 +99,16 @@ public class TtSysUserController extends BaseController {
return error("删除失败");
}
}
+
+ @ApiOperation(value = "人员信息导出")
+ @PostMapping("/ttSysUserExport")
+ public void ttSysUserExport(HttpServletResponse response, @RequestBody TtSysUserReqVo ttSysUserReqVo) {
+ try {
+ List ttSysUserVoList = ttSysUserService.getTtSysUserList(ttSysUserReqVo);
+ ExcelUtil util = new ExcelUtil(TtSysUserVo.class);
+ util.exportExcel(response, ttSysUserVoList, "人员信息");
+ }catch (Exception e){
+ log.info("导出失败",e.getMessage());
+ }
+ }
}
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
index 60f5ec2..073e316 100644
--- 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
@@ -2,6 +2,7 @@ package com.bonus.base.basic.domain.vo;
import com.bonus.base.basic.domain.BmFileInfo;
+import com.bonus.common.core.annotation.Excel;
import jdk.internal.dynalink.linker.LinkerServices;
import lombok.Data;
@@ -18,11 +19,13 @@ public class TtPersonnelBlackVo {
/**
* 姓名
*/
+ @Excel(name = "姓名", sort = 1)
private String userName;
/**
* 身份证号
*/
+ @Excel(name = "身份证号", sort = 2)
private String idCode;
/**
@@ -33,16 +36,19 @@ public class TtPersonnelBlackVo {
/**
* 岗位
*/
+ @Excel(name = "岗位", sort = 3)
private String post;
/**
* 事件
*/
+ @Excel(name = "事件", sort = 4)
private String event;
/**
* 起止时间
*/
+ @Excel(name = "起止时间", sort = 5)
private String startAndEndTime;
/**
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
index 05beb60..bbf2936 100644
--- 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
@@ -1,6 +1,7 @@
package com.bonus.base.basic.domain.vo;
import com.bonus.base.basic.domain.vo.TtSysUserVo;
+import com.bonus.common.core.annotation.Excel;
import lombok.Data;
import java.util.List;
@@ -16,6 +17,7 @@ public class TtSysTeamVo {
/**
*班组名称
*/
+ @Excel(name = "班组名称", sort = 1)
private String teamName;
/**
@@ -31,6 +33,7 @@ public class TtSysTeamVo {
/**
*参建单位
*/
+ @Excel(name = "参建单位", sort = 2)
private String unitName;
/**
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 042d771..04a6598 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
@@ -1,5 +1,6 @@
package com.bonus.base.basic.domain.vo;
+import com.bonus.common.core.annotation.Excel;
import lombok.Data;
import java.util.Date;
@@ -16,26 +17,31 @@ public class TtSysUserVo {
/**
*用户名称
*/
+ @Excel(name = "用户名称", sort = 1)
private String userName;
/**
*手机号
*/
+ @Excel(name = "手机号", sort = 2)
private String userPhone;
/**
*身份证
*/
+ @Excel(name = "身份证", sort = 3)
private String idCar;
/**
*参建单位
*/
+ @Excel(name = "参建单位", sort = 4)
private String unitId;
/**
*班组
*/
+ @Excel(name = "班组", sort = 5)
private String teamId;
/**
@@ -56,11 +62,13 @@ public class TtSysUserVo {
/**
*出生日期
*/
+ @Excel(name = "出生日期", sort = 6)
private String birthday;
/**
*性别
*/
+ @Excel(name = "性别", sort = 7)
private String sex;
/**
@@ -71,21 +79,25 @@ public class TtSysUserVo {
/**
*地址
*/
+ @Excel(name = "地址", sort = 8)
private String address;
/**
*发证机关
*/
+ @Excel(name = "发证机关", sort = 9)
private String issAuth;
/**
*有效开始日期
*/
+ @Excel(name = "有效开始日期", sort = 10)
private String startTime;
/**
*有效结束日期
*/
+ @Excel(name = "有效结束日期", sort = 11)
private String endTime;
/**
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
index e407e94..fea5b3d 100644
--- 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
@@ -7,4 +7,8 @@ import java.util.List;
public interface TtPersonnelBlackMapper {
List getTtPersonnelBlackList(TtPersonnelBlackReqVo ttPersonnelBlackReqVo);
+
+ void addTtPersonnelBlack(TtPersonnelBlackVo ttPersonnelBlackVo);
+
+ void updateTtPersonnelBlack(TtPersonnelBlackVo ttPersonnelBlackVo);
}
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/IBmFileInfoService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/IBmFileInfoService.java
index 94d19d1..babbff9 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/IBmFileInfoService.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/IBmFileInfoService.java
@@ -6,16 +6,16 @@ import java.util.List;
/**
* 附件
Service接口
- *
+ *
* @author xsheng
* @date 2024-09-26
*/
-public interface IBmFileInfoService
+public interface IBmFileInfoService
{
/**
* 查询附件
- *
+ *
* @param id 附件
主键
* @return 附件
@@ -26,7 +26,7 @@ public interface IBmFileInfoService
/**
* 查询附件
列表
- *
+ *
* @param bmFileInfo 附件
* @return 附件
@@ -37,7 +37,7 @@ public interface IBmFileInfoService
/**
* 新增附件
- *
+ *
* @param bmFileInfo 附件
* @return 结果
@@ -49,7 +49,7 @@ public interface IBmFileInfoService
/**
* 修改附件
- *
+ *
* @param bmFileInfo 附件
* @return 结果
@@ -59,7 +59,7 @@ public interface IBmFileInfoService
/**
* 批量删除附件
- *
+ *
* @param ids 需要删除的附件
主键集合
* @return 结果
@@ -69,10 +69,12 @@ public interface IBmFileInfoService
/**
* 删除附件
信息
- *
+ *
* @param id 附件
主键
* @return 结果
*/
public int deleteBmFileInfoById(Long id);
+
+ int deleteBmFileInfoByBizInfo(BmFileInfo bmFileInfo);
}
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
index 22608cc..a2046c4 100644
--- 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
@@ -6,7 +6,36 @@ import com.bonus.base.basic.domain.vo.TtPersonnelBlackVo;
import java.util.List;
public interface TtPersonnelBlackService {
+
+ /**
+ * 查询人员黑名单列表
+ * @param ttPersonnelBlackReqVo
+ * @return
+ */
List getTtPersonnelBlackList(TtPersonnelBlackReqVo ttPersonnelBlackReqVo);
+ /**
+ * 查询人员黑名单详情
+ * @param ttPersonnelBlackReqVo
+ * @return
+ */
TtPersonnelBlackVo getTtPersonnelBlackById(TtPersonnelBlackReqVo ttPersonnelBlackReqVo);
+
+ /**
+ * 新增人员黑名单
+ * @param ttPersonnelBlackVo
+ */
+ void addTtPersonnelBlack(TtPersonnelBlackVo ttPersonnelBlackVo);
+
+ /**
+ * 修改人员黑名单
+ * @param ttPersonnelBlackVo
+ */
+ void updateTtPersonnelBlack(TtPersonnelBlackVo ttPersonnelBlackVo);
+
+ /**
+ * 删除人员黑名单
+ * @param ttPersonnelBlackVo
+ */
+ void delTtPersonnelBlack(TtPersonnelBlackVo ttPersonnelBlackVo);
}
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
index 8926f26..d15585d 100644
--- 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
@@ -6,13 +6,35 @@ import com.bonus.base.basic.domain.vo.TtSysTeamVo;
import java.util.List;
public interface TtSysTeamService {
+ /**
+ * 查询班组列表
+ * @param ttSysTeamReqVo
+ * @return
+ */
List getTtSysTeamList(TtSysTeamReqVo ttSysTeamReqVo);
+ /**
+ * 新增班组信息
+ * @param ttSysTeamVo
+ */
void addTtSysTeam(TtSysTeamVo ttSysTeamVo);
+ /**
+ * 获取班组详情
+ * @param ttSysTeamReqVo
+ * @return
+ */
TtSysTeamVo getTtSysTeamById(TtSysTeamReqVo ttSysTeamReqVo);
+ /**
+ * 修改班组信息
+ * @param ttSysTeamVo
+ */
void updateTtSysTeam(TtSysTeamVo ttSysTeamVo);
+ /**
+ * 删除班组信息
+ * @param 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
index 828488c..0ad612f 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
@@ -8,21 +8,60 @@ import com.bonus.base.basic.domain.vo.TtSysUserVo;
import java.util.List;
public interface TtSysUserService {
+ /**
+ * 获取班组下面人员信息
+ * @param teamId
+ * @return
+ */
List getTtSysUserVoListByTeamId(String teamId);
+ /**
+ * 绑定和班组的关系
+ * @param ttSysUserVo
+ */
void updateTtSysUserVoByTeam(TtSysUserVo ttSysUserVo);
+ /**
+ * 删除和班组的关系
+ * @param teamId
+ */
void delTtSysUserByTeam(String teamId);
+ /**
+ * 获取人员信息列表
+ * @param ttSysUserReqVo
+ * @return
+ */
List getTtSysUserList(TtSysUserReqVo ttSysUserReqVo);
+ /**
+ * 获取人员详情
+ * @param ttSysUserReqVo
+ * @return
+ */
TtSysUserVo getTtSysUserById(TtSysUserReqVo ttSysUserReqVo);
+ /**
+ * 新增人员信息
+ * @param ttSysUserVo
+ */
void addTtSysUser(TtSysUserVo ttSysUserVo);
+ /**
+ * 修改人员信息
+ * @param ttSysUserVo
+ */
void updateTtSysUser(TtSysUserVo ttSysUserVo);
+ /**
+ * 修改人员状态
+ * @param ttSysUserVo
+ */
void updateTtSysUserStatus(TtSysUserVo ttSysUserVo);
+ /**
+ * 删除人员
+ * @param ttSysUserVo
+ */
void deleteTtSysUser(TtSysUserVo ttSysUserVo);
}
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/BmFileInfoServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/BmFileInfoServiceImpl.java
index 8fd733a..f724fda 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/BmFileInfoServiceImpl.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/BmFileInfoServiceImpl.java
@@ -11,12 +11,12 @@ import java.util.List;
/**
* 附件
Service业务层处理
- *
+ *
* @author xsheng
* @date 2024-09-26
*/
@Service
-public class BmFileInfoServiceImpl implements IBmFileInfoService
+public class BmFileInfoServiceImpl implements IBmFileInfoService
{
@Autowired
private BmFileInfoMapper bmFileInfoMapper;
@@ -24,7 +24,7 @@ public class BmFileInfoServiceImpl implements IBmFileInfoService
/**
* 查询附件
- *
+ *
* @param id 附件
主键
* @return 附件
@@ -39,7 +39,7 @@ public class BmFileInfoServiceImpl implements IBmFileInfoService
/**
* 查询附件
列表
- *
+ *
* @param bmFileInfo 附件
* @return 附件
@@ -54,7 +54,7 @@ public class BmFileInfoServiceImpl implements IBmFileInfoService
/**
* 新增附件
- *
+ *
* @param bmFileInfo 附件
* @return 结果
@@ -76,7 +76,7 @@ public class BmFileInfoServiceImpl implements IBmFileInfoService
/**
* 修改附件
- *
+ *
* @param bmFileInfo 附件
* @return 结果
@@ -90,7 +90,7 @@ public class BmFileInfoServiceImpl implements IBmFileInfoService
/**
* 批量删除附件
- *
+ *
* @param ids 需要删除的附件
主键
* @return 结果
@@ -104,7 +104,7 @@ public class BmFileInfoServiceImpl implements IBmFileInfoService
/**
* 删除附件
信息
- *
+ *
* @param id 附件
主键
* @return 结果
@@ -114,4 +114,9 @@ public class BmFileInfoServiceImpl implements IBmFileInfoService
{
return bmFileInfoMapper.deleteBmFileInfoById(id);
}
+
+ @Override
+ public int deleteBmFileInfoByBizInfo(BmFileInfo bmFileInfo) {
+ return bmFileInfoMapper.deleteBmFileInfoByBizInfo(bmFileInfo);
+ }
}
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
index 65e6928..adb2bd1 100644
--- 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
@@ -7,6 +7,7 @@ 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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -14,7 +15,7 @@ import javax.annotation.Resource;
import java.util.List;
-@Log4j
+@Slf4j
@Service
public class TtPersonnelBlackServiceImpl implements TtPersonnelBlackService {
@@ -24,6 +25,11 @@ public class TtPersonnelBlackServiceImpl implements TtPersonnelBlackService {
@Resource
private IBmFileInfoService bmFileInfoService;
+ /**
+ * 获取黑名单列表
+ * @param ttPersonnelBlackReqVo
+ * @return
+ */
@Override
public List getTtPersonnelBlackList(TtPersonnelBlackReqVo ttPersonnelBlackReqVo) {
//获取黑名单列表
@@ -38,6 +44,11 @@ public class TtPersonnelBlackServiceImpl implements TtPersonnelBlackService {
return TtPersonnelBlackList;
}
+ /**
+ * 查询人员黑名单详情
+ * @param ttPersonnelBlackReqVo
+ * @return
+ */
@Override
public TtPersonnelBlackVo getTtPersonnelBlackById(TtPersonnelBlackReqVo ttPersonnelBlackReqVo) {
TtPersonnelBlackVo ttPersonnelBlackVo = ttPersonnelBlackMapper.getTtPersonnelBlackList(ttPersonnelBlackReqVo).get(0);
@@ -47,4 +58,50 @@ public class TtPersonnelBlackServiceImpl implements TtPersonnelBlackService {
ttPersonnelBlackVo.setBmFileInfoList(bmFileInfoList);
return ttPersonnelBlackVo;
}
+
+ /**
+ * 保存黑名单信息
+ * @param ttPersonnelBlackVo
+ */
+ @Override
+ public void addTtPersonnelBlack(TtPersonnelBlackVo ttPersonnelBlackVo) {
+ //保存黑名单信息
+ ttPersonnelBlackMapper.addTtPersonnelBlack(ttPersonnelBlackVo);
+ //保存附件信息
+ List bmFileInfoList = ttPersonnelBlackVo.getBmFileInfoList();
+ for (BmFileInfo bmFileInfo : bmFileInfoList) {
+ bmFileInfo.setTaskId(ttPersonnelBlackVo.getId());
+ bmFileInfoService.insertBmFileInfo(bmFileInfo);
+ }
+ }
+
+ /**
+ * 修改黑名单信息
+ * @param ttPersonnelBlackVo
+ */
+ @Override
+ public void updateTtPersonnelBlack(TtPersonnelBlackVo ttPersonnelBlackVo) {
+ //修改黑名单信息
+ ttPersonnelBlackMapper.updateTtPersonnelBlack(ttPersonnelBlackVo);
+ //先删除
+ BmFileInfo bmFileInfo = new BmFileInfo();
+ bmFileInfo.setTaskId(ttPersonnelBlackVo.getId());
+ bmFileInfoService.deleteBmFileInfoByBizInfo(bmFileInfo);
+ //保存附件信息
+ List bmFileInfoList = ttPersonnelBlackVo.getBmFileInfoList();
+ for (BmFileInfo bmFileInfoNew : bmFileInfoList) {
+ bmFileInfoNew.setTaskId(ttPersonnelBlackVo.getId());
+ bmFileInfoService.insertBmFileInfo(bmFileInfo);
+ }
+ }
+
+ /**
+ * 删除黑名单信息
+ * @param ttPersonnelBlackVo
+ */
+ @Override
+ public void delTtPersonnelBlack(TtPersonnelBlackVo ttPersonnelBlackVo) {
+ //修改黑名单信息
+ ttPersonnelBlackMapper.updateTtPersonnelBlack(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
index f5a0bfe..4980912 100644
--- 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
@@ -4,13 +4,14 @@ 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 lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
-@Log4j
+@Slf4j
@Service
public class TtPersonnelEntryExitServiceImpl implements TtPersonnelEntryExitService {
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 77e0c37..8a3adba 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
@@ -55,6 +55,11 @@ public class TtSysUserServiceImpl implements TtSysUserService {
ttSysUserMapper.delTtSysUserByTeam(teamId);
}
+ /**
+ * 获取人员信息列表
+ * @param ttSysUserReqVo
+ * @return
+ */
@Override
public List getTtSysUserList(TtSysUserReqVo ttSysUserReqVo) {
//获取热源列表
@@ -67,11 +72,20 @@ public class TtSysUserServiceImpl implements TtSysUserService {
return ttSysUserList;
}
+ /**
+ * 获取人员详情
+ * @param ttSysUserReqVo
+ * @return
+ */
@Override
public TtSysUserVo getTtSysUserById(TtSysUserReqVo ttSysUserReqVo) {
return ttSysUserMapper.getTtSysUserList(ttSysUserReqVo).get(0);
}
+ /**
+ * 新增人员信息
+ * @param ttSysUserVo
+ */
@Override
@Transactional
public void addTtSysUser(TtSysUserVo ttSysUserVo) {
@@ -86,12 +100,20 @@ public class TtSysUserServiceImpl implements TtSysUserService {
ttPersonnelEntryExitService.addTtPersonnelEntryExit(ttPersonnelEntryExitVo);
}
+ /**
+ * 修改人员信息
+ * @param ttSysUserVo
+ */
@Override
public void updateTtSysUser(TtSysUserVo ttSysUserVo) {
//修改用户信息
ttSysUserMapper.updateTtSysUser(ttSysUserVo);
}
+ /**
+ * 修改人员状态
+ * @param ttSysUserVo
+ */
@Override
@Transactional
public void updateTtSysUserStatus(TtSysUserVo ttSysUserVo) {
@@ -108,6 +130,10 @@ public class TtSysUserServiceImpl implements TtSysUserService {
}
}
+ /**
+ * 删除人员
+ * @param ttSysUserVo
+ */
@Override
public void deleteTtSysUser(TtSysUserVo 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
index e760280..aea89f0 100644
--- 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
@@ -3,6 +3,45 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+ insert into tt_personnel_black
+
+ user_name,
+ id_code,
+ lot_id,
+ post,
+ event,
+ start_and_end_time,
+ dept_id,
+ create_time,
+ status
+
+
+ #{userName},
+ #{idCode},
+ #{lotId},
+ #{post},
+ #{event},
+ #{startAndEndTime},
+ #{deptId},
+ NOW(),
+ 0
+
+
+
+ update tt_personnel_black
+
+ user_name = #{userName},
+ id_code = #{idCode},
+ lot_id = #{lotId},
+ post = #{post},
+ event = #{event},
+ start_and_end_time = #{startAndEndTime},
+ status = #{status},
+ dept_id = #{deptId},
+
+ where id = #{id}
+