YiWuProject.git

			@@ -1,13 +1,10 @@
			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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			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;
			@@ -16,12 +13,15 @@
			import org.springframework.stereotype.Service;

			import javax.annotation.Resource;
			import java.sql.Timestamp;
			import java.time.LocalDateTime;
			import java.util.List;
			import java.util.Map;
			import java.util.stream.Collectors;

			/**
			* <p>
			* 服务实现类
			* 服务实现类
			* </p>
			*
			* @author wu
			@@ -39,17 +39,22 @@
			* 查询报工信息
			*/
			@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);
			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 (status != 0) {
			damageSelectWrapper.eq(Damage::getStatus, status);
			}
			if(workingProcedureId!=0){
			damageSelectWrapper.eq(Damage::getWorkingProcedure,workingProcedureId);
			if (!"0".equals(workingProcedure)) {
			damageSelectWrapper.eq(Damage::getWorkingProcedure, workingProcedure);
			}
			List<Damage> damageList = baseMapper.selectList(damageSelectWrapper);

			for (Damage damage : damageList) {
			damage.setStatus(2);
			}
			return baseMapper.selectList(damageSelectWrapper);
			}
			@@ -58,46 +63,77 @@
			* 提交报工
			*/
			@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);
			public void submitDamage(List<Damage> damageList) {
			Map<String, List<Damage>> firstMap = damageList.stream().collect(Collectors.groupingBy(e -> e.getProcessId() + ":"
			+ e.getWorkingProcedure() + ":" + e.getDeviceName() + ":" + e.getTeamsGroupsName()));

			for (Map.Entry<String, List<Damage>> entry : firstMap.entrySet()) {
			String key = entry.getKey();
			List<Damage> damages = entry.getValue();

			System.out.println("Key: " + key);

			Map<String, List<Damage>> secondMap = damageList.stream().collect(Collectors.groupingBy(e -> e.getProcessId() + ":"
			+ e.getWorkingProcedure() + ":" + e.getDeviceName() + ":" + e.getTeamsGroupsName()));

			for (Map.Entry<String, List<Damage>> entrys : secondMap.entrySet()) {

			}
			}
			if (status!=0){
			damageUpdateWrapper.eq(Damage::getStatus,status);
			}
			if(workingProcedureId!=0){
			damageUpdateWrapper.eq(Damage::getWorkingProcedure,workingProcedureId);
			}
			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);
			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<>();
			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());
			.eq(WorkAssignment::getLine, damage.getLine())
			.eq(WorkAssignment::getWorkProcesses, damage.getWorkingProcedure());
			WorkAssignment workAssignment = workAssignmentMapper.selectOne(workAssignmentSelectWrapper);
			if (workAssignment != null) {
			damage.setTeamsGroupsName(workAssignment.getTeamsGroupsName());
			damage.setDeviceName(workAssignment.getDeviceName());
			}
			damage.setProcessId(glassInfo.getFlowCardId());
			damage.setOrderNumber(glassInfo.getGlassType());
			damage.setTechnologyNumber(glassInfo.getLayer());
			damage.setDamageTime(LocalDateTime.now());
			damage.setType(2);
			damage.setDamageTime(Timestamp.valueOf(LocalDateTime.now()));
			baseMapper.insert(damage);
			}

			/**
			* 添加报工信息
			*/
			@Override
			public void batchInsertDamage(List<Damage> damageList) {
			WorkAssignment workAssignment = workAssignmentMapper.selectOne(new LambdaQueryWrapper<WorkAssignment>()
			.eq(WorkAssignment::getLine, damageList.get(0).getLine())
			.eq(WorkAssignment::getWorkProcesses, damageList.get(0).getWorkingProcedure()));

			List<String> glassList = damageList.stream().map(Damage::getGlassId).collect(Collectors.toList());
			List<GlassInfo> glassInfoList = glassInfoMapper.selectList(new LambdaQueryWrapper<GlassInfo>().in(GlassInfo::getGlassId, glassList));
			Map<String, List<GlassInfo>> listMap = glassInfoList.stream().collect(Collectors.groupingBy(GlassInfo::getGlassId));
			for (Damage damage : damageList) {
			GlassInfo glassInfo = listMap.get(damage.getGlassId()).get(0);
			BeanUtils.copyProperties(glassInfo, damage);
			if (workAssignment != null) {
			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()));
			}
			this.saveBatch(damageList);
			}
			}