|
@@ -13,10 +13,12 @@ import com.usky.fire.domain.DemAtlInspectDeclare;
|
|
|
import com.usky.fire.mapper.DemAtlInspectDeclareMapper;
|
|
|
import com.usky.fire.service.DemAtlInspectCertificateService;
|
|
|
import com.usky.fire.service.DemAtlInspectDeclareService;
|
|
|
+import com.usky.fire.service.vo.DemAtlInspectDeclareExportVO;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
+import java.time.format.DateTimeFormatter;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
@@ -104,6 +106,71 @@ public class DemAtlInspectDeclareServiceImpl extends AbstractCrudService<DemAtlI
|
|
|
return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public List<DemAtlInspectDeclareExportVO> atlInspectDeclareListExport(String projectCode, String declareCompanyName, Integer id){
|
|
|
+ List<DemAtlInspectDeclareExportVO> list = new ArrayList<>();
|
|
|
+ LambdaQueryWrapper<DemAtlInspectDeclare> queryWrapper = Wrappers.lambdaQuery();
|
|
|
+ queryWrapper.select(DemAtlInspectDeclare::getId, DemAtlInspectDeclare::getProjectCode, DemAtlInspectDeclare::getDeclareCompanyName,
|
|
|
+ DemAtlInspectDeclare::getDeclarePerson, DemAtlInspectDeclare::getFillTime, DemAtlInspectDeclare::getSiteName,
|
|
|
+ DemAtlInspectDeclare::getLegalRepresentative, DemAtlInspectDeclare::getSiteArea, DemAtlInspectDeclare::getLinkPerson,
|
|
|
+ DemAtlInspectDeclare::getLinkPhone, DemAtlInspectDeclare::getSiteNature, DemAtlInspectDeclare::getBuildNature,
|
|
|
+ DemAtlInspectDeclare::getAcceptStatus, DemAtlInspectDeclare::getFireFacilities, DemAtlInspectDeclare::getAcceptName,
|
|
|
+ DemAtlInspectDeclare::getAcceptTime)
|
|
|
+ .eq(DemAtlInspectDeclare::getDeleteFlag, 0)
|
|
|
+ .eq(id != null & id != 0, DemAtlInspectDeclare::getId, id)
|
|
|
+ .like(StringUtils.isNotBlank(projectCode), DemAtlInspectDeclare::getProjectCode, projectCode)
|
|
|
+ .like(StringUtils.isNotBlank(declareCompanyName), DemAtlInspectDeclare::getDeclareCompanyName, declareCompanyName)
|
|
|
+ .orderByDesc(DemAtlInspectDeclare::getId);
|
|
|
+ List<DemAtlInspectDeclare> list1= this.list(queryWrapper);
|
|
|
+ if (CollectionUtils.isNotEmpty(list1)) {
|
|
|
+ List<String> projectCodeList = new ArrayList<>();
|
|
|
+ for (int i = 0; i < list1.size(); i++) {
|
|
|
+ projectCodeList.add(list1.get(i).getProjectCode());
|
|
|
+ }
|
|
|
+ List<DemAtlInspectCertificate> list2 = new ArrayList<>();
|
|
|
+ if (CollectionUtils.isNotEmpty(projectCodeList)) {
|
|
|
+ LambdaQueryWrapper<DemAtlInspectCertificate> queryWrapper1 = Wrappers.lambdaQuery();
|
|
|
+ queryWrapper1.select(DemAtlInspectCertificate::getId, DemAtlInspectCertificate::getProjectCode,
|
|
|
+ DemAtlInspectCertificate::getSafetyPerson, DemAtlInspectCertificate::getUseNature,
|
|
|
+ DemAtlInspectCertificate::getSiteAddress)
|
|
|
+ .in(DemAtlInspectCertificate::getProjectCode, projectCodeList)
|
|
|
+ .eq(DemAtlInspectCertificate::getDeleteFlag, 0);
|
|
|
+ list2 = demAtlInspectCertificateService.list(queryWrapper1);
|
|
|
+ }
|
|
|
+ for (int i = 0; i < list1.size(); i++) {
|
|
|
+ DemAtlInspectDeclareExportVO demAtlInspectDeclareExportVO = new DemAtlInspectDeclareExportVO();
|
|
|
+ demAtlInspectDeclareExportVO.setProjectCode(list1.get(i).getProjectCode());
|
|
|
+ demAtlInspectDeclareExportVO.setDeclareCompanyName(list1.get(i).getDeclareCompanyName());
|
|
|
+ demAtlInspectDeclareExportVO.setDeclarePerson(list1.get(i).getDeclarePerson());
|
|
|
+ demAtlInspectDeclareExportVO.setFillTime((list1.get(i).getFillTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
|
|
|
+ demAtlInspectDeclareExportVO.setSiteName(list1.get(i).getSiteName());
|
|
|
+ demAtlInspectDeclareExportVO.setLegalRepresentative(list1.get(i).getLegalRepresentative());
|
|
|
+ demAtlInspectDeclareExportVO.setSiteArea(list1.get(i).getSiteArea());
|
|
|
+ demAtlInspectDeclareExportVO.setLinkPerson(list1.get(i).getLinkPerson());
|
|
|
+ demAtlInspectDeclareExportVO.setLinkPhone(list1.get(i).getLinkPhone());
|
|
|
+ demAtlInspectDeclareExportVO.setSiteNature(list1.get(i).getSiteNature());
|
|
|
+ demAtlInspectDeclareExportVO.setBuildNature(list1.get(i).getBuildNature());
|
|
|
+ demAtlInspectDeclareExportVO.setSiteAddress(null);
|
|
|
+ demAtlInspectDeclareExportVO.setUseNature(null);
|
|
|
+ demAtlInspectDeclareExportVO.setSafetyPerson(null);
|
|
|
+ demAtlInspectDeclareExportVO.setFireFacilities(list1.get(i).getFireFacilities());
|
|
|
+ demAtlInspectDeclareExportVO.setAcceptTime((list1.get(i).getAcceptTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
|
|
|
+ demAtlInspectDeclareExportVO.setAcceptStatus(list1.get(i).getAcceptStatus());
|
|
|
+ demAtlInspectDeclareExportVO.setAcceptName(list1.get(i).getAcceptName());
|
|
|
+ for (int j = 0; j < list2.size(); j++) {
|
|
|
+ if (list1.get(i).getProjectCode().equals(list2.get(j).getProjectCode())) {
|
|
|
+ demAtlInspectDeclareExportVO.setSiteAddress(list2.get(j).getSiteAddress());
|
|
|
+ demAtlInspectDeclareExportVO.setUseNature(list2.get(j).getUseNature());
|
|
|
+ demAtlInspectDeclareExportVO.setSafetyPerson(list2.get(j).getSafetyPerson());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ list.add(demAtlInspectDeclareExportVO);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return list;
|
|
|
+ }
|
|
|
+
|
|
|
@Transactional
|
|
|
@Override
|
|
|
public void updateAtlInspectCertificate(DemAtlInspectDeclare demAtlInspectDeclare) {
|