From 6113f6279a2b34be7d8d133476efc9b4ebb7dbd7 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Mon, 30 Jun 2025 17:49:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=BB=91=E5=90=8D=E5=8D=95?= =?UTF-8?q?=E9=80=80=E5=9C=BA=E3=80=81=E8=80=83=E5=8B=A4v2bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bigdevice/entity/TunnelBoringMachine.java | 18 +-- .../controller/WorkerBlacklistController.java | 136 +++++++++--------- .../worker/entity/WorkerAttendanceRuleV2.java | 6 + .../worker/entity/WorkerBlacklist.java | 6 +- .../mapper/xml/WorkerBlacklistMapper.xml | 5 +- .../worker/mapper/xml/WorkerInfoMapper.xml | 3 + .../service/IWorkerBlacklistService.java | 3 + .../WorkerAttendanceRuleV2ServiceImpl.java | 18 ++- .../impl/WorkerBlacklistServiceImpl.java | 86 +++++++---- ...ailyAttendanceStatisticsV2ServiceImpl.java | 96 ++++++++----- 10 files changed, 235 insertions(+), 142 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/TunnelBoringMachine.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/TunnelBoringMachine.java index 2421e2efc..0a9eedf3a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/TunnelBoringMachine.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/TunnelBoringMachine.java @@ -1,20 +1,20 @@ package com.zhgd.xmgl.modules.bigdevice.entity; -import java.io.Serializable; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.zhgd.jeecg.common.mybatis.EntityMap; -import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; +import com.zhgd.jeecg.common.mybatis.EntityMap; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; /** * @Description: 盾构机设备 @@ -75,6 +75,8 @@ public class TunnelBoringMachine implements Serializable { */ @Excel(name = "进洞时间", width = 15) @ApiModelProperty(value = "进洞时间") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date installationTime; /** * 安装图片 diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerBlacklistController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerBlacklistController.java index f36f97c40..3dc3828de 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerBlacklistController.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerBlacklistController.java @@ -5,6 +5,7 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.worker.entity.WorkerBlacklist; import com.zhgd.xmgl.modules.worker.service.IWorkerBlacklistService; +import com.zhgd.xmgl.modules.worker.service.impl.WorkerInfoServiceImpl; import com.zhgd.xmgl.util.MessageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -13,7 +14,11 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.context.annotation.Lazy; +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 java.util.Map; @@ -22,7 +27,7 @@ import java.util.Map; * @Title: Controller * @Description: 人员黑名单 * @author： pds - * @date： 2020-11-23 + * @date： 2020-11-23 * @version： V1.0 */ @RestController @@ -30,14 +35,19 @@ import java.util.Map; @Slf4j @Api(tags = "人员黑名单") public class WorkerBlacklistController { - @Autowired - private IWorkerBlacklistService workerBlacklistService; + @Lazy + @Autowired + WorkerInfoServiceImpl workerInfoService; + @Lazy + @Autowired + private IWorkerBlacklistService workerBlacklistService; - /** - * 分页列表查询 - * @return - */ - @ApiOperation(value = "分页列表查询人员黑名单信息", notes = "分页列表查询人员黑名单信息", httpMethod = "POST") + /** + * 分页列表查询 + * + * @return + */ + @ApiOperation(value = "分页列表查询人员黑名单信息", notes = "分页列表查询人员黑名单信息", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "workerName", value = "姓名", paramType = "body", required = false, dataType = "String"), @ApiImplicitParam(name = "userEnterpriseId", value = "用户能查看的企业", paramType = "body", required = false, dataType = "String"), @@ -45,96 +55,88 @@ public class WorkerBlacklistController { @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "body", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"), }) - @PostMapping(value = "/list") - public Result> queryPageList(@RequestBody Map map) { - Result> result = new Result>(); - IPage pageList = workerBlacklistService.selectWorkerBlacklistPage(map); - result.setSuccess(true); - result.setResult(pageList); - return result; - } + @PostMapping(value = "/list") + public Result> queryPageList(@RequestBody Map map) { + Result> result = new Result>(); + IPage pageList = workerBlacklistService.selectWorkerBlacklistPage(map); + result.setSuccess(true); + result.setResult(pageList); + return result; + } /** - * 添加 + * 添加 + * * @param workerBlacklist * @return */ @OperLog(operModul = "劳务管理", operType = "添加人员黑名单信息", operDesc = "添加人员黑名单信息") @ApiOperation(value = "添加人员黑名单信息", notes = "添加人员黑名单信息", httpMethod = "POST") @PostMapping(value = "/add") - public Result add(@RequestBody WorkerBlacklist workerBlacklist) { + public Result add(@RequestBody WorkerBlacklist workerBlacklist) { workerBlacklistService.addWorkerBlacklist(workerBlacklist); - return Result.ok(); - } + return Result.ok(); + } /** - * 编辑 + * 编辑 + * * @param workerBlacklist * @return */ - @OperLog(operModul = "劳务管理",operType = "编辑人员黑名单信息",operDesc = "编辑人员黑名单信息") - @ApiOperation(value = "编辑人员黑名单信息", notes = "编辑人员黑名单信息" , httpMethod="POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody WorkerBlacklist workerBlacklist) { - Result result = new Result(); - WorkerBlacklist workerBlacklistEntity = workerBlacklistService.getById(workerBlacklist.getId()); - if(workerBlacklistEntity==null) { - result.error500(MessageUtil.get("notFindErr")); - }else { - boolean ok = workerBlacklistService.updateById(workerBlacklist); - - if(ok) { - result.successMsg(MessageUtil.get("editSucess")); - } - } - - return result; - } + @OperLog(operModul = "劳务管理", operType = "编辑人员黑名单信息", operDesc = "编辑人员黑名单信息") + @ApiOperation(value = "编辑人员黑名单信息", notes = "编辑人员黑名单信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody WorkerBlacklist workerBlacklist) { + return Result.success(workerBlacklistService.edit(workerBlacklist)); + } /** - * 通过id删除 + * 通过id删除 + * * @param * @return */ - @OperLog(operModul = "劳务管理",operType = "删除人员黑名单信息",operDesc = "删除人员黑名单信息") + @OperLog(operModul = "劳务管理", operType = "删除人员黑名单信息", operDesc = "删除人员黑名单信息") @ApiOperation(value = "删除人员黑名单信息", notes = "删除人员黑名单信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "人员黑名单ID", paramType = "body", required = true, dataType = "Integer") @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { - Result result = new Result(); - WorkerBlacklist workerBlacklist = workerBlacklistService.getById(MapUtils.getString(map,"id")); - if(workerBlacklist==null) { + public Result delete(@RequestBody Map map) { + Result result = new Result(); + WorkerBlacklist workerBlacklist = workerBlacklistService.getById(MapUtils.getString(map, "id")); + if (workerBlacklist == null) { result.error500(MessageUtil.get("notFindErr")); - }else { - boolean ok = workerBlacklistService.removeById(MapUtils.getString(map,"id")); - if(ok) { + } else { + boolean ok = workerBlacklistService.removeById(MapUtils.getString(map, "id")); + if (ok) { result.successMsg(MessageUtil.get("deleteSucess")); - } - } + } + } return result; - } + } /** - * 通过id查询 - * @param - * @return - */ + * 通过id查询 + * + * @param + * @return + */ @ApiOperation(value = "通过id查询人员黑名单信息", notes = "通过id查询人员黑名单信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "人员黑名单ID", paramType = "body", required = true, dataType = "Integer") @PostMapping(value = "/queryById") - public Result queryById(@RequestBody Map map) { - Result result = new Result(); - WorkerBlacklist workerBlacklist = workerBlacklistService.getById(MapUtils.getString(map,"id")); - if(workerBlacklist==null) { + public Result queryById(@RequestBody Map map) { + Result result = new Result(); + WorkerBlacklist workerBlacklist = workerBlacklistService.getById(MapUtils.getString(map, "id")); + if (workerBlacklist == null) { result.error500(MessageUtil.get("notFindErr")); - }else { - result.setResult(workerBlacklist); - result.setSuccess(true); - } - return result; - } + } else { + result.setResult(workerBlacklist); + result.setSuccess(true); + } + return result; + } @ApiOperation(value = "黑名单人员统计", notes = "黑名单人员统计") @@ -142,7 +144,7 @@ public class WorkerBlacklistController { @ApiImplicitParam(name = "sn", value = "项目SN", paramType = "body", required = true, dataType = "String"), }) @PostMapping("/selectWorkerBlacklistStatistics") - public Result> selectWorkerBlacklistStatistics(@RequestBody Map map) { + public Result> selectWorkerBlacklistStatistics(@RequestBody Map map) { return Result.success(workerBlacklistService.selectWorkerBlacklistStatistics(map)); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerAttendanceRuleV2.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerAttendanceRuleV2.java index 43cdf8363..347dce3de 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerAttendanceRuleV2.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerAttendanceRuleV2.java @@ -3,9 +3,11 @@ package com.zhgd.xmgl.modules.worker.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; @@ -107,11 +109,15 @@ public class WorkerAttendanceRuleV2 implements Serializable { * 加班工时时间段开始 */ @ApiModelProperty(value = "加班工时时间段开始") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private java.util.Date overtimeHourStart; /** * 加班工时时间段结束 */ @ApiModelProperty(value = "加班工时时间段结束") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private java.util.Date overtimeHourEnd; /** * 加班工日计算方式：1:工时段换算工日;2:比例换算工日; diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerBlacklist.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerBlacklist.java index 647fc42e6..6967c1025 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerBlacklist.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerBlacklist.java @@ -42,7 +42,6 @@ public class WorkerBlacklist implements Serializable { */ @Excel(name = "人员ID", width = 15) @ApiModelProperty(value = "人员ID") - private java.lang.Long workerId; /** * 姓名 @@ -84,6 +83,11 @@ public class WorkerBlacklist implements Serializable { private java.util.Date createTime; @ApiModelProperty(value = "类型：1证书过期2合同过期3保险过期") private java.lang.Integer type; + /** + * 1是将人员退场0不将人员退场 + */ + @ApiModelProperty(value = "1是将人员退场0不将人员退场") + private java.lang.Integer isExit; @TableField(exist = false) @ApiModelProperty(value = "考勤考号") diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerBlacklistMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerBlacklistMapper.xml index d00c6a6ae..4acc147bb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerBlacklistMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerBlacklistMapper.xml @@ -51,7 +51,10 @@ GROUP BY t1.id