admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
Administrator 2023-06-27 16:41:37 +08:00
parent 818838f008
commit ecd766b2f7
5 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java
View File

@ -476,7 +476,7 @@ public class WorkerInfoController {
@ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = false, dataType = "String"), @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = false, dataType = "String"),
@ApiImplicitParam(name = "projectSns", value = "项目SNS", 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 = "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") @GetMapping(value = "/getDeclareAge")
public Result<DeclareAgeVO> getDeclareAge(String projectSn, String startDate, String endDate, String projectSns) { public Result<DeclareAgeVO> getDeclareAge(String projectSn, String startDate, String endDate, String projectSns) {
@ -585,9 +585,10 @@ public class WorkerInfoController {
* *
* @return * @return
*/ */
@GetMapping("/queryThePresenceAndTotalNumberOfEngineeringPersonnel") @PostMapping("/queryThePresenceAndTotalNumberOfEngineeringPersonnel")
public Result<PresenceAndTotalNumberOfEngineeringPersonnelVo> queryThePresenceAndTotalNumberOfEngineeringPersonnel() { @ApiImplicitParam(name = "projectSnList", value = "项目SN列表", paramType = "query", required = false, dataType = "String")
return Result.success(workerInfoService.queryThePresenceAndTotalNumberOfEngineeringPersonnel()); public Result<PresenceAndTotalNumberOfEngineeringPersonnelVo> queryThePresenceAndTotalNumberOfEngineeringPersonnel(@RequestBody Map<String, Object> map) {
return Result.success(workerInfoService.queryThePresenceAndTotalNumberOfEngineeringPersonnel(map));
} }
/** /**

4
src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java
View File

@ -223,9 +223,9 @@ public interface WorkerInfoMapper extends BaseMapper<WorkerInfo> {
IPage<WorkerInfoDetailsVo> getWorkerInfoDetails(Page<WorkerInfoDetailsVo> p, String projectSn); IPage<WorkerInfoDetailsVo> getWorkerInfoDetails(Page<WorkerInfoDetailsVo> p, String projectSn);
List<PresenceAndTotalNumberOfEngineeringPersonnelVo.Count> queryPresentNum(); List<PresenceAndTotalNumberOfEngineeringPersonnelVo.Count> queryPresentNum(@Param("paramMap") Map<String, Object> paramMap);
List<PresenceAndTotalNumberOfEngineeringPersonnelVo.Count> queryTotalNum(); List<PresenceAndTotalNumberOfEngineeringPersonnelVo.Count> queryTotalNum(@Param("paramMap") Map<String, Object> paramMap);
List<TypeNumVo> countWorkerNumGroupByWorkerType(Map<String, Object> map); List<TypeNumVo> countWorkerNumGroupByWorkerType(Map<String, Object> map);

20
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
View File

@ -2320,8 +2320,15 @@
resultType="com.zhgd.xmgl.modules.worker.entity.vo.PresenceAndTotalNumberOfEngineeringPersonnelVo$Count"> 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 select IFNULL(sum(if(w1.inService_type = 1, 1, 0)), 0) presentNum, a.project_name, 0 peopleNum
from worker_info w1 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
INNER JOIN worker_attendance_presence p ON w1.person_sn = p.person_sn INNER JOIN worker_attendance_presence p ON w1.person_sn = p.person_sn
<if test="paramMap.projectSnList != null and paramMap.projectSnList != ''">
and w1.project_sn in
<foreach collection="paramMap.projectSnList" item="item" index="index"
separator="," open="(" close=")">
#{item}
</foreach>
</if>
group by w1.project_sn group by w1.project_sn
</select> </select>
@ -2329,7 +2336,14 @@
resultType="com.zhgd.xmgl.modules.worker.entity.vo.PresenceAndTotalNumberOfEngineeringPersonnelVo$Count"> 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 select IFNULL(sum(if(w1.inService_type = 1, 1, 0)), 0) peopleNum, a.project_name, 0 presentNum
from worker_info w1 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
<if test="paramMap.projectSnList != null and paramMap.projectSnList != ''">
and w1.project_sn in
<foreach collection="paramMap.projectSnList" item="item" index="index"
separator="," open="(" close=")">
#{item}
</foreach>
</if>
group by w1.project_sn group by w1.project_sn
</select> </select>

2
src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoService.java
View File

@ -114,7 +114,7 @@ public interface IWorkerInfoService extends IService<WorkerInfo> {
Result<IPage<WorkerInfoDetailsVo>> getWorkerInfoDetails(Integer pageNo, Integer pageSize, String projectSn); Result<IPage<WorkerInfoDetailsVo>> getWorkerInfoDetails(Integer pageNo, Integer pageSize, String projectSn);
PresenceAndTotalNumberOfEngineeringPersonnelVo queryThePresenceAndTotalNumberOfEngineeringPersonnel(); PresenceAndTotalNumberOfEngineeringPersonnelVo queryThePresenceAndTotalNumberOfEngineeringPersonnel(Map<String, Object> map);
List<TypeNumVo> countWorkerNumGroupByWorkerType(Map<String, Object> map); List<TypeNumVo> countWorkerNumGroupByWorkerType(Map<String, Object> map);

6
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
View File

@ -1687,9 +1687,9 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
} }
@Override @Override
public PresenceAndTotalNumberOfEngineeringPersonnelVo queryThePresenceAndTotalNumberOfEngineeringPersonnel() { public PresenceAndTotalNumberOfEngineeringPersonnelVo queryThePresenceAndTotalNumberOfEngineeringPersonnel(Map<String, Object> paramMap) {
List<PresenceAndTotalNumberOfEngineeringPersonnelVo.Count> presentCountList = workerInfoMapper.queryPresentNum(); List<PresenceAndTotalNumberOfEngineeringPersonnelVo.Count> presentCountList = workerInfoMapper.queryPresentNum(paramMap);
List<PresenceAndTotalNumberOfEngineeringPersonnelVo.Count> totalCountList = workerInfoMapper.queryTotalNum(); List<PresenceAndTotalNumberOfEngineeringPersonnelVo.Count> totalCountList = workerInfoMapper.queryTotalNum(paramMap);
presentCountList.addAll(totalCountList); presentCountList.addAll(totalCountList);
HashMap<String, PresenceAndTotalNumberOfEngineeringPersonnelVo.Count> map = new HashMap<>(); HashMap<String, PresenceAndTotalNumberOfEngineeringPersonnelVo.Count> map = new HashMap<>();
for (PresenceAndTotalNumberOfEngineeringPersonnelVo.Count count : presentCountList) { for (PresenceAndTotalNumberOfEngineeringPersonnelVo.Count count : presentCountList) {