修改工艺

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

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml

@@ -162,7 +162,7 @@
         AND p.IS_DELETED = 0
 
         <if test="dsPart.plate != null and dsPart.plate != ''">
-            AND p.PLATE = LIKE '%' || #{dsPart.plate} || '%'
+            AND p.PLATE  LIKE '%' || #{dsPart.plate} || '%'
         </if>
         <if test="dsPart.partCode != null and dsPart.partCode != ''">
             AND p.PART_CODE LIKE '%' || #{dsPart.partCode} || '%'
@@ -174,7 +174,7 @@
             AND p.SIN_TER_TYPE = #{dsPart.sinTerType}
         </if>
         <if test="dsPart.material != null and dsPart.material != ''">
-            AND p.MATERIAL = LIKE '%' || #{dsPart.material} || '%'
+            AND p.MATERIAL  LIKE '%' || #{dsPart.material} || '%'
         </if>
         <if test="dsPart.powderWeight != null">
             AND p.POWDER_WEIGHT = #{dsPart.powderWeight}
@@ -183,10 +183,10 @@
             AND p.FORMING_THICKNESS = #{dsPart.formingThickness}
         </if>
         <if test="dsPart.productType != null">
-            AND p.PRODUCT_TYPE = LIKE '%' || #{dsPart.productType} || '%'
+            AND p.PRODUCT_TYPE  LIKE '%' || #{dsPart.productType} || '%'
         </if>
         <if test="dsPart.hardness != null">
-            AND p.HARDNESS = LIKE '%' || #{dsPart.hardness} || '%'
+            AND p.HARDNESS  LIKE '%' || #{dsPart.hardness} || '%'
         </if>
         <if test="dsPart.startDate != null and dsPart.endDate != null">
             AND p.NEXT_DUE BETWEEN TO_DATE(#{dsPart.startDate}, 'YYYY-MM-DD')

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<DsPartMapper, DsPartEntity> implements IDsPartService {
 
+	private static final Long UPDATE_FLAG_MODIFIED = -2L;
+
 	@Autowired
 	DsPartMapper dsPartMapper;
 
@@ -435,9 +437,17 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
 					//todo getErpDataPartClient().sendingPartGiveErp(dsPart);
 			}
 		}
+
 		if (!CollectionUtils.isEmpty(zPartList)) {
-			updateBatchById(zPartList);
+			for (DsPartEntity dsPartEntity : zPartList) {
+				if (UPDATE_FLAG_MODIFIED.equals(dsPartEntity.getUpdateUser())) {
+					dsPartEntity.setUpdateUser(AuthUtil.getUser().getUserId());
+					dsPartEntity.setUpdateTime(new Date());
+					this.updateById(dsPartEntity);
+				}
+			}
 		}
+
 		return true;
 	}
 

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTemplateServiceImpl.java

@@ -19,19 +19,22 @@ import org.springblade.desk.basic.util.QueryUtils;
 import org.springblade.desk.dashboard.pojo.vo.DsProModelVO;
 import org.springblade.desk.quality.excel.InspectionTemplateExcel;
 import org.springblade.desk.quality.mapper.InspectionTemplateMapper;
+import org.springblade.desk.quality.pojo.entity.InspectionItem;
 import org.springblade.desk.quality.pojo.entity.InspectionTemplate;
 import org.springblade.desk.quality.pojo.entity.RelInsTemplateItem;
+import org.springblade.desk.quality.pojo.entity.Standard;
 import org.springblade.desk.quality.pojo.request.InspectionTemplateSearch;
 import org.springblade.desk.quality.pojo.vo.InspectionTemplateVO;
+import org.springblade.desk.quality.service.IInspectionItemService;
 import org.springblade.desk.quality.service.IInspectionTemplateService;
 import org.springblade.desk.quality.service.IRelInsTemplateItemService;
+import org.springblade.desk.quality.service.IStandardService;
 import org.springblade.system.feign.IDictClient;
 import org.springblade.system.feign.IUserClient;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -56,6 +59,11 @@ public class InspectionTemplateServiceImpl extends BaseServiceImpl<InspectionTem
     private IUserClient userClient;
     @Resource
     private IRelInsTemplateItemService relInsTemplateItemService;
+    @Resource
+    private IInspectionItemService inspectionItemService;
+    @Resource
+    private IStandardService standardService;
+
 
     @Override
     public IPage<InspectionTemplateVO> selectInspectionTemplatePage(IPage<InspectionTemplateVO> page,
@@ -81,6 +89,50 @@ public class InspectionTemplateServiceImpl extends BaseServiceImpl<InspectionTem
             }
         }
         List<RelInsTemplateItem> detailList = relInsTemplateItemService.getListByTemplateId(vo.getId());
+        if (CollectionUtils.isNotEmpty(detailList)) {
+            // 检验项目
+            Set<Long> inspectionItemIds = detailList.stream()
+                    .map(RelInsTemplateItem::getInspectionItemId)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toSet());
+
+            if (CollectionUtils.isNotEmpty(inspectionItemIds)) {
+                List<InspectionItem> inspectionItems = inspectionItemService.listByIds(inspectionItemIds);
+                Map<Long, InspectionItem> 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<Long> standardIds = detailList.stream()
+                    .map(RelInsTemplateItem::getStandardId)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toSet());
+
+            if (CollectionUtils.isNotEmpty(standardIds)) {
+                List<Standard> standards = standardService.listByIds(standardIds);
+                Map<Long, Standard> 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<InspectionTem
                     log.error("查询类别名称失败, category: {}", vo.getCategory(), e);
                 }
             }
-                    }
+        }
 
         // 4. 按英文部分排序
         result.sort((o1, o2) -> {