处理只有名称没有id问题

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
@@ -64,8 +65,12 @@ import org.springblade.desk.produce.service.IPdaSaveService;
 import org.springblade.desk.produce.service.IWorkOrderService;
 import org.springblade.desk.produce.service.IWorkPlanService;
 import org.springblade.desk.quality.pojo.dto.PpmReportDetailDTO;
+import org.springblade.desk.quality.pojo.entity.InspectionItem;
+import org.springblade.desk.quality.pojo.entity.Standard;
 import org.springblade.desk.quality.pojo.request.ReviewSheetErpSearch;
+import org.springblade.desk.quality.service.IInspectionItemService;
 import org.springblade.desk.quality.service.IReviewSheetService;
+import org.springblade.desk.quality.service.IStandardService;
 import org.springblade.erpdata.feign.IErpDataReworkTaskClient;
 import org.springblade.scheduling.pojo.entity.PartRelationEntity;
 import org.springblade.scheduling.pojo.entity.WorkOrderEntity;
@@ -198,6 +203,12 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 	@Lazy
 	IPdaSaveService pdaSaveService;
 
+	@Resource
+	IInspectionItemService inspectionItemService;
+
+	@Resource
+	private IStandardService standardService;
+
 	@Override
 	public IPage<DsTaskingVO> selectAssignList(IPage<DsTaskingVO> page, DsTaskingVO dsTasking) {
 		List<DsTaskingVO> dsTaskingVOS = baseMapper.selectDsTaskingPage(page, dsTasking);
@@ -1065,6 +1076,7 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 				for (DsCraftVO craftVO : dsCraftVOList) {
 					// 查询工序信息
 					List<DsProcessEntity> processEntities = processService.selectDsProcessByCraftId(craftVO.getId());
+
 					// 每次循环创建新的craftTree对象
 					CraftTreeVO craftTree1 = new CraftTreeVO();
 					craftVO.setReworkOrder(dsTaskingEntity.getReworkOrder());
@@ -1149,6 +1161,20 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 	 * 将正常工序列表转换为返工工序列表
 	 */
 	private List<PrReworkProcessEntity> convertToReworkProcessList(List<DsProcessEntity> processEntities, DsTaskingEntity dsTaskingEntity) {
+		for (DsProcessEntity processEntity : processEntities) {
+			if (processEntity == null) {
+				continue;
+			}
+
+			Optional.ofNullable(processEntity.getPpsId())
+					.map(processSetService::getById)
+					.ifPresent(processSet -> processEntity.setProcessName(processSet.getName()));
+
+			Optional.ofNullable(processEntity.getCaId())
+					.map(craftAbilityService::getById)
+					.ifPresent(craftAbility -> processEntity.setCraftName(craftAbility.getCaName()));
+		}
+
 		List<WorkPlan> originalOrderProcess = pdaSaveService.getOriginalOrderProcess(dsTaskingEntity.getPartCode(), dsTaskingEntity.getBatchNo());
 		// 转换为Map便于快速查找
 		Map<Long, WorkPlan> workPlanMap = new HashMap<>();
@@ -2337,6 +2363,18 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 					processProjectList.forEach(item -> {
 						item.setId(null);
 						item.setProcessId(dsProcessEntity.getId());
+
+						// 根据项目名称查询项目编码
+						if (StringUtils.isEmpty(item.getProjectCode()) && !StringUtils.isEmpty(item.getProjectName())) {
+							Optional.ofNullable(inspectionItemService.selectByName(item.getProjectName()))
+									.ifPresent(inspectionItem -> item.setProjectCode(inspectionItem.getId().toString()));
+						}
+
+						// 根据项目标准名称查询项目标准
+						if (StringUtils.isEmpty(item.getProjectStandard()) && !StringUtils.isEmpty(item.getProjectStandardName())) {
+							Optional.ofNullable(standardService.selectByName(item.getProjectStandardName()))
+									.ifPresent(standard -> item.setProjectStandard(standard.getId().toString()));
+						}
 					});
 					if(!CollectionUtils.isEmpty(processProjectList)){
 						boolean processProjectSaveBatch = processProjectService.saveBatch(processProjectList);

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionItemMapper.java

@@ -37,4 +37,6 @@ public interface InspectionItemMapper extends BaseMapper<InspectionItem> {
 	 * @return List<InspectionItemExcel>
 	 */
 	List<InspectionItemExcel> exportInspectionItem(@Param("ew") Wrapper<InspectionItem> queryWrapper);
+
+    InspectionItem selectByName(@Param("projectName") String projectName);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionItemMapper.xml

@@ -36,4 +36,10 @@
         SELECT *
         FROM QA_INSPECTION_ITEM ${ew.customSqlSegment}
     </select>
+    <select id="selectByName" resultType="org.springblade.desk.quality.pojo.entity.InspectionItem">
+         SELECT *
+        FROM QA_INSPECTION_ITEM
+        WHERE is_deleted = 0
+        and `name` = #{projectName}
+    </select>
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/StandardMapper.java

@@ -37,4 +37,6 @@ public interface StandardMapper extends BaseMapper<Standard> {
 	 * @return List<StandardExcel>
 	 */
 	List<StandardExcel> exportStandard(@Param("ew") Wrapper<Standard> queryWrapper);
+
+    Standard selectByName(@Param("projectStandardName") String projectStandardName);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/StandardMapper.xml

@@ -35,4 +35,10 @@
         SELECT *
         FROM QA_STANDARD ${ew.customSqlSegment}
     </select>
+    <select id="selectByName" resultType="org.springblade.desk.quality.pojo.entity.Standard">
+        SELECT *
+        FROM QA_STANDARD
+        WHERE is_deleted = 0
+        and `name` = #{projectStandardName}
+    </select>
 </mapper>

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

@@ -42,4 +42,11 @@ public interface IInspectionItemService extends BaseService<InspectionItem> {
      * @param vo
      */
     void setVOValue(InspectionItemVO vo);
+
+	/**
+	 * 根据名称查询
+	 * @param projectName
+	 * @return
+	 */
+	InspectionItem selectByName(String projectName);
 }

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

@@ -37,4 +37,6 @@ public interface IStandardService extends BaseService<Standard> {
 	List<StandardExcel> exportStandard(Wrapper<Standard> queryWrapper);
 
 	void setVOValue(StandardVO vo);
+
+	Standard selectByName(String projectStandardName);
 }

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

@@ -48,4 +48,9 @@ public class InspectionItemServiceImpl extends BaseServiceImpl<InspectionItemMap
     public void setVOValue(InspectionItemVO vo) {
 
     }
+
+	@Override
+	public InspectionItem selectByName(String projectName) {
+		return baseMapper.selectByName(projectName);
+	}
 }

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

@@ -65,4 +65,9 @@ public class StandardServiceImpl extends BaseServiceImpl<StandardMapper, Standar
             }
         }
     }
+
+    @Override
+    public Standard selectByName(String projectStandardName) {
+        return baseMapper.selectByName(projectStandardName);
+    }
 }