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 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 evaluationResultEOList = this.queryList(lawsTechnologyEvaluationResultEO, req); + result.put("evaluationResultEOList",evaluationResultEOList); + + QueryWrapper 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 complianceResultEOList = complianceResultEOService.list(complianceResultEOQueryWrapper); + if(CollectionUtils.isNotEmpty(complianceResultEOList)){ + result.put("complianceResult",complianceResultEOList.get(0)); + } + return result; + } }