From 1e862ae4a11072451fa9b0449f13f48c0d98e91d Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 22 七月 2024 10:06:12 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
index d3aa888..118d12e 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -39,7 +39,7 @@
* 鏌ヨ鎶ュ伐淇℃伅
*/
@Override
- public List<Damage> selectDamage(String startTime, String endTime, int type, int status, int workingProcedure){
+ public List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure){
LambdaQueryWrapper<Damage> damageSelectWrapper =new LambdaQueryWrapper<>();
damageSelectWrapper.between(Damage::getDamageTime,startTime,endTime);
if (type!=0){
@@ -48,7 +48,7 @@
if (status!=0){
damageSelectWrapper.eq(Damage::getStatus,status);
}
- if(workingProcedure!=0){
+ if(!"0".equals(workingProcedure)){
damageSelectWrapper.eq(Damage::getWorkingProcedure,workingProcedure);
}
return baseMapper.selectList(damageSelectWrapper);
@@ -58,7 +58,7 @@
* 鎻愪氦鎶ュ伐
*/
@Override
- public void submitDamage(DateTime startTime, DateTime endTime, int type, int status, int workingProcedureId){
+ public void submitDamage(String startTime, String endTime, int type, int status, String workingProcedure){
LambdaUpdateWrapper<Damage> damageUpdateWrapper=new LambdaUpdateWrapper<>();
damageUpdateWrapper.between(Damage::getDamageTime,startTime,endTime);
if (type!=0){
@@ -67,8 +67,8 @@
if (status!=0){
damageUpdateWrapper.eq(Damage::getStatus,status);
}
- if(workingProcedureId!=0){
- damageUpdateWrapper.eq(Damage::getWorkingProcedure,workingProcedureId);
+ if(!"0".equals(workingProcedure)){
+ damageUpdateWrapper.eq(Damage::getWorkingProcedure,workingProcedure);
}
Damage damage=new Damage();
damage.setStatus(2);
--
Gitblit v1.8.0