Commit 859550dd authored by 李秀明's avatar 李秀明

匹配条件修改

parent 5efe113f
package com.yeejoin.amos.boot.module.hygf.biz.service.impl; package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yeejoin.amos.boot.module.hygf.api.Enum.AcceptanceStatusEnum; import com.yeejoin.amos.boot.module.hygf.api.Enum.AcceptanceStatusEnum;
...@@ -13,6 +11,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance; ...@@ -13,6 +11,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance;
import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceCheckItemMapper; import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceCheckItemMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceMapper; import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridAcceptanceMapper; import com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridAcceptanceMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.PeasantHouseholdMapper;
import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceService; import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
...@@ -33,6 +32,8 @@ public class AcceptanceServiceImpl implements IAcceptanceService { ...@@ -33,6 +32,8 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
@Autowired @Autowired
private BasicGridAcceptanceMapper basicGridAcceptanceMapper; private BasicGridAcceptanceMapper basicGridAcceptanceMapper;
@Autowired @Autowired
private PeasantHouseholdMapper peasantHouseholdMapper;
@Autowired
private AcceptanceCheckItemMapper acceptanceCheckItemMapper; private AcceptanceCheckItemMapper acceptanceCheckItemMapper;
/** /**
...@@ -93,7 +94,7 @@ public class AcceptanceServiceImpl implements IAcceptanceService { ...@@ -93,7 +94,7 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
// 检查项信息 // 检查项信息
AcceptanceCheckItem acceptanceCheckItem = acceptanceCheckItemMapper.selectOne( AcceptanceCheckItem acceptanceCheckItem = acceptanceCheckItemMapper.selectOne(
Wrappers.<AcceptanceCheckItem>lambdaQuery() Wrappers.<AcceptanceCheckItem>lambdaQuery()
.eq(AcceptanceCheckItem::getWorkOrderPowerStationId, basicGridAcceptance.getWorkOrderPowerStationId()) .eq(AcceptanceCheckItem::getPeasantHouseholdId, basicGridAcceptance.getPeasantHouseholdId())
); );
AcceptanceCheckItemDto acceptanceCheckItemDto = new AcceptanceCheckItemDto(); AcceptanceCheckItemDto acceptanceCheckItemDto = new AcceptanceCheckItemDto();
BeanUtils.copyProperties(acceptanceCheckItem, acceptanceCheckItemDto); BeanUtils.copyProperties(acceptanceCheckItem, acceptanceCheckItemDto);
...@@ -103,7 +104,7 @@ public class AcceptanceServiceImpl implements IAcceptanceService { ...@@ -103,7 +104,7 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
} }
@Override @Override
public AcceptanceCheckItem saveEntity(AcceptanceCheckItem item) { public AcceptanceCheckItem saveEntity(AcceptanceCheckItem item) {
acceptanceCheckItemMapper.insert(item); acceptanceCheckItemMapper.insert(item);
return Optional.ofNullable(item).orElse(new AcceptanceCheckItem()); return Optional.ofNullable(item).orElse(new AcceptanceCheckItem());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment