From 0c86561c023aa79914aa1f494b2a91ad5c38b38f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 14 十一月 2025 08:14:22 +0800
Subject: [PATCH] 1、报工查询添加显示宽，高
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java | 3 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 50 ++++++++++++++++--------
UI-Project/src/views/ReportWork/reportWork.vue | 22 ++++++-----
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java | 3 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/mapper/DamageMapper.java | 9 ++++
5 files changed, 58 insertions(+), 29 deletions(-)
diff --git a/UI-Project/src/views/ReportWork/reportWork.vue b/UI-Project/src/views/ReportWork/reportWork.vue
index 7a6ed85..0842f92 100644
--- a/UI-Project/src/views/ReportWork/reportWork.vue
+++ b/UI-Project/src/views/ReportWork/reportWork.vue
@@ -36,15 +36,15 @@
<el-table height="700" ref="table" :data="reportData"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
<el-table-column prop="teamsGroupsName" align="center" :label="$t('reportmanage.reporteam')"
- min-width="135" />
+ min-width="100" />
<el-table-column prop="deviceName" align="center" :label="$t('reportmanage.reportingequipment')"
- min-width="156" />
+ min-width="100" />
<el-table-column prop="line" align="center" :label="$t('reportmanage.line')" min-width="120" />
- <el-table-column prop="workingProcedure" align="center" :label="$t('reportmanage.process')" min-width="120" />
- <el-table-column prop="glassId" align="center" :label="$t('reportmanage.glassID')" min-width="130" />
- <el-table-column prop="engineerId" align="center" :label="$t('reportmanage.projectnumber')" min-width="120" />
+ <el-table-column prop="workingProcedure" align="center" :label="$t('reportmanage.process')" min-width="100" />
+ <el-table-column prop="glassId" align="center" :label="$t('reportmanage.glassID')" min-width="100" />
+ <el-table-column prop="engineerId" align="center" :label="$t('reportmanage.projectnumber')" min-width="100" />
<el-table-column prop="temperingLayoutId" align="center" :label="$t('reportmanage.layoutID')"
- min-width="120" />
+ min-width="100" />
<el-table-column prop="formattedCreateTime" align="center" :label="$t('reportmanage.productiontime')"
min-width="230" />
<el-table-column
@@ -71,10 +71,12 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column prop="processId" align="center" :label="$t('reportmanage.processcards')" min-width="140" />
- <el-table-column prop="orderNumber" align="center" :label="$t('reportmanage.number')" min-width="120" />
- <el-table-column prop="technologyNumber" align="center" :label="$t('reportmanage.layer')" min-width="120" />
- <el-table-column prop="breakageType" align="center" :label="$t('reportmanage.typebreakage')" min-width="180">
+ <el-table-column prop="processId" align="center" :label="$t('reportmanage.processcards')" min-width="100" />
+ <el-table-column prop="orderNumber" align="center" :label="$t('reportmanage.number')" min-width="100" />
+ <el-table-column prop="technologyNumber" align="center" :label="$t('reportmanage.layer')" min-width="50" />
+ <el-table-column prop="width" align="center" :label="$t('processCard.width')" min-width="70" />
+ <el-table-column prop="height" align="center" :label="$t('processCard.height')" min-width="70" />
+ <el-table-column prop="breakageType" align="center" :label="$t('reportmanage.typebreakage')" min-width="100">
<template #default="{ row }">
<el-select v-model="row.breakageType" filterable :placeholder="$t('reportmanage.pcausebreakage')" :disabled="selectedType"
clearable @input="handleInputChangea($event, row.id)">
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
index 0a55b53..7fde5fe 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mes.damage.entity.Damage;
import com.mes.damage.entity.DamagePrint;
+import com.mes.damage.entity.dto.DamageDTO;
import com.mes.damage.service.DamageService;
import com.mes.opctask.entity.LoadGlassDeviceTaskHistory;
import com.mes.utils.Result;
@@ -34,7 +35,7 @@
@ApiOperation("鎶ュ伐鏁版嵁鏌ヨ")
@PostMapping("/selectDamage")
- public Result<Page<Damage>> selectDamage(@RequestBody Map map) {
+ public Result<Page<DamageDTO>> selectDamage(@RequestBody Map map) {
String startTime = map.get("startTime").toString();
String endTime = map.get("endTime").toString();
int type = Integer.parseInt(map.get("type").toString());
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/mapper/DamageMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/mapper/DamageMapper.java
index 7c19797..3d06089 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/mapper/DamageMapper.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/mapper/DamageMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.github.yulichang.base.MPJBaseMapper;
import com.mes.damage.entity.Damage;
+import com.mes.damage.entity.dto.DamageDTO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -19,4 +20,12 @@
public interface DamageMapper extends MPJBaseMapper<Damage> {
List<Damage> queryUnTempByFlowCardId(@Param("flowCardId") String flowCardId);
+
+ List<DamageDTO> selectDamageList(
+ @Param("startTime") String startTime,
+ @Param("endTime") String endTime,
+ @Param("type") int type,
+ @Param("status") int status,
+ @Param("workingProcedure") String workingProcedure
+ );
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
index f46bafc..6644013 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
@@ -4,6 +4,7 @@
import com.github.yulichang.base.MPJBaseService;
import com.mes.damage.entity.Damage;
import com.mes.damage.entity.DamagePrint;
+import com.mes.damage.entity.dto.DamageDTO;
import com.mes.opctask.entity.LoadGlassDeviceTaskHistory;
import com.mes.pp.entity.ReportingWork;
import com.mes.pp.entity.ReportingWorkDetail;
@@ -21,7 +22,7 @@
*/
public interface DamageService extends MPJBaseService<Damage> {
- Page<Damage> selectDamage(
+ Page<DamageDTO> selectDamage(
String startTime,
String endTime,
int type,
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 3996f10..ff53524 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
@@ -3,6 +3,7 @@
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
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;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -11,6 +12,7 @@
import com.mes.common.config.Const;
import com.mes.damage.entity.Damage;
import com.mes.damage.entity.DamagePrint;
+import com.mes.damage.entity.dto.DamageDTO;
import com.mes.damage.mapper.DamageMapper;
import com.mes.damage.service.DamageService;
import com.mes.glassinfo.entity.GlassInfo;
@@ -36,6 +38,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -67,17 +70,18 @@
/**
* 鍒嗛〉鏌ヨ鎹熷潖璁板綍
- * @param startTime 寮�濮嬫椂闂达紙鏍煎紡锛歽yyy-MM-dd HH:mm:ss锛�
- * @param endTime 缁撴潫鏃堕棿锛堟牸寮忥細yyyy-MM-dd HH:mm:ss锛�
- * @param type 鎹熷潖绫诲瀷锛�0琛ㄧず鏌ヨ鎵�鏈夌被鍨嬶級
- * @param status 鐘舵�侊紙0琛ㄧず鏌ヨ鎵�鏈夌姸鎬侊級
+ *
+ * @param startTime 寮�濮嬫椂闂达紙鏍煎紡锛歽yyy-MM-dd HH:mm:ss锛�
+ * @param endTime 缁撴潫鏃堕棿锛堟牸寮忥細yyyy-MM-dd HH:mm:ss锛�
+ * @param type 鎹熷潖绫诲瀷锛�0琛ㄧず鏌ヨ鎵�鏈夌被鍨嬶級
+ * @param status 鐘舵�侊紙0琛ㄧず鏌ヨ鎵�鏈夌姸鎬侊級
* @param workingProcedure 宸ュ簭锛�"0"琛ㄧず鏌ヨ鎵�鏈夊伐搴忥級
- * @param pageNum 椤电爜锛堜粠1寮�濮嬶級
- * @param pageSize 姣忛〉鏉℃暟
+ * @param pageNum 椤电爜锛堜粠1寮�濮嬶級
+ * @param pageSize 姣忛〉鏉℃暟
* @return 鍒嗛〉鍚庣殑鎹熷潖璁板綍鍒楄〃
*/
@Override
- public Page<Damage> selectDamage(
+ public Page<DamageDTO> selectDamage(
String startTime,
String endTime,
int type,
@@ -86,15 +90,27 @@
int pageNum, // 鏂板锛氬姩鎬侀〉鐮�
int pageSize // 鏂板锛氬姩鎬佹瘡椤垫潯鏁�
) {
- Page<Damage> page = new Page<>(pageNum, pageSize);
-
- LambdaQueryWrapper<Damage> damageSelectWrapper = new LambdaQueryWrapper<>();
- damageSelectWrapper.between(Damage::getDamageTime, startTime, endTime)
- .eq(type != 0, Damage::getType, type)
- .eq(status != 0, Damage::getStatus, status)
- .eq(!"0".equals(workingProcedure), Damage::getWorkingProcedure, workingProcedure);
-
- return this.page(page, damageSelectWrapper);
+ if (workingProcedure == null || workingProcedure.trim().isEmpty() || "0".equals(workingProcedure)) {
+ workingProcedure = null;
+ }
+ Page<DamageDTO> page = new Page<>(pageNum, pageSize);
+ List<DamageDTO> damages = this.baseMapper.selectDamageList(
+ startTime,
+ endTime,
+ type,
+ status,
+ workingProcedure
+ );
+ page.setTotal(damages.size());
+ int startIndex = (int) ((pageNum - 1) * pageSize);
+ int endIndex = Math.min((int) (pageNum * pageSize), damages.size());
+ if (startIndex < endIndex) {
+ List<DamageDTO> pageRecords = damages.subList(startIndex, endIndex);
+ page.setRecords(pageRecords);
+ } else {
+ page.setRecords(Collections.emptyList());
+ }
+ return page;
}
/**
@@ -432,7 +448,7 @@
}
@Override
- public List<Damage> queryUnTempByFlowCardId(String flowCardId){
+ public List<Damage> queryUnTempByFlowCardId(String flowCardId) {
return baseMapper.queryUnTempByFlowCardId(flowCardId);
}
}
--
Gitblit v1.8.0