From dcd94c375740209ce6d81273da6bec60a754146e Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 13 Jul 2022 16:56:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF=E8=AF=84?=
 =?UTF-8?q?=E4=BC=B0-=E6=A0=B9=E6=8D=AE=E6=B5=81=E7=A8=8B=E5=AE=9E?=
 =?UTF-8?q?=E4=BE=8Bid=E3=80=81=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0id=20=E6=9F=A5=E8=AF=A2=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E4=B8=8E=E7=AC=A6=E5=90=88=E6=80=A7=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...sTechnologyEvaluationResultEOController.java | 15 +++++++++++++++
 ...LawsTechnologyEvaluationResultEOService.java |  8 ++++++++
 ...TechnologyEvaluationResultEOServiceImpl.java | 17 +++++++++++++++++
 3 files changed, 40 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationResultEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationResultEOController.java
index 3b91ded39..61d19b865 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationResultEOController.java
+++ b/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);
+	 }
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java
index e7f842c8c..72ccf5561 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java
+++ b/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);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java
index 221725daa..da8eebbee 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java
+++ b/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;
+	}
 }