Browse Source

修复父亲是否健在等3个模型

master
sjh 1 year ago
parent
commit
eb920984d9
  1. 7
      src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseCSCZRKMapper.java
  2. 9
      src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java

7
src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseCSCZRKMapper.java

@ -2,7 +2,6 @@ package com.biutag.supervisiondata.mapper.dwd;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.biutag.supervisiondata.pojo.entity.dwd.GBaseCSCZRK; import com.biutag.supervisiondata.pojo.entity.dwd.GBaseCSCZRK;
import com.biutag.supervisiondata.pojo.entity.wdpc2.WdpcHZCRYXX;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import java.util.List; import java.util.List;
@ -58,7 +57,7 @@ public interface GBaseCSCZRKMapper extends BaseMapper<GBaseCSCZRK> {
+ "</foreach>" + "</foreach>"
+ ")" + ")"
+ "</script>") + "</script>")
List<GBaseCSCZRK> selectFamilyDiePeople(List<WdpcHZCRYXX> part); List<GBaseCSCZRK> selectFamilyDiePeople(List<String> part);
// 父亲是否健在 // 父亲是否健在
@Select("<script>" @Select("<script>"
@ -67,7 +66,7 @@ public interface GBaseCSCZRKMapper extends BaseMapper<GBaseCSCZRK> {
+ "#{item}" + "#{item}"
+ "</foreach>" + "</foreach>"
+ "</script>") + "</script>")
List<GBaseCSCZRK> selectFatherDiePeople(List<WdpcHZCRYXX> part); List<GBaseCSCZRK> selectFatherDiePeople(List<String> part);
// 母亲是否健在 // 母亲是否健在
@Select("<script>" @Select("<script>"
@ -76,7 +75,7 @@ public interface GBaseCSCZRKMapper extends BaseMapper<GBaseCSCZRK> {
+ "#{item}" + "#{item}"
+ "</foreach>" + "</foreach>"
+ "</script>") + "</script>")
List<GBaseCSCZRK> selectMotherDiePeople(List<WdpcHZCRYXX> part); List<GBaseCSCZRK> selectMotherDiePeople(List<String> part);
// 行为人子女数 // 行为人子女数
@Select("<script>" @Select("<script>"

9
src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java

@ -456,7 +456,8 @@ public class PointServiceImpl implements PointService {
.toList(); .toList();
for (List<WdpcHZCRYXX> wdpcHZCRYXXSPart : wdpcHZCRYXXSParts) { for (List<WdpcHZCRYXX> wdpcHZCRYXXSPart : wdpcHZCRYXXSParts) {
list.addAll(cSCZRKRepository.getBaseMapper().selectFatherDiePeople(wdpcHZCRYXXSPart)); List<String> ids = wdpcHZCRYXXSPart.stream().map(WdpcHZCRYXX::getIdCode).toList();
list.addAll(cSCZRKRepository.getBaseMapper().selectFatherDiePeople(ids));
} }
log.info("模型119查询结果数:{}", list.size()); log.info("模型119查询结果数:{}", list.size());
Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal)); Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal));
@ -507,7 +508,8 @@ public class PointServiceImpl implements PointService {
.toList(); .toList();
for (List<WdpcHZCRYXX> wdpcHZCRYXXSPart : wdpcHZCRYXXSParts) { for (List<WdpcHZCRYXX> wdpcHZCRYXXSPart : wdpcHZCRYXXSParts) {
list.addAll(cSCZRKRepository.getBaseMapper().selectMotherDiePeople(wdpcHZCRYXXSPart)); List<String> ids = wdpcHZCRYXXSPart.stream().map(WdpcHZCRYXX::getIdCode).toList();
list.addAll(cSCZRKRepository.getBaseMapper().selectMotherDiePeople(ids));
} }
log.info("模型120查询结果数:{}", list.size()); log.info("模型120查询结果数:{}", list.size());
Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal)); Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal));
@ -826,7 +828,8 @@ public class PointServiceImpl implements PointService {
.toList(); .toList();
for (List<WdpcHZCRYXX> wdpcHZCRYXXSPart : wdpcHZCRYXXSParts) { for (List<WdpcHZCRYXX> wdpcHZCRYXXSPart : wdpcHZCRYXXSParts) {
list.addAll(cSCZRKRepository.getBaseMapper().selectFamilyDiePeople(wdpcHZCRYXXSPart)); List<String> ids = wdpcHZCRYXXSPart.stream().map(WdpcHZCRYXX::getIdCode).toList();
list.addAll(cSCZRKRepository.getBaseMapper().selectFamilyDiePeople(ids));
} }
log.info("模型118查询结果数:{}", list.size()); log.info("模型118查询结果数:{}", list.size());
Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal)); Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal));

Loading…
Cancel
Save