Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.区域报告和监测点报告代码提交

Browse Source 
2.终端管理部分代码提交
This commit is contained in:
wurui
2023-03-08 16:08:30 +08:00
parent d657c55217
commit daffdb9048
6 changed files with 3370 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/PmsTerminalDetectionServiceImpl.java
View File

@@ -54,12 +54,17 @@ public class PmsTerminalDetectionServiceImpl extends ServiceImpl<PmsTerminalDete
@Override
public Page<TerminalVO> terminalPage(TerminalParam.TerminalPageParam param) {
List<DeptDTO> data = deptFeignClient.getDepSonDetailByDeptId(param.getId()).getData();
List<String> deptCodes = data.stream().map(DeptDTO::getCode).collect(Collectors.toList());
Page<PmsTerminalDetection> pageList = this.page(new Page<>(param.getPageNum(), param.getPageSize())
, new LambdaQueryWrapper<PmsTerminalDetection>()
.eq(CollectionUtil.isNotEmpty(deptCodes), PmsTerminalDetection::getOrgName, deptCodes)
.eq(PmsTerminalDetection::getStatus, DataStateEnum.ENABLE.getCode())
// .in(RMpWpPowerDetailQ::getMeasurementPointId, monitorIds)
.like(StrUtil.isNotBlank(param.getName()), PmsTerminalDetection::getName, param.getName())
.le(param.getType() != 0, PmsTerminalDetection::getNextInspectionTime, LocalDate.now())
// .le(StrUtil.isNotBlank(param.getEndTime()), PmsTerminalDetection::getDataDate, param.getEndTime())
.ge(StrUtil.isNotBlank(param.getStartTime()), PmsTerminalDetection::getInspectionTime, param.getStartTime())
.le(StrUtil.isNotBlank(param.getEndTime()), PmsTerminalDetection::getInspectionTime, param.getEndTime())
);
List<TerminalVO> rMpWpPowerDetailVOS2 = BeanUtil.copyToList(pageList.getRecords(), TerminalVO.class);
@@ -131,7 +136,7 @@ public class PmsTerminalDetectionServiceImpl extends ServiceImpl<PmsTerminalDete
public void importReport(MultipartFile[] files, HttpServletResponse response) {
PmsTerminalDetection detection;
List<PmsTerminalDetection> data = new ArrayList<>();
//传入的文件格式(终端编号-检测报告.docx);
for (int i = 0; i < files.length; i++) {
detection = new PmsTerminalDetection();
//上传的文件名称