YiWuProject.git

			@@ -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);
			}