From fd8ab73d5b1c52a99564dea59296cf9ca323af78 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 19 七月 2024 10:01:53 +0800
Subject: [PATCH] 大理片进出片任务破损后详情表数据状态更新
---
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 b81f7b2..d3aa888 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
@@ -3,7 +3,6 @@
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.mes.damage.entity.Damage;
import com.mes.damage.mapper.DamageMapper;
import com.mes.damage.service.DamageService;
@@ -16,6 +15,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.util.List;
@@ -39,7 +39,7 @@
* 鏌ヨ鎶ュ伐淇℃伅
*/
@Override
- public List<Damage> selectDamage(DateTime startTime, DateTime endTime, int type, int status, int workingProcedureId){
+ public List<Damage> selectDamage(String startTime, String endTime, int type, int status, int workingProcedure){
LambdaQueryWrapper<Damage> damageSelectWrapper =new LambdaQueryWrapper<>();
damageSelectWrapper.between(Damage::getDamageTime,startTime,endTime);
if (type!=0){
@@ -48,8 +48,8 @@
if (status!=0){
damageSelectWrapper.eq(Damage::getStatus,status);
}
- if(workingProcedureId!=0){
- damageSelectWrapper.eq(Damage::getWorkingProcedure,workingProcedureId);
+ if(workingProcedure!=0){
+ damageSelectWrapper.eq(Damage::getWorkingProcedure,workingProcedure);
}
return baseMapper.selectList(damageSelectWrapper);
}
@@ -96,7 +96,7 @@
damage.setProcessId(glassInfo.getFlowCardId());
damage.setOrderNumber(glassInfo.getGlassType());
damage.setTechnologyNumber(glassInfo.getLayer());
- damage.setDamageTime(LocalDateTime.now());
+ damage.setDamageTime(Timestamp.valueOf(LocalDateTime.now()));
damage.setType(2);
baseMapper.insert(damage);
}
--
Gitblit v1.8.0