diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java
index 143df5007..955836314 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java
@@ -3,6 +3,7 @@
*/
package org.springblade.desk.quality.pojo.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -78,4 +79,15 @@ public class RelInsTemplateItem extends BaseEntity {
*/
@Schema(description = "项目编号")
private String itemCode;
+
+ /**
+ *项目名称
+ */
+ @TableField(exist = false)
+ private String inspectionItemName;
+ /**
+ * 标准名称
+ */
+ @TableField(exist = false)
+ private String standardName;
}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml
index 0cd9f3d5f..abcb64253 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml
@@ -162,7 +162,7 @@
AND p.IS_DELETED = 0
- AND p.PLATE = LIKE '%' || #{dsPart.plate} || '%'
+ AND p.PLATE LIKE '%' || #{dsPart.plate} || '%'
AND p.PART_CODE LIKE '%' || #{dsPart.partCode} || '%'
@@ -174,7 +174,7 @@
AND p.SIN_TER_TYPE = #{dsPart.sinTerType}
- AND p.MATERIAL = LIKE '%' || #{dsPart.material} || '%'
+ AND p.MATERIAL LIKE '%' || #{dsPart.material} || '%'
AND p.POWDER_WEIGHT = #{dsPart.powderWeight}
@@ -183,10 +183,10 @@
AND p.FORMING_THICKNESS = #{dsPart.formingThickness}
- AND p.PRODUCT_TYPE = LIKE '%' || #{dsPart.productType} || '%'
+ AND p.PRODUCT_TYPE LIKE '%' || #{dsPart.productType} || '%'
- AND p.HARDNESS = LIKE '%' || #{dsPart.hardness} || '%'
+ AND p.HARDNESS LIKE '%' || #{dsPart.hardness} || '%'
AND p.NEXT_DUE BETWEEN TO_DATE(#{dsPart.startDate}, 'YYYY-MM-DD')
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java
index a7fae8015..f8d42a900 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java
@@ -63,6 +63,8 @@ import java.util.stream.Collectors;
@Service
public class DsPartServiceImpl extends BaseServiceImpl implements IDsPartService {
+ private static final Long UPDATE_FLAG_MODIFIED = -2L;
+
@Autowired
DsPartMapper dsPartMapper;
@@ -435,9 +437,17 @@ public class DsPartServiceImpl extends BaseServiceImpl selectInspectionTemplatePage(IPage page,
@@ -81,6 +89,50 @@ public class InspectionTemplateServiceImpl extends BaseServiceImpl detailList = relInsTemplateItemService.getListByTemplateId(vo.getId());
+ if (CollectionUtils.isNotEmpty(detailList)) {
+ // 检验项目
+ Set inspectionItemIds = detailList.stream()
+ .map(RelInsTemplateItem::getInspectionItemId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toSet());
+
+ if (CollectionUtils.isNotEmpty(inspectionItemIds)) {
+ List inspectionItems = inspectionItemService.listByIds(inspectionItemIds);
+ Map inspectionItemMap = inspectionItems.stream()
+ .collect(Collectors.toMap(InspectionItem::getId, Function.identity()));
+
+ // 设置检验项目名称
+ detailList.forEach(item -> {
+ if (item.getInspectionItemId() != null) {
+ InspectionItem inspectionItem = inspectionItemMap.get(item.getInspectionItemId());
+ if (inspectionItem != null) {
+ item.setInspectionItemName(inspectionItem.getName());
+ }
+ }
+ });
+ }
+
+ // 检验标准
+ Set standardIds = detailList.stream()
+ .map(RelInsTemplateItem::getStandardId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toSet());
+
+ if (CollectionUtils.isNotEmpty(standardIds)) {
+ List standards = standardService.listByIds(standardIds);
+ Map standardMap = standards.stream()
+ .collect(Collectors.toMap(Standard::getId, Function.identity()));
+
+ detailList.forEach(item -> {
+ if (item.getStandardId() != null) {
+ Standard standard = standardMap.get(item.getStandardId());
+ if (standard != null) {
+ item.setStandardName(standard.getName());
+ }
+ }
+ });
+ }
+ }
vo.setDetailList(detailList);
}
@@ -136,7 +188,7 @@ public class InspectionTemplateServiceImpl extends BaseServiceImpl {