diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectSubItemController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectSubItemController.java index 074e42c..4328de1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectSubItemController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectSubItemController.java @@ -99,6 +99,9 @@ public class GovProjectSubItemController { @PostMapping(value = "/page") public Result> queryPageList(@ApiIgnore @RequestBody Map map) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(ProjectSubItem.class, map); + if (StringUtils.isBlank(MapUtils.getString(map, "engineeringSn"))) { + queryWrapper.lambda().eq(ProjectSubItem::getEngineeringSn, ""); + } Page page = PageUtil.getPage(map); IPage pageList = projectSubItemService.pageList(page, queryWrapper); return Result.success(pageList); @@ -125,6 +128,9 @@ public class GovProjectSubItemController { public Result> parentPage(@ApiIgnore @RequestBody Map map) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(ProjectSubItem.class, map); Page page = PageUtil.getPage(map); + if (StringUtils.isBlank(MapUtils.getString(map, "engineeringSn"))) { + queryWrapper.lambda().eq(ProjectSubItem::getEngineeringSn, ""); + } IPage pageList = projectSubItemService.pageParentList(page, queryWrapper); return Result.success(pageList); } @@ -140,6 +146,9 @@ public class GovProjectSubItemController { @PostMapping(value = "/list") public Result> queryList(@RequestBody ProjectSubItem projectSubItem) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectSubItem); + if (StringUtils.isBlank(projectSubItem.getEngineeringSn())) { + queryWrapper.lambda().eq(ProjectSubItem::getEngineeringSn, ""); + } List list = projectSubItemService.getList(queryWrapper); return Result.success(list); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovWorkerStatController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovWorkerStatController.java index ca43384..5ca8d3e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovWorkerStatController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovWorkerStatController.java @@ -11,6 +11,7 @@ import com.zhgd.xmgl.modules.basicdata.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.statistics.EngineeringStat; import com.zhgd.xmgl.modules.wisdom.dto.AttendanceRecordDto; import com.zhgd.xmgl.modules.wisdom.dto.WorkerAttendanceStatDto; +import com.zhgd.xmgl.modules.wisdom.dto.WorkerInfoDto; import com.zhgd.xmgl.modules.wisdom.entity.WorkerInfo; import com.zhgd.xmgl.modules.wisdom.service.IAttendanceRecordService; import com.zhgd.xmgl.modules.wisdom.service.IWorkerAttendanceService; @@ -26,9 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** @@ -133,16 +132,11 @@ public class GovWorkerStatController { return Result.success(workerInfoService.getPageList(page, wrapper)); } - @OperLog(operModul = "劳务实名制管理", operType = "分页查询", operDesc = "查询在册人员详细信息") - @ApiOperation(value = " 查询在册人员详细信息", notes = "查询在册人员详细信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "人员唯一标识", paramType = "body", dataType = "String") + @OperLog(operModul = "劳务实名制管理", operType = "分页查询", operDesc = "查询在册人员从业经历") + @ApiOperation(value = " 查询在册人员从业经历", notes = "查询在册人员从业经历", httpMethod = "POST") + @ApiImplicitParam(name = "idCard", value = "人员身份证号", paramType = "body", dataType = "String") @PostMapping(value = "/queryDetailBySn") - public Result> queryDetailBySn(@ApiIgnore @RequestBody WorkerInfo workerInfoEntity) { - Map resultMap = new HashMap<>(); - WorkerInfo workerInfo = workerInfoService.getOne(Wrappers.lambdaQuery().eq(WorkerInfo::getId, workerInfoEntity.getId())); - resultMap.put("workerInfo", workerInfo); - List historyList = workerInfoService.list(Wrappers.lambdaQuery().eq(WorkerInfo::getIdCard, workerInfo.getIdCard())); - resultMap.put("historyList", historyList); - return Result.success(resultMap); + public Result> queryDetailBySn(@ApiIgnore Page page,@ApiIgnore @RequestBody WorkerInfo workerInfo) { + return Result.success(workerInfoService.getDetail(page, Wrappers.lambdaQuery().eq(WorkerInfo::getIdCard, workerInfo.getIdCard()))); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/dto/AnnexFileDto.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/dto/AnnexFileDto.java new file mode 100644 index 0000000..7c16c76 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/dto/AnnexFileDto.java @@ -0,0 +1,19 @@ +package com.zhgd.xmgl.modules.basicdata.dto; + +import com.zhgd.xmgl.modules.basicdata.entity.AnnexFile; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +@ApiModel(value = "附件信息分类(DTO)", description = "AnnexFileDto") +public class AnnexFileDto { + + @ApiModelProperty(value = "附件分类标识") + private String label; + + @ApiModelProperty(value = "附件列表") + private List annexFileList; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/dto/NoticeDto.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/dto/NoticeDto.java index 374056f..aacc95d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/dto/NoticeDto.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/dto/NoticeDto.java @@ -1,6 +1,5 @@ package com.zhgd.xmgl.modules.basicdata.dto; -import com.zhgd.xmgl.modules.basicdata.entity.AnnexFile; import com.zhgd.xmgl.modules.basicdata.entity.NoticeAccept; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -44,7 +43,7 @@ public class NoticeDto { private Integer isRead; @ApiModelProperty(value = "附件") - private List annexFileList; + private List annexFileList; @ApiModelProperty(value = "接收方信息") private List acceptList; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java index bee4248..8c05bfd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java @@ -184,16 +184,18 @@ public class EngineeringServiceImpl extends ServiceImpl engineeringStat(Page page, Wrapper wrapper) { Page engineeringStatPage = baseMapper.engineeringStat(page, wrapper); - List engineeringMains = engineeringMainService.getByEngineeringSn(engineeringStatPage.getRecords().stream().map(e -> e.getEngineeringSn()).collect(Collectors.toList())); - List state = systemDictDataService.getByType(ParamEnum.SysDictType.ENGINEERING_STATE.getValue()); - List type = systemDictDataService.getByType(ParamEnum.SysDictType.ENGINEERING_TYPE.getValue()); - List purpose = systemDictDataService.getByType(ParamEnum.SysDictType.ENGINEERING_PURPOSE.getValue()); - for (EngineeringStat stat : engineeringStatPage.getRecords()) { - stat.setBuildEnt(getEntName(engineeringMains, 1)); - stat.setOpEnt(getEntName(engineeringMains, 2)); - stat.setStateName(CommonUtil.getDictValue(state, stat.getState())); - stat.setEngineeringTypeName(CommonUtil.getDictValue(type, stat.getEngineeringType())); - stat.setEngineeringUseName(CommonUtil.getDictValue(purpose, stat.getEngineeringUse())); + if (engineeringStatPage.getRecords().size() > 0) { + List engineeringMains = engineeringMainService.getByEngineeringSn(engineeringStatPage.getRecords().stream().map(e -> e.getEngineeringSn()).collect(Collectors.toList())); + List state = systemDictDataService.getByType(ParamEnum.SysDictType.ENGINEERING_STATE.getValue()); + List type = systemDictDataService.getByType(ParamEnum.SysDictType.ENGINEERING_TYPE.getValue()); + List purpose = systemDictDataService.getByType(ParamEnum.SysDictType.ENGINEERING_PURPOSE.getValue()); + for (EngineeringStat stat : engineeringStatPage.getRecords()) { + stat.setBuildEnt(getEntName(engineeringMains, 1)); + stat.setOpEnt(getEntName(engineeringMains, 2)); + stat.setStateName(CommonUtil.getDictValue(state, stat.getState())); + stat.setEngineeringTypeName(CommonUtil.getDictValue(type, stat.getEngineeringType())); + stat.setEngineeringUseName(CommonUtil.getDictValue(purpose, stat.getEngineeringUse())); + } } return engineeringStatPage; } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java index 0bf6074..1ddcf5b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java @@ -9,8 +9,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.async.AsyncAiAnalyse; import com.zhgd.xmgl.handler.exception.CustomException; +import com.zhgd.xmgl.modules.basicdata.dto.AnnexFileDto; import com.zhgd.xmgl.modules.basicdata.dto.NoticeDto; -import com.zhgd.xmgl.modules.basicdata.entity.*; +import com.zhgd.xmgl.modules.basicdata.entity.AnnexFile; +import com.zhgd.xmgl.modules.basicdata.entity.Notice; +import com.zhgd.xmgl.modules.basicdata.entity.NoticeAccept; +import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.mapper.NoticeMapper; import com.zhgd.xmgl.modules.basicdata.service.*; import com.zhgd.xmgl.modules.basicdata.vo.NoticeVo; @@ -23,10 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -105,7 +106,16 @@ public class NoticeServiceImpl extends ServiceImpl impleme List noticeAcceptList = noticeAcceptService.getList(notice.getNoticeId()); noticeDto.setAcceptList(noticeAcceptList); noticeDto.setAcceptSnList(noticeAcceptList.stream().map(n -> n.getAccept()).collect(Collectors.toList())); - noticeDto.setAnnexFileList(annexFileList); + List annexFileDtoList = new ArrayList<>(); +// annexFileList.stream().collect(Collectors.groupingBy((a) -> a.getLabel())); + Set label = annexFileList.stream().map(a -> a.getLabel()).collect(Collectors.toSet()); + for (String s : label) { + AnnexFileDto annexFileDto = new AnnexFileDto(); + annexFileDto.setLabel(s); + annexFileDto.setAnnexFileList(annexFileList.stream().filter(a -> a.getLabel().equals(s)).collect(Collectors.toList())); + annexFileDtoList.add(annexFileDto); + } + noticeDto.setAnnexFileList(annexFileDtoList); return noticeDto; } diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/WorkerInfoDto.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/WorkerInfoDto.java index 29fabd3..5c3adf6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/WorkerInfoDto.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/WorkerInfoDto.java @@ -40,6 +40,9 @@ public class WorkerInfoDto { @ApiModelProperty(value = "单位类型") private String companyType; + @ApiModelProperty(value = "单位社会信用代码") + private String creditCode; + @ApiModelProperty(value = "班组") private String teamName; @@ -57,4 +60,10 @@ public class WorkerInfoDto { @ApiModelProperty(value = "年龄") private Integer age; + + @ApiModelProperty(value = "项目地址") + private String projectAddress; + + @ApiModelProperty(value = "参建项目") + private String projectName; } diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/WorkerInfo.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/WorkerInfo.java index 1c60182..748710b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/WorkerInfo.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/WorkerInfo.java @@ -305,4 +305,8 @@ public class WorkerInfo implements Serializable { @Excel(name = "宇泛人像注册信息ID", width = 20) @ApiModelProperty(value = "宇泛人像注册信息ID") private String faceGuid; + + @TableField(exist = false) + @ApiModelProperty(value = "学历") + private String educationLevelName; } diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/WorkerInfoMapper.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/WorkerInfoMapper.java index 43458d4..0456415 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/WorkerInfoMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/WorkerInfoMapper.java @@ -41,4 +41,6 @@ public interface WorkerInfoMapper extends BaseMapper { Map getByType(@Param(Constants.WRAPPER) Wrapper wrapper); Page> attendStat(Page page, @Param(Constants.WRAPPER) Wrapper wrapper); + + Page getDetail(Page page, @Param(Constants.WRAPPER) Wrapper wrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/WorkerInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/WorkerInfoMapper.xml index dd93d20..67b268b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/WorkerInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/WorkerInfoMapper.xml @@ -10,6 +10,18 @@ ${ew.customSqlSegment} + +