法规技术评估-根据流程实例id、法规技术评估id 查询评估结果与符合性结果接口

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationResultEOController.java

@@ -184,4 +184,19 @@ public class LawsTechnologyEvaluationResultEOController extends JeroController<L
 		 lawsTechnologyEvaluationResultEOService.evaluatorSaveResult(json);
 		 return Result.OK("添加成功！");
 	 }
+
+	 /**
+	  * 根据流程实例id、法规技术评估id 查询评估结果与符合性结果接口
+	  * @param lawsTechnologyEvaluationResultEO
+	  * @param req
+	  * @return
+	  */
+	 @AutoLog(value = "法规技术评估流程-查询评估结果与符合性结果接口")
+	 @ApiOperation(value="法规技术评估流程-查询评估结果与符合性结果接口", notes="法规技术评估流程-查询评估结果与符合性结果接口")
+	 @GetMapping(value = "/queryEvaluationResultAndComplianceResult")
+	 public Result<?> queryEvaluationResultAndComplianceResult(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO,
+																	 HttpServletRequest req) {
+		 JSONObject json = lawsTechnologyEvaluationResultEOService.queryEvaluationResultAndComplianceResult(lawsTechnologyEvaluationResultEO,req);
+		 return Result.OK(json);
+	 }
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java

@@ -68,4 +68,12 @@ public interface ILawsTechnologyEvaluationResultEOService extends IService<LawsT
 	 * @param json
 	 */
     void evaluatorSaveResult(JSONObject json);
+
+	/**
+	 * 根据流程实例id、法规技术评估id 查询评估结果与符合性结果接口
+	 * @param lawsTechnologyEvaluationResultEO
+	 * @param req
+	 * @return
+	 */
+    JSONObject queryEvaluationResultAndComplianceResult(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO, HttpServletRequest req);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java

@@ -147,4 +147,21 @@ public class LawsTechnologyEvaluationResultEOServiceImpl extends ServiceImpl<Law
 			this.saveBatch(evaluationResultEOList);
 		}
 	}
+
+	@Override
+	public JSONObject queryEvaluationResultAndComplianceResult(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO, HttpServletRequest req) {
+		JSONObject result = new JSONObject();
+		List<LawsTechnologyEvaluationResultEO> evaluationResultEOList = this.queryList(lawsTechnologyEvaluationResultEO, req);
+		result.put("evaluationResultEOList",evaluationResultEOList);
+
+		QueryWrapper<LawsTechnologyEvaluationComplianceResultEO> complianceResultEOQueryWrapper = new QueryWrapper<>();
+		complianceResultEOQueryWrapper.lambda().eq(LawsTechnologyEvaluationComplianceResultEO::getActiProcInstId,lawsTechnologyEvaluationResultEO.getActiProcInstId());
+		complianceResultEOQueryWrapper.lambda().eq(LawsTechnologyEvaluationComplianceResultEO::getLawsTechnologyEvaluationId,lawsTechnologyEvaluationResultEO.getLawsTechnologyEvaluationId());
+		complianceResultEOQueryWrapper.lambda().eq(LawsTechnologyEvaluationComplianceResultEO::getCreateBy,lawsTechnologyEvaluationResultEO.getCreateBy());
+		List<LawsTechnologyEvaluationComplianceResultEO> complianceResultEOList = complianceResultEOService.list(complianceResultEOQueryWrapper);
+		if(CollectionUtils.isNotEmpty(complianceResultEOList)){
+			result.put("complianceResult",complianceResultEOList.get(0));
+		}
+		return result;
+	}
 }