|
@@ -14,6 +14,7 @@ import com.usky.common.security.utils.SecurityUtils;
|
|
|
import com.usky.fire.domain.DemEnforceInspectRecord;
|
|
|
import com.usky.fire.mapper.DemEnforceInspectRecordMapper;
|
|
|
import com.usky.fire.service.DemEnforceInspectRecordService;
|
|
|
+import com.usky.fire.service.vo.DemEnforceInspectRecordVO;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
@@ -79,6 +80,49 @@ public class DemEnforceInspectRecordServiceImpl extends AbstractCrudService<DemE
|
|
|
return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public List<DemEnforceInspectRecordVO> enforceInspectRecordListExport(String projectCode, String companyName){
|
|
|
+ List<DemEnforceInspectRecordVO> list = new ArrayList<>();
|
|
|
+ LambdaQueryWrapper<DemEnforceInspectRecord> queryWrapper = Wrappers.lambdaQuery();
|
|
|
+ queryWrapper.select(DemEnforceInspectRecord::getId, DemEnforceInspectRecord::getProjectCode, DemEnforceInspectRecord::getCompanyName,
|
|
|
+ DemEnforceInspectRecord::getCompanyAddress, DemEnforceInspectRecord::getInspectDescript, DemEnforceInspectRecord::getInspectName,
|
|
|
+ DemEnforceInspectRecord::getFireDutyName, DemEnforceInspectRecord::getFireDutyPhone, DemEnforceInspectRecord::getFireManageName,
|
|
|
+ DemEnforceInspectRecord::getFireManagePhone, DemEnforceInspectRecord::getCompanyNatureName, DemEnforceInspectRecord::getEnforceInspectPerson,
|
|
|
+ DemEnforceInspectRecord::getSafeManageContent, DemEnforceInspectRecord::getFireProtectContent, DemEnforceInspectRecord::getSafeEvacuatContent,
|
|
|
+ DemEnforceInspectRecord::getBuildArea, DemEnforceInspectRecord::getBuildFloor, DemEnforceInspectRecord::getBuildHigh,
|
|
|
+ DemEnforceInspectRecord::getIllegalAct, DemEnforceInspectRecord::getHandlingSituation, DemEnforceInspectRecord::getInspectQualified)
|
|
|
+ .eq(DemEnforceInspectRecord::getEnable, 0)
|
|
|
+ .like(StringUtils.isNotBlank(projectCode), DemEnforceInspectRecord::getProjectCode, projectCode)
|
|
|
+ .like(StringUtils.isNotBlank(companyName), DemEnforceInspectRecord::getCompanyName, companyName)
|
|
|
+ .orderByDesc(DemEnforceInspectRecord::getId).last("limit 1000");
|
|
|
+ List<DemEnforceInspectRecord> list1 = this.list(queryWrapper);
|
|
|
+ if (CollectionUtils.isNotEmpty(list1)) {
|
|
|
+ for (int i = 0; i < list1.size(); i++) {
|
|
|
+ DemEnforceInspectRecordVO demEnforceInspectRecordVO = new DemEnforceInspectRecordVO();
|
|
|
+ demEnforceInspectRecordVO.setProjectCode(list1.get(i).getProjectCode());
|
|
|
+ demEnforceInspectRecordVO.setCompanyName(list1.get(i).getCompanyName());
|
|
|
+ demEnforceInspectRecordVO.setCompanyAddress(list1.get(i).getCompanyAddress());
|
|
|
+ demEnforceInspectRecordVO.setInspectName(list1.get(i).getInspectName());
|
|
|
+ demEnforceInspectRecordVO.setInspectDescript(list1.get(i).getInspectDescript());
|
|
|
+ demEnforceInspectRecordVO.setFireDutyName(list1.get(i).getFireDutyName());
|
|
|
+ demEnforceInspectRecordVO.setFireDutyPhone(list1.get(i).getFireDutyPhone());
|
|
|
+ demEnforceInspectRecordVO.setFireManageName(list1.get(i).getFireManageName());
|
|
|
+ demEnforceInspectRecordVO.setFireManagePhone(list1.get(i).getFireManagePhone());
|
|
|
+ demEnforceInspectRecordVO.setCompanyNatureName(list1.get(i).getCompanyNatureName());
|
|
|
+ demEnforceInspectRecordVO.setEnforceInspectPerson(list1.get(i).getEnforceInspectPerson());
|
|
|
+ demEnforceInspectRecordVO.setBuildArea(list1.get(i).getBuildArea());
|
|
|
+ demEnforceInspectRecordVO.setIllegalAct(list1.get(i).getIllegalAct());
|
|
|
+ demEnforceInspectRecordVO.setInspectQualified(list1.get(i).getInspectQualified());
|
|
|
+ demEnforceInspectRecordVO.setBuildFloor(list1.get(i).getBuildFloor());
|
|
|
+ demEnforceInspectRecordVO.setBuildHigh(list1.get(i).getBuildHigh());
|
|
|
+ demEnforceInspectRecordVO.setHandlingSituation(list1.get(i).getHandlingSituation());
|
|
|
+ list.add(demEnforceInspectRecordVO);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return list;
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public void updateEnforceInspectRecord(DemEnforceInspectRecord demEnforceInspectRecord) {
|
|
|
String ipAddr = IpUtils.getIpAddr(ServletUtils.getRequest());
|