法规技术评估-查询反馈评估结果接口。

2022-07-14 12:11:02 +08:00
parent 7e137a0c4a
commit a991958c52
4 changed files with 56 additions and 10 deletions
@@ -35,7 +35,7 @@ import com.jero.common.aspect.annotation.AutoLog;
 public class LawsTechnologyEvaluationComplianceResultEOController extends JeroController<LawsTechnologyEvaluationComplianceResultEO, ILawsTechnologyEvaluationComplianceResultEOService> {
 	@Autowired
 	private ILawsTechnologyEvaluationComplianceResultEOService lawsTechnologyEvaluationComplianceResultEOService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -66,8 +66,10 @@ public class LawsTechnologyEvaluationComplianceResultEOController extends JeroCo
 	@AutoLog(value = "法规技术评估-评估人反馈-符合性结果表-列表查询")
    @ApiOperation(value="法规技术评估-评估人反馈-符合性结果表-列表查询", notes="法规技术评估-评估人反馈-符合性结果表-列表查询")
 	@GetMapping(value = "/list")
-	public Result<List<LawsTechnologyEvaluationComplianceResultEO>> queryList() {
-        List<LawsTechnologyEvaluationComplianceResultEO> list = lawsTechnologyEvaluationComplianceResultEOService.queryList();
+	public Result<List<LawsTechnologyEvaluationComplianceResultEO>> queryList(LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO,
+																			  HttpServletRequest req,
+																			  @RequestParam(name="cut", defaultValue="cn") String cut) {
+        List<LawsTechnologyEvaluationComplianceResultEO> list = lawsTechnologyEvaluationComplianceResultEOService.queryList(lawsTechnologyEvaluationComplianceResultEO,req,cut);
        return Result.OK(list);
 	}

@@ -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<LawsTechnologyEvaluationResultEO> lawsTechnologyEvaluationResultEOList;
 }
@@ -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<LawsTechnologyEvaluationComplianceResultEO> queryList();
+    List<LawsTechnologyEvaluationComplianceResultEO> queryList(LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO,
+															   HttpServletRequest req,
+															   String cut);
 }
@@ -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<LawsTechnologyEvaluationComplianceResultEOMapper, LawsTechnologyEvaluationComplianceResultEO> implements ILawsTechnologyEvaluationComplianceResultEOService {
+	@Autowired
+	private ILawsTechnologyEvaluationResultEOService evaluationResultEOService;

 	/**
 	 * 保存
@@ -86,7 +99,34 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi
 	 * @return
 	 */
 	@Override
-    public List<LawsTechnologyEvaluationComplianceResultEO> queryList() {
-        return list();
+    public List<LawsTechnologyEvaluationComplianceResultEO> queryList(LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO,
+																	  HttpServletRequest req,
+																	  String cut) {
+		QueryWrapper<LawsTechnologyEvaluationComplianceResultEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationComplianceResultEO, req.getParameterMap());
+		List<LawsTechnologyEvaluationComplianceResultEO> complianceResultEOList = this.baseMapper.selectList(queryWrapper);
+
+		if(CollectionUtils.isNotEmpty(complianceResultEOList)){
+
+			List<String> complianceResultIdList = complianceResultEOList.stream().map(LawsTechnologyEvaluationComplianceResultEO::getId).distinct().collect(Collectors.toList());
+			QueryWrapper<LawsTechnologyEvaluationResultEO> evaluationResultEOQueryWrapper = new QueryWrapper<>();
+			evaluationResultEOQueryWrapper.lambda().in(LawsTechnologyEvaluationResultEO::getComplianceResultId,complianceResultIdList);
+			List<LawsTechnologyEvaluationResultEO> evaluationResultEOList = this.evaluationResultEOService.list(evaluationResultEOQueryWrapper);
+
+			if(CollectionUtils.isNotEmpty(evaluationResultEOList)){
+				for (LawsTechnologyEvaluationComplianceResultEO complianceResultEO : complianceResultEOList) {
+					List<LawsTechnologyEvaluationResultEO> 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;
    }
 }