From dbed9ea228e05d3f5a78ff8a68c4c52da56b1b15 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 24 七月 2024 13:21:11 +0800
Subject: [PATCH] 更改测试类传值防止报错
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 83 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 83 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..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
@@ -1,10 +1,23 @@
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.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 com.mes.glassinfo.mapper.GlassInfoMapper;
+import com.mes.work_assignment.entity.WorkAssignment;
+import com.mes.work_assignment.mapper.WorkAssignmentMapper;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -17,4 +30,74 @@
@Service
public class DamageServiceImpl extends ServiceImpl<DamageMapper, Damage> implements DamageService {
+ @Resource
+ GlassInfoMapper glassInfoMapper;
+ @Resource
+ WorkAssignmentMapper workAssignmentMapper;
+
+ /**
+ * 鏌ヨ鎶ュ伐淇℃伅
+ */
+ @Override
+ 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){
+ damageSelectWrapper.eq(Damage::getType,type);
+ }
+ if (status!=0){
+ damageSelectWrapper.eq(Damage::getStatus,status);
+ }
+ if(!"0".equals(workingProcedure)){
+ damageSelectWrapper.eq(Damage::getWorkingProcedure,workingProcedure);
+ }
+ return baseMapper.selectList(damageSelectWrapper);
+ }
+
+ /**
+ * 鎻愪氦鎶ュ伐
+ */
+ @Override
+ 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){
+ damageUpdateWrapper.eq(Damage::getType,type);
+ }
+ if (status!=0){
+ damageUpdateWrapper.eq(Damage::getStatus,status);
+ }
+ if(!"0".equals(workingProcedure)){
+ damageUpdateWrapper.eq(Damage::getWorkingProcedure,workingProcedure);
+ }
+ Damage damage=new Damage();
+ damage.setStatus(2);
+ baseMapper.update(damage,damageUpdateWrapper);
+ }
+
+ /**
+ * 娣诲姞鎶ュ伐淇℃伅
+ */
+ @Override
+ public void insertDamage(Damage damage){
+ LambdaQueryWrapper<GlassInfo> glassInfoSelectWrapper=new LambdaQueryWrapper<>();
+ glassInfoSelectWrapper.eq(GlassInfo::getGlassId,damage.getGlassId());
+ GlassInfo glassInfo=glassInfoMapper.selectOne(glassInfoSelectWrapper);
+ BeanUtils.copyProperties(glassInfo, damage);
+
+ LambdaQueryWrapper<WorkAssignment> workAssignmentSelectWrapper=new LambdaQueryWrapper<>();
+ workAssignmentSelectWrapper
+ .eq(WorkAssignment::getLine,damage.getLine())
+ .eq(WorkAssignment::getWorkProcesses,damage.getWorkingProcedure());
+ WorkAssignment workAssignment=workAssignmentMapper.selectOne(workAssignmentSelectWrapper);
+
+ damage.setTeamsGroupsName(workAssignment.getTeamsGroupsName());
+ damage.setDeviceName(workAssignment.getDeviceName());
+ damage.setProcessId(glassInfo.getFlowCardId());
+ damage.setOrderNumber(glassInfo.getGlassType());
+ damage.setTechnologyNumber(glassInfo.getLayer());
+ damage.setDamageTime(Timestamp.valueOf(LocalDateTime.now()));
+ damage.setType(2);
+ baseMapper.insert(damage);
+ }
}
--
Gitblit v1.8.0