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 6de8f4a44..993f40a83 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 @@ -476,7 +476,7 @@ public class WorkerInfoController { @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = false, dataType = "String"), @ApiImplicitParam(name = "projectSns", value = "项目SNS", paramType = "query", required = false, dataType = "String"), @ApiImplicitParam(name = "startDate", value = "开始时间,yyyy-MM-dd", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "endDate", value = "结束时间,yyyy-MM-dd", paramType = "query", dataType = "String") + @ApiImplicitParam(name = "endDate", value = "结束时间,yyyy-MM-dd", paramType = "query", dataType = "String"), }) @GetMapping(value = "/getDeclareAge") public Result getDeclareAge(String projectSn, String startDate, String endDate, String projectSns) { @@ -585,9 +585,10 @@ public class WorkerInfoController { * * @return */ - @GetMapping("/queryThePresenceAndTotalNumberOfEngineeringPersonnel") - public Result queryThePresenceAndTotalNumberOfEngineeringPersonnel() { - return Result.success(workerInfoService.queryThePresenceAndTotalNumberOfEngineeringPersonnel()); + @PostMapping("/queryThePresenceAndTotalNumberOfEngineeringPersonnel") + @ApiImplicitParam(name = "projectSnList", value = "项目SN列表", paramType = "query", required = false, dataType = "String") + public Result queryThePresenceAndTotalNumberOfEngineeringPersonnel(@RequestBody Map map) { + return Result.success(workerInfoService.queryThePresenceAndTotalNumberOfEngineeringPersonnel(map)); } /** diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java index 6293473f2..aa9c9b47f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java @@ -223,9 +223,9 @@ public interface WorkerInfoMapper extends BaseMapper { IPage getWorkerInfoDetails(Page p, String projectSn); - List queryPresentNum(); + List queryPresentNum(@Param("paramMap") Map paramMap); - List queryTotalNum(); + List queryTotalNum(@Param("paramMap") Map paramMap); List countWorkerNumGroupByWorkerType(Map 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 7e7bda183..6d1efcc6d 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 @@ -2320,8 +2320,15 @@ resultType="com.zhgd.xmgl.modules.worker.entity.vo.PresenceAndTotalNumberOfEngineeringPersonnelVo$Count"> select IFNULL(sum(if(w1.inService_type = 1, 1, 0)), 0) presentNum, a.project_name, 0 peopleNum from worker_info w1 - INNER JOIN project a ON w1.project_sn = a.project_sn - INNER JOIN worker_attendance_presence p ON w1.person_sn = p.person_sn + INNER JOIN project a ON w1.project_sn = a.project_sn + INNER JOIN worker_attendance_presence p ON w1.person_sn = p.person_sn + + and w1.project_sn in + + #{item} + + group by w1.project_sn @@ -2329,7 +2336,14 @@ resultType="com.zhgd.xmgl.modules.worker.entity.vo.PresenceAndTotalNumberOfEngineeringPersonnelVo$Count"> select IFNULL(sum(if(w1.inService_type = 1, 1, 0)), 0) peopleNum, a.project_name, 0 presentNum from worker_info w1 - INNER JOIN project a ON w1.project_sn = a.project_sn + INNER JOIN project a ON w1.project_sn = a.project_sn + + and w1.project_sn in + + #{item} + + group by w1.project_sn diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoService.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoService.java index 3bf715626..108734d17 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoService.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoService.java @@ -114,7 +114,7 @@ public interface IWorkerInfoService extends IService { Result> getWorkerInfoDetails(Integer pageNo, Integer pageSize, String projectSn); - PresenceAndTotalNumberOfEngineeringPersonnelVo queryThePresenceAndTotalNumberOfEngineeringPersonnel(); + PresenceAndTotalNumberOfEngineeringPersonnelVo queryThePresenceAndTotalNumberOfEngineeringPersonnel(Map map); List countWorkerNumGroupByWorkerType(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java index c1371e3a6..d38803fbe 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java @@ -1687,9 +1687,9 @@ public class WorkerInfoServiceImpl extends ServiceImpl presentCountList = workerInfoMapper.queryPresentNum(); - List totalCountList = workerInfoMapper.queryTotalNum(); + public PresenceAndTotalNumberOfEngineeringPersonnelVo queryThePresenceAndTotalNumberOfEngineeringPersonnel(Map paramMap) { + List presentCountList = workerInfoMapper.queryPresentNum(paramMap); + List totalCountList = workerInfoMapper.queryTotalNum(paramMap); presentCountList.addAll(totalCountList); HashMap map = new HashMap<>(); for (PresenceAndTotalNumberOfEngineeringPersonnelVo.Count count : presentCountList) {