From 818838f008dfe286b7efe999f2f52d87f9de208e Mon Sep 17 00:00:00 2001 From: Administrator <1923636941@qq.com> Date: Tue, 27 Jun 2023 16:01:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectOperationsAnalysisController.java | 65 +++---- .../ProjectOperationsAnalysisMapper.java | 3 +- .../xml/ProjectOperationsAnalysisMapper.xml | 7 + .../IProjectOperationsAnalysisService.java | 3 +- .../ProjectOperationsAnalysisServiceImpl.java | 4 +- .../controller/WorkerInfoController.java | 7 +- .../WorkerWagesPaymentController.java | 14 +- .../worker/mapper/xml/WorkerInfoMapper.xml | 56 +++++- .../mapper/xml/WorkerSafeEducationMapper.xml | 7 + .../mapper/xml/WorkerWagesPaymentMapper.xml | 175 ++++++++++++------ .../service/IWorkerWagesPaymentService.java | 2 +- .../impl/WorkerWagesPaymentServiceImpl.java | 3 +- 12 files changed, 235 insertions(+), 111 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/controller/ProjectOperationsAnalysisController.java b/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/controller/ProjectOperationsAnalysisController.java index 173fa1a4e..54bf6026f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/controller/ProjectOperationsAnalysisController.java +++ b/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/controller/ProjectOperationsAnalysisController.java @@ -9,18 +9,19 @@ import com.zhgd.xmgl.modules.realnamestatistics.entity.vo.WorkerMonthAttendanceS import com.zhgd.xmgl.modules.realnamestatistics.service.IProjectOperationsAnalysisService; import com.zhgd.xmgl.modules.worker.entity.TeamInfo; import com.zhgd.xmgl.modules.worker.entity.WorkerType; +import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; - +import java.util.HashMap; import java.util.List; import java.util.Map; /** *

- * 前端控制器 + * 前端控制器 *

* * @author ys @@ -33,11 +34,11 @@ public class ProjectOperationsAnalysisController { @Autowired IProjectOperationsAnalysisService projectOperationsAnalysisService; - @ApiOperation(value = " 列表查询项目实名制信息", notes = "列表查询项目实名制信息", httpMethod="GET") + @ApiOperation(value = " 列表查询项目实名制信息", notes = "列表查询项目实名制信息", httpMethod = "GET") @GetMapping(value = "/selectProjectOperationsAnalysisList") - public Map queryByCondition( - @RequestParam(name="projectName",required = false) String projectName) { - return projectOperationsAnalysisService.selectProjectOperationsAnalysisList( projectName); + public Map queryByCondition( + @RequestParam(name = "projectName", required = false) String projectName) { + return projectOperationsAnalysisService.selectProjectOperationsAnalysisList(projectName); } @ApiOperation(notes = "查询所有工种列表", value = "查询所有工种列表", httpMethod = "GET") @@ -57,7 +58,7 @@ public class ProjectOperationsAnalysisController { @ApiOperation(notes = "查询所有班组", value = "查询所有班组", httpMethod = "GET") @GetMapping(value = "/getAllTeamInfo") - public Result> getAllTeamInfo(@RequestParam("projectSn")String projectSn) { + public Result> getAllTeamInfo(@RequestParam("projectSn") String projectSn) { Result> result = new Result<>(); try { List allDepartment = projectOperationsAnalysisService.getAllTeamInfo(projectSn); @@ -71,35 +72,35 @@ public class ProjectOperationsAnalysisController { } @ApiOperation(value = " 查询考勤统计列表", notes = "查询考勤统计列表", httpMethod = "GET") - @GetMapping(value = "/selectAttendanceDetailByPage") - public Result> selectAttendanceDetailByPage(@RequestParam(name = "workerName", required = false) String workerName, - @RequestParam(name = "projectSn", required = false) String projectSn, - @RequestParam(name = "personType", required = false) String personType, - @RequestParam(name = "groupId", required = false) Long groupId, - @RequestParam(name = "workerTypeId", required = false) Long workerTypeId, - @RequestParam(name = "time", required = false) String time, - @RequestParam(name = "queryTime", required = false) String queryTime, - @RequestParam(name = "personSn", required = false) String personSn, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + @ApiImplicitParam(name = "projectSnList", value = "项目SN列表", paramType = "query", required = false, dataType = "String") + @RequestMapping(value = "/selectAttendanceDetailByPage", method = {RequestMethod.GET, RequestMethod.POST}) + public Result> selectAttendanceDetailByPage(@RequestBody(required = false) HashMap map, @RequestParam(name = "workerName", required = false) String workerName, + @RequestParam(name = "projectSn", required = false) String projectSn, + @RequestParam(name = "personType", required = false) String personType, + @RequestParam(name = "groupId", required = false) Long groupId, + @RequestParam(name = "workerTypeId", required = false) Long workerTypeId, + @RequestParam(name = "time", required = false) String time, + @RequestParam(name = "queryTime", required = false) String queryTime, + @RequestParam(name = "personSn", required = false) String personSn, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { Result> result = new Result<>(); - Page list = projectOperationsAnalysisService.selectAttendanceDetailByPage(workerName, projectSn, groupId, workerTypeId, time, queryTime, personSn, pageNo, pageSize, personType); + Page list = projectOperationsAnalysisService.selectAttendanceDetailByPage(map, workerName, projectSn, groupId, workerTypeId, time, queryTime, personSn, pageNo, pageSize, personType); result.setResult(list); result.setSuccess(true); result.setCode(200); return result; } - @ApiOperation(value = " 查询今日出勤考勤统计列表", notes = "查询今日出勤考勤统计列表", httpMethod = "GET") @GetMapping(value = "/selectWorkerTodayAttendancePageList") - public Result> selectWorkerTodayAttendancePageList( - @RequestParam(name = "projectSn", required = true) String projectSn, - @RequestParam(name = "personType", required = true) String personType, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + public Result> selectWorkerTodayAttendancePageList( + @RequestParam(name = "projectSn", required = true) String projectSn, + @RequestParam(name = "personType", required = true) String personType, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { Result> result = new Result<>(); - Page list= projectOperationsAnalysisService.selectWorkerTodayAttendancePageList(projectSn,pageNo,pageSize,personType); + Page list = projectOperationsAnalysisService.selectWorkerTodayAttendancePageList(projectSn, pageNo, pageSize, personType); result.setResult(list); result.setSuccess(true); result.setCode(200); @@ -108,13 +109,13 @@ public class ProjectOperationsAnalysisController { @ApiOperation(value = " 查询具体人员任一天考勤信息", notes = "查询具体人员任一天考勤信息", httpMethod = "GET") @GetMapping(value = "/getWorkerAttendanceByDay") - public Result> getWorkerAttendanceByDay( + public Result> getWorkerAttendanceByDay( @RequestParam(name = "personSn", required = true) String personSn, @RequestParam(name = "time", required = true) String time, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { Result> result = new Result<>(); - Page list= projectOperationsAnalysisService.getWorkerAttendanceByDay(pageNo,pageSize,personSn,time); + Page list = projectOperationsAnalysisService.getWorkerAttendanceByDay(pageNo, pageSize, personSn, time); result.setResult(list); result.setSuccess(true); result.setCode(200); @@ -123,12 +124,12 @@ public class ProjectOperationsAnalysisController { @ApiOperation(value = " 查询具体人员考勤信息", notes = "查询具体人员考勤信息", httpMethod = "GET") @GetMapping(value = "/getWorkerAttendanceDetail") - public Result> getWorkerAttendanceDetail( + public Result> getWorkerAttendanceDetail( @RequestParam(name = "personSn", required = true) String personSn, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { Result> result = new Result<>(); - Page list= projectOperationsAnalysisService.getWorkerAttendanceDetail(pageNo,pageSize,personSn); + Page list = projectOperationsAnalysisService.getWorkerAttendanceDetail(pageNo, pageSize, personSn); result.setResult(list); result.setSuccess(true); result.setCode(200); @@ -137,7 +138,7 @@ public class ProjectOperationsAnalysisController { @ApiOperation(value = " 查询各类型核酸统计列表", notes = "查询今日各类型核酸统计列表", httpMethod = "GET") @GetMapping(value = "/selectWorkerTodayAcidList") - public Result> selectWorkerTodayAcidList( + public Result> selectWorkerTodayAcidList( @RequestParam(name = "projectSn", required = true) String projectSn, @RequestParam(name = "codeState", required = false) String codeState, @RequestParam(name = "workerClassify", required = false) String workerClassify, @@ -146,7 +147,7 @@ public class ProjectOperationsAnalysisController { @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { Result> result = new Result<>(); - Page list= projectOperationsAnalysisService.selectWorkerTodayAcidList(projectSn,pageNo,pageSize,codeState,workerClassify,vaccineStatus,noVaccine); + Page list = projectOperationsAnalysisService.selectWorkerTodayAcidList(projectSn, pageNo, pageSize, codeState, workerClassify, vaccineStatus, noVaccine); result.setResult(list); result.setSuccess(true); result.setCode(200); diff --git a/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/mapper/ProjectOperationsAnalysisMapper.java b/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/mapper/ProjectOperationsAnalysisMapper.java index def3e8f23..7389cb37f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/mapper/ProjectOperationsAnalysisMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/mapper/ProjectOperationsAnalysisMapper.java @@ -9,6 +9,7 @@ import com.zhgd.xmgl.modules.realnamestatistics.entity.vo.WorkerAttendanceVo; import com.zhgd.xmgl.modules.realnamestatistics.entity.vo.WorkerMonthAttendanceStatisticsVo; import org.apache.ibatis.annotations.Param; +import java.util.HashMap; import java.util.List; /** @@ -23,7 +24,7 @@ public interface ProjectOperationsAnalysisMapper extends BaseMapper getAllDetails(); - Page selectAttendanceDetailByPage(Page page, @Param("workerName") String workerName, @Param("projectSn") String projectSn, @Param("groupId") Long groupId, @Param("workerTypeId") Long workerTypeId, @Param("time") String time, @Param("queryTime") String queryTime, @Param("personSn") String personSn, @Param("personType") String personType); + Page selectAttendanceDetailByPage(Page page, @Param("paramMap") HashMap map, @Param("workerName") String workerName, @Param("projectSn") String projectSn, @Param("groupId") Long groupId, @Param("workerTypeId") Long workerTypeId, @Param("time") String time, @Param("queryTime") String queryTime, @Param("personSn") String personSn, @Param("personType") String personType); Page selectWorkerTodayAttendancePageList(Page page, @Param("projectSn") String projectSn); diff --git a/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/mapper/xml/ProjectOperationsAnalysisMapper.xml b/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/mapper/xml/ProjectOperationsAnalysisMapper.xml index 09090643f..bb98cb4ba 100644 --- a/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/mapper/xml/ProjectOperationsAnalysisMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/mapper/xml/ProjectOperationsAnalysisMapper.xml @@ -56,6 +56,13 @@ LEFT JOIN department_info d on d.id=i.department_id LEFT JOIN enterprise_info ei on ei.id=tm.enterprise_id where 1=1 + + and i.project_sn in + + #{item} + + AND i.project_sn=#{projectSn} diff --git a/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/service/IProjectOperationsAnalysisService.java b/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/service/IProjectOperationsAnalysisService.java index 526002387..bad5f37e5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/service/IProjectOperationsAnalysisService.java +++ b/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/service/IProjectOperationsAnalysisService.java @@ -10,6 +10,7 @@ import com.zhgd.xmgl.modules.realnamestatistics.entity.vo.WorkerMonthAttendanceS import com.zhgd.xmgl.modules.worker.entity.TeamInfo; import com.zhgd.xmgl.modules.worker.entity.WorkerType; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -29,7 +30,7 @@ public interface IProjectOperationsAnalysisService extends IService getAllWorkerType(String projectSn); - Page selectAttendanceDetailByPage(String workerName, String projectSn, Long groupId, Long workerTypeId, String time, String queryTime, String personSn, Integer pageNo, Integer pageSize, String personnelType); + Page selectAttendanceDetailByPage(HashMap map, String workerName, String projectSn, Long groupId, Long workerTypeId, String time, String queryTime, String personSn, Integer pageNo, Integer pageSize, String personnelType); Page selectWorkerTodayAttendancePageList(String projectSn, Integer pageNo, Integer pageSize, String personType); diff --git a/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/service/impl/ProjectOperationsAnalysisServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/service/impl/ProjectOperationsAnalysisServiceImpl.java index 6ffa8dac0..da1380880 100644 --- a/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/service/impl/ProjectOperationsAnalysisServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/service/impl/ProjectOperationsAnalysisServiceImpl.java @@ -140,9 +140,9 @@ public class ProjectOperationsAnalysisServiceImpl extends ServiceImpl selectAttendanceDetailByPage(String workerName, String projectSn, Long groupId, Long workerTypeId, String time, String queryTime, String personSn, Integer pageNo, Integer pageSize, String personType) { + public Page selectAttendanceDetailByPage(HashMap map, String workerName, String projectSn, Long groupId, Long workerTypeId, String time, String queryTime, String personSn, Integer pageNo, Integer pageSize, String personType) { Page page = new Page<>(pageNo, pageSize); - return baseMapper.selectAttendanceDetailByPage(page, workerName, projectSn, groupId, workerTypeId, time, queryTime, personSn, personType); + return baseMapper.selectAttendanceDetailByPage(page, map, workerName, projectSn, groupId, workerTypeId, time, queryTime, personSn, personType); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java index 33ec51627..6de8f4a44 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java @@ -139,6 +139,7 @@ public class WorkerInfoController { @ApiImplicitParam(name = "leaderName", value = "负责人姓名（班组）", paramType = "query", required = false, dataType = "String"), @ApiImplicitParam(name = "chargePersonName", value = "负责人姓名（部门）", paramType = "query", required = false, dataType = "String"), @ApiImplicitParam(name = "belongingSection", value = "所属标段（部门）", paramType = "query", required = false, dataType = "String"), + @ApiImplicitParam(name = "projectSnList", value = "项目SN列表", paramType = "query", required = false, dataType = "String"), }) @PostMapping(value = "/selectWorkerInfoList") public Result> selectWorkerInfoList(@RequestBody Map map) { @@ -280,6 +281,7 @@ public class WorkerInfoController { @ApiOperation(value = "人员总览人员类型和教育统计", notes = "人员总览人员类型和教育统计") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String"), + @ApiImplicitParam(name = "projectSnList", value = "项目SN列表", paramType = "query", required = false, dataType = "String"), @ApiImplicitParam(name = "userEnterpriseId", value = "用户能查看的企业", paramType = "query", required = false, dataType = "String"), }) @PostMapping("/selectPersonTypeAndEduStatistics") @@ -347,8 +349,9 @@ public class WorkerInfoController { } @ApiOperation(value = "统计按工种分布的人员数量", notes = "统计按工种分布的人员数量") - @GetMapping("/countWorkerNumGroupByWorkerType") - public Result> countWorkerNumGroupByWorkerType(@RequestParam Map map) { + @ApiImplicitParam(name = "projectSnList", value = "项目SN列表", paramType = "query", required = false, dataType = "String") + @PostMapping("/countWorkerNumGroupByWorkerType") + public Result> countWorkerNumGroupByWorkerType(@RequestBody Map map) { return Result.success(workerInfoService.countWorkerNumGroupByWorkerType(map)); } 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 bc89b5011..ad85b9de1 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 @@ -81,6 +81,7 @@ public class WorkerWagesPaymentController { @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = false, dataType = "String"), @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "projectSnList", value = "项目SN列表", paramType = "query", required = false, dataType = "String"), }) @PostMapping(value = "/selectWorkerWagesPaymentPageList") public Result> selectWorkerWagesPaymentPageList(@RequestBody Map map) { @@ -388,11 +389,14 @@ 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()); + @ApiOperation(value = "薪资发放情况", notes = "薪资发放情况", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "payMonth", value = "工资发放月份 格式2022-05", paramType = "query", required = true, dataType = "String"), + @ApiImplicitParam(name = "projectSnList", value = "项目SN列表", paramType = "query", required = false, dataType = "String"), + }) + @PostMapping(value = "/getPaymentStatistics") + public Result getPaymentStatistics(@RequestBody HashMap map) { + return Result.success(workerWagesPaymentService.getPaymentStatistics(map)); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml index a856af166..7e7bda183 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml @@ -51,6 +51,13 @@ and a.project_sn = #{param.projectSn} + + and a.project_sn in + + #{item} + + and a.worker_name like CONCAT(CONCAT('%', #{param.workerName}), '%') @@ -362,6 +369,13 @@ and FIND_IN_SET(w1.enterprise_id, #{userEnterpriseId}) + + and w1.project_sn in + + #{item} + + @@ -822,17 +843,24 @@ WHERE p.create_time >= CONCAT(DATE_FORMAT(now(), "%Y-%m-%d"), ' 00:00:00') and w1.inService_type = 1 AND w1.person_type = 1 - and w1.project_sn = #{projectSn} + + and w1.project_sn = #{projectSn} + group by w1.team_id ) tp ON e.id = tp.team_id LEFT JOIN (SELECT w1.team_id, COUNT(DISTINCT w1.person_sn) total_person_num FROM worker_info w1 where w1.inService_type = 1 AND w1.person_type = 1 - and w1.project_sn = #{projectSn} + + and w1.project_sn = #{projectSn} + group by w1.team_id ) tp2 ON e.id = tp2.team_id - WHERE e.project_sn = #{projectSn} + WHERE 1=1 + + and e.project_sn = #{projectSn} + order by attendance_person_num desc LIMIT 10 SELECT wt.type_name AS typeName, - count(wi.id) AS num + count(wi.id) AS num FROM worker_type wt - LEFT JOIN team_info ti ON wt.id = ti.worker_type_id - LEFT JOIN worker_info wi ON (ti.id = wi.team_id and wi.inService_type = 1) + LEFT JOIN team_info ti ON wt.id = ti.worker_type_id + LEFT JOIN worker_info wi ON (ti.id = wi.team_id and wi.inService_type = 1) + + and wt.project_sn in + + #{item} + + GROUP BY wt.type_name diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerSafeEducationMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerSafeEducationMapper.xml index c075df0ad..4b70116f4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerSafeEducationMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerSafeEducationMapper.xml @@ -171,6 +171,13 @@ and w3.project_sn = #{projectSn} + + and w3.project_sn in + + #{item} + + and FIND_IN_SET(w3.enterprise_id, #{userEnterpriseId}) 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 a7356cbce..c7b1d594e 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 @@ -1,79 +1,123 @@ - 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 21aa3c105..8028e06f8 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 @@ -28,5 +28,5 @@ public interface IWorkerWagesPaymentService extends IService Result uploadWagesPaymentExcel(MultipartFile excelFile, String projectSn); - PaymentStatisticsVo getPaymentStatistics(); + PaymentStatisticsVo getPaymentStatistics(HashMap map); } 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 9988d3644..486b3f413 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 @@ -142,8 +142,7 @@ public class WorkerWagesPaymentServiceImpl extends ServiceImpl map = new HashMap<>(); + public PaymentStatisticsVo getPaymentStatistics(HashMap map) { getPayMonth(map); PaymentStatisticsVo vo = workerWagesPaymentMapper.getProjectPaymentStatistics(map); PaymentStatisticsVo userVo = workerWagesPaymentMapper.getUserPaymentStatistics(map);