炉次实绩 定尺

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/heatsActuals/controller/HeatsActualsController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.actualControl.heatsActuals.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,8 +11,13 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.actualControl.billetActual.billetActual.entity.BilletBasicInfo;
+import org.jeecg.modules.actualControl.billetActual.billetActual.entity.BilletBasicInfoLength;
+import org.jeecg.modules.actualControl.billetActual.billetActual.service.IBilletBasicInfoService;
 import org.jeecg.modules.actualControl.heatsActuals.entity.HeatsActuals;
 import org.jeecg.modules.actualControl.heatsActuals.service.IHeatsActualsService;
+import org.jeecg.modules.billet.billetHotsendConfig.entity.BilletHotsendTypeConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -19,8 +25,11 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
- /**
+/**
  * @Description: 炉次实绩
  * @Author: jeecg-boot
  * @Date:   2024-04-18
@@ -33,6 +42,9 @@ import java.util.Arrays;
 public class HeatsActualsController extends JeecgController<HeatsActuals, IHeatsActualsService> {
 	@Autowired
 	private IHeatsActualsService heatsActualsService;
+
+	@Autowired
+	private IBilletBasicInfoService billetBasicInfoService;
 	
 	/**
 	 * 分页列表查询
@@ -53,6 +65,16 @@ public class HeatsActualsController extends JeecgController<HeatsActuals, IHeats
 		QueryWrapper<HeatsActuals> queryWrapper = QueryGenerator.initQueryWrapper(heatsActuals, req.getParameterMap());
 		Page<HeatsActuals> page = new Page<HeatsActuals>(pageNo, pageSize);
 		IPage<HeatsActuals> pageList = heatsActualsService.page(page, queryWrapper);
+		List<HeatsActuals> list = pageList.getRecords();
+		// 处理钢坯目的地信息
+		list.forEach(item ->{
+			LambdaQueryWrapper<BilletBasicInfo> queryBilletWrapper = new LambdaQueryWrapper<BilletBasicInfo>().eq(BilletBasicInfo::getHeatNo, item.getHeatsCode())
+					.eq(BilletBasicInfo::getCcmNo,  item.getCasterCode());
+			List<BilletBasicInfo> billetBasicList = billetBasicInfoService.list(queryBilletWrapper);
+			Map<Integer, Long> lengthCountMap = billetBasicList.stream().collect(Collectors.groupingBy(BilletBasicInfo::getLength, Collectors.counting()));
+			item.setBasicInfoLengthList(lengthCountMap);
+		});
+		pageList.setRecords(list);
 		return Result.OK(pageList);
 	}
 	

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/heatsActuals/entity/HeatsActuals.java

@@ -10,11 +10,15 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.modules.actualControl.billetActual.billetActual.entity.BilletBasicInfo;
+import org.jeecg.modules.actualControl.billetActual.billetActual.entity.BilletBasicInfoLength;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 炉次实绩
@@ -129,4 +133,7 @@ public class HeatsActuals implements Serializable {
     @Dict(dicCode = "lg_bb")
     private String shift;
 
+    /**list*/
+    private Map<Integer, Long> basicInfoLengthList;
+
 }