|
@@ -19,6 +19,7 @@ import com.rongwei.rwadmincommon.system.service.SysConfigFeignService;
|
|
|
import com.rongwei.rwadmincommon.system.service.SysUserOrgService;
|
|
|
import com.rongwei.rwadmincommon.system.service.SysUserService;
|
|
|
import com.rongwei.rwcommon.base.QueryPar;
|
|
|
+import com.rongwei.rwcommon.base.R;
|
|
|
import com.rongwei.rwcommon.base.exception.CustomException;
|
|
|
import com.rongwei.rwcommon.utils.SecurityUtil;
|
|
|
import com.rongwei.rwcommon.utils.StringUtils;
|
|
@@ -46,6 +47,7 @@ import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
import static com.rongwei.safecommon.utils.SaveConstans.COMPANY_MAP;
|
|
|
+import static com.rongwei.safecommon.utils.SaveConstans.SysUser.CHECKIETM_MANAGEMENT_MAP;
|
|
|
import static com.rongwei.sfcommon.utils.CommonUtil.streamCodeGeneration;
|
|
|
|
|
|
@Service("pointCheckService")
|
|
@@ -479,8 +481,9 @@ public class PointCheckServiceImpl extends ServiceImpl<PointCheckDao, PointCheck
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public void excelExport(PointCheckExcelData excelData, HttpServletResponse response) {
|
|
|
+ public void excelExport(PointCheckExcelData excelData, HttpServletResponse response) {
|
|
|
logger.info("Excel导出开始...");
|
|
|
+
|
|
|
//1. 整理主子表数据
|
|
|
List<PointCheckVo> mains =pointCheckDao.getExcelDataByids(excelData.getIds());
|
|
|
//2.子表数据
|
|
@@ -535,6 +538,7 @@ public class PointCheckServiceImpl extends ServiceImpl<PointCheckDao, PointCheck
|
|
|
throw new CustomException("导出失败");
|
|
|
}
|
|
|
logger.info("Excel导出结束...");
|
|
|
+
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -612,7 +616,7 @@ public class PointCheckServiceImpl extends ServiceImpl<PointCheckDao, PointCheck
|
|
|
row.getCell(1).setCellValue(pointCheckItemDos.get(i).getCheckcontent());
|
|
|
row.getCell(2).setCellValue(pointCheckItemDos.get(i).getChecktype());
|
|
|
row.getCell(3).setCellValue(pointCheckItemDos.get(i).getCheckstandard());
|
|
|
- row.getCell(4).setCellValue(pointCheckItemDos.get(i).getManagement());
|
|
|
+ row.getCell(4).setCellValue(CHECKIETM_MANAGEMENT_MAP.get(pointCheckItemDos.get(i).getManagement()));
|
|
|
row.getCell(5).setCellValue(pointCheckItemDos.get(i).getQuotavalue()==null?null:pointCheckItemDos.get(i).getQuotavalue().toPlainString());
|
|
|
row.getCell(6).setCellValue(pointCheckItemDos.get(i).getRemark());
|
|
|
}
|