From d940d0b4c0e7d6fcebfb0fea2bed1c514e1f796f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 01 七月 2024 14:35:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 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 130e515..ab5a1c7 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
@@ -1,10 +1,17 @@
package com.mes.damage.service.impl;
+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;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.glassinfo.entity.GlassInfo;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -17,4 +24,43 @@
@Service
public class DamageServiceImpl extends ServiceImpl<DamageMapper, Damage> implements DamageService {
+ @Override
+ public List<Damage> selectDamage(DateTime startTime, DateTime endTime, int type, int status, int workingProcedureId){
+ LambdaQueryWrapper<Damage> damageSelectWrapper =new LambdaQueryWrapper<>();
+ damageSelectWrapper.between(Damage::getDamageTime,startTime,endTime);
+ if (type!=0){
+ damageSelectWrapper.eq(Damage::getType,type);
+ }
+ if (status!=0){
+ damageSelectWrapper.eq(Damage::getStatus,status);
+ }
+ if(workingProcedureId!=0){
+ damageSelectWrapper.eq(Damage::getWorkingProcedureId,workingProcedureId);
+ }
+ return baseMapper.selectList(damageSelectWrapper);
+ }
+
+ @Override
+ public void submitDamage(DateTime startTime, DateTime endTime, int type, int status, int workingProcedureId){
+ LambdaUpdateWrapper<Damage> damageUpdateWrapper=new LambdaUpdateWrapper<>();
+ damageUpdateWrapper.between(Damage::getDamageTime,startTime,endTime);
+ if (type!=0){
+ damageUpdateWrapper.eq(Damage::getType,type);
+ }
+ if (status!=0){
+ damageUpdateWrapper.eq(Damage::getStatus,status);
+ }
+ if(workingProcedureId!=0){
+ damageUpdateWrapper.eq(Damage::getWorkingProcedureId,workingProcedureId);
+ }
+ Damage damage=new Damage();
+ damage.setStatus(2);
+ baseMapper.update(damage,damageUpdateWrapper);
+ }
+
+ @Override
+ public void insertDamage(String glassId){
+ LambdaQueryWrapper<GlassInfo> glassInfoSelectWrapper=new LambdaQueryWrapper<>();
+ GlassInfo glassInfo=new GlassInfo();
+ }
}
--
Gitblit v1.8.0