#328-5 项目复议后解析结构化数据失败

com.gx.obe.service/src/main/java/com/gx/obe/server/management/project/service/impl/TenderProjectServiceImpl.java

@@ -3,9 +3,7 @@ package com.gx.obe.server.management.project.service.impl;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.gx.obe.server.common.utils.UuidUtils;
 import com.gx.obe.server.management.check.entity.CheckResult;
 import com.gx.obe.server.management.check.service.CheckResultService;
@@ -21,6 +19,8 @@ import com.gx.obe.server.management.expert.service.EvaluationStepExpertService;
 import com.gx.obe.server.management.expert.service.ExpertEvaluationResultService;
 import com.gx.obe.server.management.expert.service.ExpertEvaluationStepService;
 import com.gx.obe.server.management.expert.service.ExpertService;
+import com.gx.obe.server.management.struct_new.entity.ObeEvaluationContent;
+import com.gx.obe.server.management.struct_new.service.ObeEvaluationContentService;
 import com.gx.obe.server.management.supplier.entity.SupplierEvaluationResult;
 import com.gx.obe.server.management.supplier.entity.SupplierEvaluationStep;
 import com.gx.obe.server.management.supplier.service.SupplierEvaluationResultService;
@@ -71,7 +71,9 @@ import com.gx.obe.server.management.vo.TenderPackOpeningInfo;
 import com.gx.obe.server.management.vo.TenderPackPriceFactorVo;
 import com.gx.obe.server.management.vo.TenderProjectVo;
 
-  /**  
+import javax.annotation.Resource;
+
+/**
  * 
  * @author 
  * @Title: IObeTenderProjectService
@@ -100,6 +102,9 @@ public class TenderProjectServiceImpl extends ServiceImpl<TenderProjectMapper, T
 	
 	@Autowired
 	private SupplierService supplierService;
+
+	@Resource
+	private ObeEvaluationContentService obeEvaluationContentServices;
 	
 	@Autowired
 	private SupplierOpeningResultMapper supplierOpeningResultMapper;
@@ -491,16 +496,19 @@ public class TenderProjectServiceImpl extends ServiceImpl<TenderProjectMapper, T
 		
 		return tenderProjectOpeningInfo;
 	}
-	
-	
+
+
 	/**
 	 * @Description: 按分页查询评标项目
 	 * @author mazc
 	 * @param page
-	 * @param user
-	 * @param useSatus
+	 * @param userId
+	 * @param userType
+	 * @param evaluationStatus
 	 * @param searchKey
-	 * @return 
+	 * @param startTime
+	 * @param endTime
+	 * @return
 	 */
 	@Override
     public IPage<TenderProjectVo> getEvaluationProjectPageList(Page<TenderProjectVo> page, String userId, String userType, String evaluationStatus, String searchKey, Date startTime, Date endTime) {
@@ -544,7 +552,7 @@ public class TenderProjectServiceImpl extends ServiceImpl<TenderProjectMapper, T
 	 * @Description: 获得分包项目
 	 * @author mazc
 	 * @param page
-	 * @param tenderId
+	 * @param parentId
 	 * @return 
 	 */
 	@Override
@@ -1446,7 +1454,7 @@ public class TenderProjectServiceImpl extends ServiceImpl<TenderProjectMapper, T
 	
 	/**
 	 * @Description: 验证项目是否已经完成指定阶段的开标
-	 * @param tenderId
+	 * @param projectId
 	 * @param bidopeningStage
 	 * @return
 	 */
@@ -1626,6 +1634,7 @@ public class TenderProjectServiceImpl extends ServiceImpl<TenderProjectMapper, T
 
 			  this.expertService.saveBatch(expertList);
 			  System.out.println("专家信息复制完毕" + new Date());
+
 			  QueryWrapper<EvaluationFactor> evaluationFactorQueryWrapper = new QueryWrapper();
 			  evaluationFactorQueryWrapper.lambda().eq(EvaluationFactor::getTenderId, tenderId);
 			  List<EvaluationFactor> evaluationFactorList = this.evaluationFactorService.list(evaluationFactorQueryWrapper);
@@ -1650,6 +1659,21 @@ public class TenderProjectServiceImpl extends ServiceImpl<TenderProjectMapper, T
 
 			  this.evaluationFactorService.saveBatch(evaluationFactorList);
 			  System.out.println("指标信息复制完毕" + new Date());
+
+			  QueryWrapper<ObeEvaluationContent> obeEvaluationContentMapper = new QueryWrapper();
+			  obeEvaluationContentMapper.lambda().eq(ObeEvaluationContent::getTenderId, tenderId);
+			  List<ObeEvaluationContent> obeEvaluationContentList = this.obeEvaluationContentServices.list(obeEvaluationContentMapper);
+			  Iterator<ObeEvaluationContent> var38 = obeEvaluationContentList.iterator();
+
+			  while(var38.hasNext()){
+				  ObeEvaluationContent obeEvaluationContent = var38.next();
+				  String obeEvaluationContentUuid = UuidUtils.getUUID();
+				  obeEvaluationContent.setId(obeEvaluationContentUuid);
+				  obeEvaluationContent.setTenderId(tenderProjectUUid);
+			  }
+			  this.obeEvaluationContentServices.saveBatch(obeEvaluationContentList);
+			  System.out.println("指标项信息复制完毕2" + new Date());
+
 			  QueryWrapper<ExpertEvaluationStep> queryWrapper = new QueryWrapper();
 			  queryWrapper.lambda().eq(ExpertEvaluationStep::getTenderId, tenderId);
 			  List<ExpertEvaluationStep> expertEvaluationStepList = this.expertEvaluationStepService.list(queryWrapper);