Commit 8304be10 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12

parents 7ec74a60 8de0ce99
......@@ -18,6 +18,7 @@
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
import lombok.Data;
......@@ -31,6 +32,7 @@ import java.io.Serializable;
* @date 2025-6-19 15:09:18
*/
@Data
@ColumnWidth(15)
public class TGzEmpInfoExportEducation implements Serializable {
// 流程ID 姓名 证件号码 学历 学位 教育方式 院校名称 入学日期 毕业日期 毕业类型 专业 是否最高学历 是否最高学位 是否第一学历
......
......@@ -18,6 +18,7 @@
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
import lombok.Data;
......@@ -31,6 +32,7 @@ import java.io.Serializable;
* @date 2025-6-19 15:35:34
*/
@Data
@ColumnWidth(15)
public class TGzEmpInfoExportFamily implements Serializable {
// 流程ID 姓名 证件号码 与成员关系 姓名 联系电话 地址 所在单位名称 是否客户单位任职 职务
......
......@@ -18,6 +18,7 @@
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import lombok.Data;
import java.io.Serializable;
......@@ -29,6 +30,7 @@ import java.io.Serializable;
* @date 2025-6-19 15:42:45
*/
@Data
@ColumnWidth(15)
public class TGzEmpInfoExportSkill implements Serializable {
// 流程ID 姓名 证件号码 专业技能名称 获得日期 授予单位 技术等级
......
......@@ -18,6 +18,7 @@
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import lombok.Data;
import java.io.Serializable;
......@@ -29,6 +30,7 @@ import java.io.Serializable;
* @date 2025-6-19 15:09:18
*/
@Data
@ColumnWidth(15)
public class TGzEmpInfoExportWork implements Serializable {
// 流程ID 姓名 证件号码 单位名称 开始日期 结束日期 所在部门 职务名称 证明人 证明人联系电话
......
......@@ -253,13 +253,14 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
if (count > CommonConstants.ZERO_INT) {
// 1:主表+紧急联系人
WriteSheet writeSheet;
int sheetIndex = 1;
for (int i = 0; i <= count; i += CommonConstants.EXCEL_EXPORT_LIMIT) {
// 获取实际记录
searchVo.setLimitStart(i);
searchVo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT);
list = baseMapper.getTGzEmpInfoList(searchVo);
if (Common.isNotNull(list)) {
writeSheet = EasyExcelFactory.writerSheet(index, "基础信息" + index)
writeSheet = EasyExcelFactory.writerSheet(index, "基础信息" + (sheetIndex++))
.head(TGzEmpInfoExportMain.class)
.registerConverter(new DictConverter(nameAndDicTypeMap, redisLabelMap)).build();
excelWriter.write(list, writeSheet);
......@@ -274,6 +275,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
// 2.1教育经历
count = baseMapper.getTGzEmpInfoCountEducation(searchVo);
if (count > CommonConstants.ZERO_INT) {
sheetIndex = 1;
List<TGzEmpInfoExportEducation> listEducation;
for (int i = 0; i <= count; i += CommonConstants.EXCEL_EXPORT_LIMIT) {
// 获取实际记录
......@@ -281,7 +283,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
searchVo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT);
listEducation = baseMapper.getTGzEmpInfoListEducation(searchVo);
if (Common.isNotNull(listEducation)) {
writeSheet = EasyExcelFactory.writerSheet(index,"教育经历" + index).head(TGzEmpInfoExportEducation.class)
writeSheet = EasyExcelFactory.writerSheet(index,"教育经历" + (sheetIndex++)).head(TGzEmpInfoExportEducation.class)
.registerConverter(new DictConverter(nameAndDicTypeMap, redisLabelMap)).build();
excelWriter.write(listEducation, writeSheet);
index++;
......@@ -294,6 +296,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
// 2.2工作经历
count = baseMapper.getTGzEmpInfoCountWork(searchVo);
if (count > CommonConstants.ZERO_INT) {
sheetIndex = 1;
List<TGzEmpInfoExportWork> listWork;
for (int i = 0; i <= count; i += CommonConstants.EXCEL_EXPORT_LIMIT) {
// 获取实际记录
......@@ -301,7 +304,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
searchVo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT);
listWork = baseMapper.getTGzEmpInfoListWork(searchVo);
if (Common.isNotNull(listWork)) {
writeSheet = EasyExcelFactory.writerSheet(index,"工作经历" + index).head(TGzEmpInfoExportWork.class).build();
writeSheet = EasyExcelFactory.writerSheet(index,"工作经历" + (sheetIndex++)).head(TGzEmpInfoExportWork.class).build();
excelWriter.write(listWork, writeSheet);
index++;
}
......@@ -313,6 +316,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
// 2.3家庭成员
count = baseMapper.getTGzEmpInfoCountFamily(searchVo);
if (count > CommonConstants.ZERO_INT) {
sheetIndex = 1;
List<TGzEmpInfoExportFamily> listFamily;
for (int i = 0; i <= count; i += CommonConstants.EXCEL_EXPORT_LIMIT) {
// 获取实际记录
......@@ -320,7 +324,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
searchVo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT);
listFamily = baseMapper.getTGzEmpInfoListFamily(searchVo);
if (Common.isNotNull(listFamily)) {
writeSheet = EasyExcelFactory.writerSheet(index,"家庭成员" + index).head(TGzEmpInfoExportFamily.class)
writeSheet = EasyExcelFactory.writerSheet(index,"家庭成员" + (sheetIndex++)).head(TGzEmpInfoExportFamily.class)
.registerConverter(new DictConverter(nameAndDicTypeMap, redisLabelMap)).build();
excelWriter.write(listFamily, writeSheet);
index++;
......@@ -333,6 +337,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
// 2.4技能证书
count = baseMapper.getTGzEmpInfoCountSkill(searchVo);
if (count > CommonConstants.ZERO_INT) {
sheetIndex = 1;
List<TGzEmpInfoExportSkill> listSkill;
for (int i = 0; i <= count; i += CommonConstants.EXCEL_EXPORT_LIMIT) {
// 获取实际记录
......@@ -340,7 +345,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
searchVo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT);
listSkill = baseMapper.getTGzEmpInfoListSkill(searchVo);
if (Common.isNotNull(listSkill)) {
writeSheet = EasyExcelFactory.writerSheet(index,"技能证书" + index).head(TGzEmpInfoExportSkill.class).build();
writeSheet = EasyExcelFactory.writerSheet(index,"技能证书" + (sheetIndex++)).head(TGzEmpInfoExportSkill.class).build();
excelWriter.write(listSkill, writeSheet);
index++;
}
......
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