Commit bf7df345 authored by 朱晨阳's avatar 朱晨阳

验收管理列表添加电站安装规模

parent b677f95a
......@@ -76,4 +76,7 @@ public class AcceptanceCheckDto extends BaseDto {
private String isAudit;
private String rectificationStatus;
// 电站安装规模
private String scale;
}
......@@ -16,6 +16,7 @@ import com.yeejoin.amos.boot.module.hygf.api.Enum.WorkOrderEnum;
import com.yeejoin.amos.boot.module.hygf.api.dto.*;
import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceCheckMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.PeasantHouseholdMapper;
import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceCheckService;
import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
......@@ -57,6 +58,8 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
@Autowired
PeasantHouseholdMapper peasantHouseholdMapper;
@Autowired
HouseholdContractMapper householdContractMapper;
@Autowired
ConstructionAcceptanceRecordsServiceImpl acceptanceRecordsService;
......@@ -80,6 +83,16 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
map.put("basicGridNodes",basicGridNodes);
map.put("type",type);
List<AcceptanceCheckDto> list = acceptanceCheckMapper.selectPageList(map);
if(list != null && list.size() > 0) {
list.forEach(e -> {
if(e.getPeasantHouseholdNo() != null) {
e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
}
});
}
PageInfo<AcceptanceCheckDto> page = new PageInfo(list);
Page<AcceptanceCheckDto> pageNew = new Page<>();
pageNew.setCurrent(current);
......
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