|
@@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.entity.SysDictData;
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
import com.ruoyi.common.utils.redis.RedisUtils;
|
|
import com.ruoyi.common.utils.redis.RedisUtils;
|
|
import com.ruoyi.common.utils.spring.SpringUtils;
|
|
import com.ruoyi.common.utils.spring.SpringUtils;
|
|
|
|
+import com.ruoyi.framework.handler.MonthTableNameHandler;
|
|
import com.ruoyi.zdsz.domain.*;
|
|
import com.ruoyi.zdsz.domain.*;
|
|
import com.ruoyi.zdsz.domain.bo.WasteMaterialBo;
|
|
import com.ruoyi.zdsz.domain.bo.WasteMaterialBo;
|
|
import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
|
|
import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
|
|
@@ -23,6 +24,7 @@ import org.springframework.web.context.request.RequestContextHolder;
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
import java.math.RoundingMode;
|
|
import java.math.RoundingMode;
|
|
|
|
+import java.text.SimpleDateFormat;
|
|
import java.util.*;
|
|
import java.util.*;
|
|
import java.util.concurrent.CompletableFuture;
|
|
import java.util.concurrent.CompletableFuture;
|
|
import java.util.concurrent.ExecutionException;
|
|
import java.util.concurrent.ExecutionException;
|
|
@@ -184,6 +186,8 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
|
|
System.out.println(info.getzEngineeringMaterialBo());
|
|
System.out.println(info.getzEngineeringMaterialBo());
|
|
LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
|
|
lqw4.eq(StringUtils.isNotBlank(info.getId()), ZEngineeringMaterial::getDetailsId, info.getId());
|
|
lqw4.eq(StringUtils.isNotBlank(info.getId()), ZEngineeringMaterial::getDetailsId, info.getId());
|
|
|
|
+ String date = new SimpleDateFormat("yyyy_MM").format(zEngineeringGYVo.getCreateTime());
|
|
|
|
+ MonthTableNameHandler.setData(date);
|
|
List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
|
|
List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
|
|
material.stream().forEach(item4->{
|
|
material.stream().forEach(item4->{
|
|
String materialQuality = item4.getMaterialQuality();
|
|
String materialQuality = item4.getMaterialQuality();
|
|
@@ -365,6 +369,8 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
|
|
System.out.println(info.getzEngineeringMaterialBo());
|
|
System.out.println(info.getzEngineeringMaterialBo());
|
|
LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
|
|
lqw4.eq(StringUtils.isNotBlank(info.getId()), ZEngineeringMaterial::getDetailsId, info.getId());
|
|
lqw4.eq(StringUtils.isNotBlank(info.getId()), ZEngineeringMaterial::getDetailsId, info.getId());
|
|
|
|
+ String date = new SimpleDateFormat("yyyy_MM").format(zEngineeringIndustryVo.getCreateTime());
|
|
|
|
+ MonthTableNameHandler.setData(date);
|
|
List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
|
|
List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
|
|
material.stream().forEach(item4->{
|
|
material.stream().forEach(item4->{
|
|
String materialQuality = item4.getMaterialQuality();
|
|
String materialQuality = item4.getMaterialQuality();
|
|
@@ -457,6 +463,8 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
|
|
System.out.println(info.getzEngineeringMaterialBo());
|
|
System.out.println(info.getzEngineeringMaterialBo());
|
|
LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
|
|
lqw4.eq(StringUtils.isNotBlank(info.getId()), ZEngineeringMaterial::getDetailsId, info.getId());
|
|
lqw4.eq(StringUtils.isNotBlank(info.getId()), ZEngineeringMaterial::getDetailsId, info.getId());
|
|
|
|
+ String date = new SimpleDateFormat("yyyy_MM").format(zEngineeringPipeJackingVo.getCreateTime());
|
|
|
|
+ MonthTableNameHandler.setData(date);
|
|
List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
|
|
List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
|
|
material.stream().forEach(item4->{
|
|
material.stream().forEach(item4->{
|
|
String materialQuality = item4.getMaterialQuality();
|
|
String materialQuality = item4.getMaterialQuality();
|
|
@@ -603,6 +611,8 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
|
|
System.out.println(info.getzEngineeringMaterialBo());
|
|
System.out.println(info.getzEngineeringMaterialBo());
|
|
LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
|
|
lqw4.eq(StringUtils.isNotBlank(info.getId()), ZEngineeringMaterial::getDetailsId, info.getId());
|
|
lqw4.eq(StringUtils.isNotBlank(info.getId()), ZEngineeringMaterial::getDetailsId, info.getId());
|
|
|
|
+ String date = new SimpleDateFormat("yyyy_MM").format(zEngineeringGYVo.getCreateTime());
|
|
|
|
+ MonthTableNameHandler.setData(date);
|
|
List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
|
|
List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
|
|
material.stream().forEach(item4->{
|
|
material.stream().forEach(item4->{
|
|
String materialQuality = item4.getMaterialQuality();
|
|
String materialQuality = item4.getMaterialQuality();
|
|
@@ -677,6 +687,8 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
|
|
System.out.println(info.getzEngineeringMaterialBo());
|
|
System.out.println(info.getzEngineeringMaterialBo());
|
|
LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
|
|
lqw4.eq(StringUtils.isNotBlank(info.getId()), ZEngineeringMaterial::getDetailsId, info.getId());
|
|
lqw4.eq(StringUtils.isNotBlank(info.getId()), ZEngineeringMaterial::getDetailsId, info.getId());
|
|
|
|
+ String date = new SimpleDateFormat("yyyy_MM").format(zEngineeringIndustryVo.getCreateTime());
|
|
|
|
+ MonthTableNameHandler.setData(date);
|
|
List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
|
|
List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
|
|
material.stream().forEach(item4->{
|
|
material.stream().forEach(item4->{
|
|
String materialQuality = item4.getMaterialQuality();
|
|
String materialQuality = item4.getMaterialQuality();
|
|
@@ -741,6 +753,8 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
|
|
System.out.println(info.getzEngineeringMaterialBo());
|
|
System.out.println(info.getzEngineeringMaterialBo());
|
|
LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
|
|
lqw4.eq(StringUtils.isNotBlank(info.getId()), ZEngineeringMaterial::getDetailsId, info.getId());
|
|
lqw4.eq(StringUtils.isNotBlank(info.getId()), ZEngineeringMaterial::getDetailsId, info.getId());
|
|
|
|
+ String date = new SimpleDateFormat("yyyy_MM").format(zEngineeringPipeJackingVo.getCreateTime());
|
|
|
|
+ MonthTableNameHandler.setData(date);
|
|
List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
|
|
List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
|
|
material.stream().forEach(item4->{
|
|
material.stream().forEach(item4->{
|
|
String materialQuality = item4.getMaterialQuality();
|
|
String materialQuality = item4.getMaterialQuality();
|