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

车辆修改

Browse Source
This commit is contained in:
pengjie 2024-06-19 11:07:08 +08:00
parent b42758696a
commit b1e32f0946
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zhgd/xmgl/modules/xz/controller/XzRiskPredictionController.java
View File

@ -105,7 +105,9 @@ public class XzRiskPredictionController {
List<ExamTrainRecord> trainRecordList = examTrainRecordList.stream().filter(e -> e.getTrainId().toString().equals(record.getId().toString())).collect(Collectors.toList()); List<ExamTrainRecord> trainRecordList = examTrainRecordList.stream().filter(e -> e.getTrainId().toString().equals(record.getId().toString())).collect(Collectors.toList());
if (trainRecordList.size() > 0) { if (trainRecordList.size() > 0) {
int pass = trainRecordList.stream().filter(t -> t.getIsPass() == 1).collect(Collectors.toList()).size(); int pass = trainRecordList.stream().filter(t -> t.getIsPass() == 1).collect(Collectors.toList()).size();
record.setPassRadio(new BigDecimal(pass).divide(new BigDecimal(trainRecordList.size()), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100))); record.setPassRadio(new BigDecimal(pass).divide(new BigDecimal(trainRecordList.size()), 2, BigDecimal.ROUND_HALF_UP));
} else {
record.setPassRadio(new BigDecimal(1));
} }
} }
} }
@ -117,7 +119,7 @@ public class XzRiskPredictionController {
} }
// 安全评分 // 安全评分
Double safeScore = list.stream().mapToDouble(e -> e.getSafeScore()).sum(); Double safeScore = list.stream().mapToDouble(e -> e.getSafeScore()).sum();
resultMap.put("safe", new BigDecimal(1).subtract(new BigDecimal(safeScore).divide(new BigDecimal(list.size()), 2, BigDecimal.ROUND_HALF_UP))); resultMap.put("safe", new BigDecimal(1).subtract(new BigDecimal(safeScore).divide(new BigDecimal(100)).divide(new BigDecimal(list.size()), 2, BigDecimal.ROUND_HALF_UP)));
// 安全检查隐患 // 安全检查隐患
List<XzSecurityQualityInspectionRecord> xzSecurityQualityInspectionRecords = xzSecurityQualityInspectionRecordService.list(Wrappers.<XzSecurityQualityInspectionRecord>lambdaQuery() List<XzSecurityQualityInspectionRecord> xzSecurityQualityInspectionRecords = xzSecurityQualityInspectionRecordService.list(Wrappers.<XzSecurityQualityInspectionRecord>lambdaQuery()
.eq(XzSecurityQualityInspectionRecord::getRecordType, 1) .eq(XzSecurityQualityInspectionRecord::getRecordType, 1)

3
src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java
View File

@ -85,6 +85,9 @@ public class XzMaterial implements Serializable {
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
private Date createTime; private Date createTime;
@ApiModelProperty(value = "是否过期处理")
private Integer isDelete;
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty(value = "企业名称") @ApiModelProperty(value = "企业名称")
private String enterpriseName; private String enterpriseName;

6
src/main/java/com/zhgd/xmgl/task/ExamTask.java
View File

@ -74,15 +74,19 @@ public class ExamTask {
@Scheduled(cron = "0 0/1 * * * ?") @Scheduled(cron = "0 0/1 * * * ?")
public void xzMaterial() { public void xzMaterial() {
List<XzMaterial> list = xzMaterialService.list(); List<XzMaterial> list = xzMaterialService.list(Wrappers.<XzMaterial>lambdaQuery().ne(XzMaterial::getIsDelete, 1));
List<String> carNumber = new ArrayList<>(); List<String> carNumber = new ArrayList<>();
List<XzMaterial> update = new ArrayList<>();
for (XzMaterial xzMaterial : list) { for (XzMaterial xzMaterial : list) {
if (xzMaterial.getEntryEndTime() != null && xzMaterial.getEntryEndTime().compareTo(new Date()) < 0) { if (xzMaterial.getEntryEndTime() != null && xzMaterial.getEntryEndTime().compareTo(new Date()) < 0) {
if (StringUtils.isNotBlank(xzMaterial.getCarNumber())) { if (StringUtils.isNotBlank(xzMaterial.getCarNumber())) {
carNumber.add(xzMaterial.getCarNumber()); carNumber.add(xzMaterial.getCarNumber());
xzMaterial.setIsDelete(1);
update.add(xzMaterial);
} }
} }
} }
xzMaterialService.updateBatchById(update);
List<CarInfo> carInfos = carInfoService.list(Wrappers.<CarInfo>lambdaQuery().eq(CarInfo::getCarModuleType, 3)); List<CarInfo> carInfos = carInfoService.list(Wrappers.<CarInfo>lambdaQuery().eq(CarInfo::getCarModuleType, 3));
if (carInfos.size() > 0) { if (carInfos.size() > 0) {
carInfos = carInfos.stream().filter(c -> carNumber.contains(c.getCarNumber())).collect(Collectors.toList()); carInfos = carInfos.stream().filter(c -> carNumber.contains(c.getCarNumber())).collect(Collectors.toList());