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

1.完善专项分析-终端检测管理

Browse Source
This commit is contained in:
wr
2024-02-19 10:13:56 +08:00
parent 3148a84444
commit 06c2cf095c
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pqs-process/process-api/src/main/java/com/njcn/process/pojo/dto/excel/TerminalExcel.java
View File

@@ -1,14 +1,8 @@
package com.njcn.process.pojo.dto.excel; package com.njcn.process.pojo.dto.excel;
import cn.afterturn.easypoi.excel.annotation.Excel; import cn.afterturn.easypoi.excel.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.njcn.common.pojo.constant.PatternRegex;
import com.njcn.device.pq.pojo.constant.DeviceValidMessage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@@ -33,7 +27,6 @@ public class TerminalExcel implements Serializable {
@Excel(name = "终端名称",width = 15) @Excel(name = "终端名称",width = 15)
@NotBlank(message = "终端名称不为空") @NotBlank(message = "终端名称不为空")
@Pattern(regexp = PatternRegex.DEPT_NAME_REGEX, message = DeviceValidMessage.PROJECT_NAME_RULE)
private String name; private String name;
@Excel(name = "组织机构名称",width = 15) @Excel(name = "组织机构名称",width = 15)

2
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/PmsTerminalDetectionMapper.xml
View File

@@ -90,7 +90,7 @@
</if> </if>
</where> </where>
GROUP BY GROUP BY
Create_Time statisticsDate
</select> </select>
<select id="selectResultsCycleStatistics" resultType="com.njcn.process.pojo.vo.TerminalVO$ResultsStatistics"> <select id="selectResultsCycleStatistics" resultType="com.njcn.process.pojo.vo.TerminalVO$ResultsStatistics">
SELECT SELECT

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

@@ -136,7 +136,7 @@ public class PmsTerminalDetectionServiceImpl extends ServiceImpl<PmsTerminalDete
LocalDate inspectionTime = param.getInspectionTime(); LocalDate inspectionTime = param.getInspectionTime();
detection.setNextInspectionTime(inspectionTime.plusYears(5)); detection.setNextInspectionTime(inspectionTime.plusYears(5));
detection.setTestResults(0); detection.setTestResults(StrUtil.isNotBlank(param.getOriginalReport())?1:0);
detection.setStatus(1); detection.setStatus(1);
return this.save(detection); return this.save(detection);
} }
@@ -414,7 +414,7 @@ public class PmsTerminalDetectionServiceImpl extends ServiceImpl<PmsTerminalDete
addMsg(terminalExcelMsg, terminalExcel, msg, "当前终端编号重复"); addMsg(terminalExcelMsg, terminalExcel, msg, "当前终端编号重复");
continue; continue;
} }
String orgName = terminalExcel.getOrgName(); String orgName = terminalExcel.getOrgName().trim();
//判断 //判断
List<PvTerminalTreeVO> deptList = data.stream().filter(d -> List<PvTerminalTreeVO> deptList = data.stream().filter(d ->
d.getName().indexOf(orgName) > -1 d.getName().indexOf(orgName) > -1