From c69fd3e6c5cb55c2eb00eca8484132fe7f65092d Mon Sep 17 00:00:00 2001 From: GUO <1923636941@qq.com> Date: Fri, 23 Jun 2023 19:23:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E5=8F=91=E6=94=BE=E6=83=85?= =?UTF-8?q?=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorkerWagesPaymentController.java | 17 ++++-- .../worker/entity/vo/PaymentStatisticsVo.java | 18 +++++++ .../mapper/WorkerWagesPaymentMapper.java | 6 +++ .../mapper/xml/WorkerWagesPaymentMapper.xml | 52 +++++++++++++------ .../service/IWorkerWagesPaymentService.java | 3 ++ .../impl/WorkerWagesPaymentServiceImpl.java | 27 ++++++++-- 6 files changed, 97 insertions(+), 26 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/PaymentStatisticsVo.java diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerWagesPaymentController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerWagesPaymentController.java index decd8abe1..2f775129a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerWagesPaymentController.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerWagesPaymentController.java @@ -13,6 +13,7 @@ import com.zhgd.jeecg.common.util.DateUtil; import com.zhgd.xmgl.modules.project.entity.Project; import com.zhgd.xmgl.modules.project.service.IProjectService; import com.zhgd.xmgl.modules.worker.entity.WorkerWagesPayment; +import com.zhgd.xmgl.modules.worker.entity.vo.PaymentStatisticsVo; import com.zhgd.xmgl.modules.worker.service.IWorkerMonthAttendanceStatisticsService; import com.zhgd.xmgl.modules.worker.service.IWorkerWagesPaymentService; import com.zhgd.xmgl.pdf.MyHeaderFooter2; @@ -97,9 +98,9 @@ public class WorkerWagesPaymentController { workerWagesPaymentService.updateWorkerWagesPayment(workerWagesPayment); return Result.ok(); } - - + + /** * 通过id删除 * @param @@ -119,10 +120,10 @@ public class WorkerWagesPaymentController { result.successMsg(MessageUtil.get("deleteSucess")); } } - + return result; } - + /** * 通过id查询 * @param @@ -386,4 +387,12 @@ public class WorkerWagesPaymentController { } return JSONUtil.toJsonStr(result); } + + @ApiOperation(value = "薪资发放情况", notes = "薪资发放情况", httpMethod = "GET") + @ApiImplicitParam(name = "payMonth", value = "工资发放月份 格式2022-05", paramType = "query", required = true, dataType = "String") + @GetMapping(value = "/getPaymentStatistics") + public Result getPaymentStatistics() { + return Result.success(workerWagesPaymentService.getPaymentStatistics()); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/PaymentStatisticsVo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/PaymentStatisticsVo.java new file mode 100644 index 000000000..889ef8962 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/PaymentStatisticsVo.java @@ -0,0 +1,18 @@ +package com.zhgd.xmgl.modules.worker.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class PaymentStatisticsVo { + @ApiModelProperty(value = "已发放项目数量") + private Integer unpaidProjectNum; + @ApiModelProperty(value = "未发放项目数量") + private Integer paidProjectNum; + @ApiModelProperty(value = "未发人员数量") + private Integer unpaidUserNum; + @ApiModelProperty(value = "已发人员数量") + private Integer paidUserNum; + @ApiModelProperty(value = "发放异常人员数量") + private Integer paidUserExceptionNum; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerWagesPaymentMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerWagesPaymentMapper.java index c32af647f..ccf66066e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerWagesPaymentMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerWagesPaymentMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.worker.entity.WorkerWagesPayment; +import com.zhgd.xmgl.modules.worker.entity.vo.PaymentStatisticsVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -25,4 +26,9 @@ public interface WorkerWagesPaymentMapper extends BaseMapper List selectWorkerWagesPaymentPageList(Page page, @Param("param")Map map); List selectWorkerWagesPaymentDataList(HashMap param); + + PaymentStatisticsVo getProjectPaymentStatistics(HashMap map); + + PaymentStatisticsVo getUserPaymentStatistics(HashMap map); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerWagesPaymentMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerWagesPaymentMapper.xml index ab71a68d8..9bee91f18 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerWagesPaymentMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerWagesPaymentMapper.xml @@ -3,10 +3,12 @@ - \ No newline at end of file + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerWagesPaymentService.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerWagesPaymentService.java index a9f8a52f3..21aa3c105 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerWagesPaymentService.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerWagesPaymentService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.worker.entity.WorkerWagesPayment; +import com.zhgd.xmgl.modules.worker.entity.vo.PaymentStatisticsVo; import org.springframework.web.multipart.MultipartFile; import java.util.HashMap; @@ -26,4 +27,6 @@ public interface IWorkerWagesPaymentService extends IService List selectWorkerWagesPaymentDataList(HashMap param); Result uploadWagesPaymentExcel(MultipartFile excelFile, String projectSn); + + PaymentStatisticsVo getPaymentStatistics(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerWagesPaymentServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerWagesPaymentServiceImpl.java index 4bc7c04f6..9988d3644 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerWagesPaymentServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerWagesPaymentServiceImpl.java @@ -9,6 +9,7 @@ import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.worker.entity.WorkerWagesPayment; +import com.zhgd.xmgl.modules.worker.entity.vo.PaymentStatisticsVo; import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper; import com.zhgd.xmgl.modules.worker.mapper.WorkerWagesPaymentMapper; import com.zhgd.xmgl.modules.worker.service.IWorkerWagesPaymentService; @@ -43,6 +44,15 @@ public class WorkerWagesPaymentServiceImpl extends ServiceImpl selectWorkerWagesPaymentPageList(Map map) { + getPayMonth(map); + int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString()); + int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString()); + Page page = new Page<>(pageNo, pageSize); + List list=workerWagesPaymentMapper.selectWorkerWagesPaymentPageList(page, map); + return page.setRecords(list); + } + + private void getPayMonth(Map map) { String payMonth= MapUtils.getString(map,"payMonth"); //工资发放记录默认查询上个月，且只能一个月的查询 if(StringUtils.isEmpty(payMonth)){ @@ -54,11 +64,6 @@ public class WorkerWagesPaymentServiceImpl extends ServiceImpl page = new Page<>(pageNo, pageSize); - List list=workerWagesPaymentMapper.selectWorkerWagesPaymentPageList(page, map); - return page.setRecords(list); } @Override @@ -135,4 +140,16 @@ public class WorkerWagesPaymentServiceImpl extends ServiceImpl map = new HashMap<>(); + getPayMonth(map); + PaymentStatisticsVo vo = workerWagesPaymentMapper.getProjectPaymentStatistics(map); + PaymentStatisticsVo userVo = workerWagesPaymentMapper.getUserPaymentStatistics(map); + vo.setPaidUserNum(userVo.getPaidUserNum()); + vo.setUnpaidUserNum(userVo.getUnpaidUserNum()); + vo.setPaidUserExceptionNum(0); + return vo; + } }