From 26a63c4d8679fac85eee0b377c252c816efd231d Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 20 九月 2024 11:28:32 +0800
Subject: [PATCH] 掰片识别增加筛选破损玻璃时增加条件，过滤掉Damage type字段不等于8或9的数据
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
index fc36b35..5b5dcb7 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
@@ -1,7 +1,6 @@
package com.mes.damage.controller;
-import cn.hutool.core.date.DateTime;
import com.mes.damage.entity.Damage;
import com.mes.damage.entity.DamagePrint;
import com.mes.damage.service.DamageService;
@@ -11,7 +10,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -39,7 +37,7 @@
int type =Integer.parseInt(map.get("type").toString());
int status =Integer.parseInt(map.get("status").toString());
String workingProcedure =map.get("workingProcedure").toString();
- return Result.build(200,"鏌ヨ鎴愬姛",damageService.selectDamage(startTime,endTime,type,status,workingProcedure));
+ return Result.build(200,"鏌ヨ鎴愬姛",damageService.selectDamage(startTime,endTime,type, workingProcedure));
}
@ApiOperation("鎶ュ伐")
@@ -66,7 +64,7 @@
@ApiOperation("鎷胯蛋鏁版嵁鏌ヨ")
@PostMapping("/selectDamagePrint")
public Result selectDamagePrint(@RequestBody Damage damage) {
- List<Damage> damage2=damageService.selectDamagePrint(damage);
+ List<DamagePrint> damage2=damageService.selectDamagePrint(damage);
return Result.build(200,"鏌ヨ鎴愬姛",damage2);
}
@ApiOperation("鎷胯蛋鎵撳嵃鏌ヨ")
--
Gitblit v1.8.0