diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationComplianceResultEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationComplianceResultEOController.java index 2cca22297..4d2b69ace 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationComplianceResultEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationComplianceResultEOController.java @@ -35,7 +35,7 @@ import com.jero.common.aspect.annotation.AutoLog; public class LawsTechnologyEvaluationComplianceResultEOController extends JeroController { @Autowired private ILawsTechnologyEvaluationComplianceResultEOService lawsTechnologyEvaluationComplianceResultEOService; - + /** * 分页列表查询 * @@ -66,8 +66,10 @@ public class LawsTechnologyEvaluationComplianceResultEOController extends JeroCo @AutoLog(value = "法规技术评估-评估人反馈-符合性结果表-列表查询") @ApiOperation(value="法规技术评估-评估人反馈-符合性结果表-列表查询", notes="法规技术评估-评估人反馈-符合性结果表-列表查询") @GetMapping(value = "/list") - public Result> queryList() { - List list = lawsTechnologyEvaluationComplianceResultEOService.queryList(); + public Result> queryList(LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO, + HttpServletRequest req, + @RequestParam(name="cut", defaultValue="cn") String cut) { + List list = lawsTechnologyEvaluationComplianceResultEOService.queryList(lawsTechnologyEvaluationComplianceResultEO,req,cut); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationComplianceResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationComplianceResultEO.java index d642d1c95..870313dd1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationComplianceResultEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationComplianceResultEO.java @@ -1,21 +1,19 @@ package com.jero.modules.lawsTechnologyEvaluation.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; +import java.util.List; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; -import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** @@ -76,4 +74,6 @@ public class LawsTechnologyEvaluationComplianceResultEO implements Serializable @ApiModelProperty(value = "流程实例id") private java.lang.String actiProcInstId; + @TableField(exist = false) + private List lawsTechnologyEvaluationResultEOList; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationComplianceResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationComplianceResultEOService.java index f93d11f0c..335fc9905 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationComplianceResultEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationComplianceResultEOService.java @@ -2,6 +2,8 @@ package com.jero.modules.lawsTechnologyEvaluation.service; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO; import com.baomidou.mybatisplus.extension.service.IService; + +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -57,5 +59,7 @@ public interface ILawsTechnologyEvaluationComplianceResultEOService extends ISer * * @return */ - List queryList(); + List queryList(LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO, + HttpServletRequest req, + String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java index 16849cd96..c95b3d3b2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java @@ -1,15 +1,26 @@ package com.jero.modules.lawsTechnologyEvaluation.service.impl; +import com.alibaba.druid.util.StringUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.system.query.QueryGenerator; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO; +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO; import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationComplianceResultEOMapper; import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationComplianceResultEOService; +import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationResultEOService; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; import java.util.Date; +import java.util.stream.Collectors; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletRequest; + /** * @Description: 法规技术评估-评估人反馈-符合性结果表 * @Author: jero-boot @@ -19,6 +30,8 @@ import org.springframework.transaction.annotation.Transactional; @Service @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends ServiceImpl implements ILawsTechnologyEvaluationComplianceResultEOService { + @Autowired + private ILawsTechnologyEvaluationResultEOService evaluationResultEOService; /** * 保存 @@ -86,7 +99,34 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi * @return */ @Override - public List queryList() { - return list(); + public List queryList(LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO, + HttpServletRequest req, + String cut) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationComplianceResultEO, req.getParameterMap()); + List complianceResultEOList = this.baseMapper.selectList(queryWrapper); + + if(CollectionUtils.isNotEmpty(complianceResultEOList)){ + + List complianceResultIdList = complianceResultEOList.stream().map(LawsTechnologyEvaluationComplianceResultEO::getId).distinct().collect(Collectors.toList()); + QueryWrapper evaluationResultEOQueryWrapper = new QueryWrapper<>(); + evaluationResultEOQueryWrapper.lambda().in(LawsTechnologyEvaluationResultEO::getComplianceResultId,complianceResultIdList); + List evaluationResultEOList = this.evaluationResultEOService.list(evaluationResultEOQueryWrapper); + + if(CollectionUtils.isNotEmpty(evaluationResultEOList)){ + for (LawsTechnologyEvaluationComplianceResultEO complianceResultEO : complianceResultEOList) { + List lawsTechnologyEvaluationResultEOList = evaluationResultEOList.stream().filter(evaluationResultEO ->{ + boolean flag = false; + if(StringUtils.equals(complianceResultEO.getId(),evaluationResultEO.getComplianceResultId())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + complianceResultEO.setLawsTechnologyEvaluationResultEOList(lawsTechnologyEvaluationResultEOList); + } + } + + } + return complianceResultEOList; } }