每日录入导出excel调整
This commit is contained in:
parent
c02a4fb2fa
commit
b00c4270cb
@ -8,6 +8,7 @@ import lombok.RequiredArgsConstructor;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.validation.constraints.*;
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import org.dromara.mps.domain.vo.MpsDetailEntryExportVo;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.dromara.common.excel.core.ExcelResult;
|
||||
@ -59,8 +60,8 @@ public class MpsDetailEntryController extends BaseController {
|
||||
@Log(title = "每日录入明细", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(MpsDetailEntryBo bo, HttpServletResponse response) {
|
||||
List<MpsDetailEntryVo> list = mpsDetailEntryService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "每日录入明细", MpsDetailEntryVo.class, response);
|
||||
List<MpsDetailEntryExportVo> list = mpsDetailEntryService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "每日录入明细", MpsDetailEntryExportVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -86,7 +87,7 @@ public class MpsDetailEntryController extends BaseController {
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取每日录入明细详细信息
|
||||
* 获取录入明细详细信息
|
||||
*
|
||||
* @param dataId 主键
|
||||
*/
|
||||
|
||||
@ -0,0 +1,248 @@
|
||||
package org.dromara.mps.domain.vo;
|
||||
|
||||
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import cn.idev.excel.annotation.ExcelProperty;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import lombok.Data;
|
||||
import org.dromara.common.excel.annotation.ExcelDictFormat;
|
||||
import org.dromara.common.excel.convert.ExcelDictConvert;
|
||||
import org.dromara.mps.domain.MpsDetailEntry;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
/**
|
||||
* 每日录入明细视图对象 mps_market
|
||||
*
|
||||
* @author zzzj
|
||||
* @date 2025-08-20
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = MpsDetailEntry.class)
|
||||
public class MpsDetailEntryExportVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
// /**
|
||||
// * 主键
|
||||
// */
|
||||
// @ExcelProperty(value = "主键")
|
||||
// private BigDecimal dataId;
|
||||
|
||||
// /**
|
||||
// * 业务类型id
|
||||
// */
|
||||
// @ExcelProperty(value = "业务类型id")
|
||||
// private BigDecimal subcategoryId;
|
||||
|
||||
|
||||
/**
|
||||
* 经办人员名称
|
||||
*/
|
||||
@ExcelProperty(value = {"经办员工信息","经办人员名称"}, index = 0)
|
||||
private String jbName;
|
||||
|
||||
/**
|
||||
* 经办人员营销号
|
||||
*/
|
||||
@ExcelProperty(value = {"经办员工信息","经办人员营销号"}, index = 1)
|
||||
private String jbId;
|
||||
|
||||
/**
|
||||
* 部门名称 支行
|
||||
*/
|
||||
@ExcelProperty(value = {"经办员工信息","所在支行"}, index = 2)
|
||||
private String deptName;
|
||||
|
||||
/**
|
||||
* 营销人员名称
|
||||
*/
|
||||
@ExcelProperty(value = {"营销员工信息","营销人员名称"}, index = 3)
|
||||
private String yxName;
|
||||
|
||||
/**
|
||||
* 营销人员营销号
|
||||
*/
|
||||
@ExcelProperty(value = {"营销员工信息","营销人员营销号"}, index = 4)
|
||||
private String yxId;
|
||||
|
||||
/**
|
||||
* 营销人员-支行
|
||||
*/
|
||||
@ExcelProperty(value = {"营销员工信息","所在支行"}, index = 5)
|
||||
private String yxDeptName;
|
||||
|
||||
/**
|
||||
* 数据日期
|
||||
*/
|
||||
@ExcelProperty(value = "数据日期")
|
||||
private Date date;
|
||||
|
||||
// /**
|
||||
// * 部门id
|
||||
// */
|
||||
// @ExcelProperty(value = "部门id")
|
||||
// private BigDecimal deptId;
|
||||
|
||||
/**
|
||||
* 客户姓名
|
||||
*/
|
||||
@ExcelProperty(value = "客户姓名")
|
||||
private String custName;
|
||||
|
||||
/**
|
||||
* 客户类型（1-个人，2-对公）
|
||||
*/
|
||||
@ExcelProperty(value = "客户类型", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "1=个人,2=对公")
|
||||
private String custType;
|
||||
|
||||
/**
|
||||
* 业务类型名称
|
||||
*/
|
||||
@ExcelProperty(value = "业务类型名称")
|
||||
private String subcategoryName;
|
||||
|
||||
/**
|
||||
* 客户联系电话
|
||||
*/
|
||||
@ExcelProperty(value = {"客户信息", "联系电话"}, index = 10)
|
||||
private String custPhoneNo;
|
||||
|
||||
/**
|
||||
* 客户身份证号
|
||||
*/
|
||||
@ExcelProperty(value = {"客户信息", "身份证号"}, index = 11)
|
||||
private String custId;
|
||||
/**
|
||||
* 客户账号/卡号
|
||||
*/
|
||||
@ExcelProperty(value = {"客户信息", "账号/卡号"}, index = 12)
|
||||
private String custAcctNo;
|
||||
|
||||
|
||||
/**
|
||||
* 综合收单商户名
|
||||
*/
|
||||
@ExcelProperty(value = {"综合收单商户", "综合收单商户名"}, index = 13)
|
||||
private String acquiringName;
|
||||
|
||||
/**
|
||||
* 综合收单商户号
|
||||
*/
|
||||
@ExcelProperty(value = {"综合收单商户", "综合收单商户号"}, index = 14)
|
||||
private String acquiringId;
|
||||
|
||||
/**
|
||||
* 网上支付开通渠道
|
||||
*/
|
||||
@ExcelProperty(value = "网上支付开通渠道")
|
||||
// @ExcelDictFormat(dictType = "mps_cust_type")
|
||||
private String internetChannel;
|
||||
//
|
||||
// /**
|
||||
// * 交警处罚决定书
|
||||
// */
|
||||
// @ExcelProperty(value = "交警处罚决定书")
|
||||
// private BigDecimal trafficId;
|
||||
|
||||
/**
|
||||
* 交警处罚决定书
|
||||
*/
|
||||
@ExcelProperty(value = {"交警处罚决定书","决定书编号"}, index = 16)
|
||||
private String trafficNo;
|
||||
|
||||
/**
|
||||
* 交警处罚决定书
|
||||
*/
|
||||
@ExcelProperty(value = {"交警处罚决定书","处罚金额"}, index = 17)
|
||||
private String trafficAmt;
|
||||
|
||||
/**
|
||||
* 职工所属单位
|
||||
*/
|
||||
@ExcelProperty(value = "职工所属单位")
|
||||
private String workplace;
|
||||
|
||||
/**
|
||||
* 公积金缴纳账户名称
|
||||
*/
|
||||
@ExcelProperty(value = "公积金缴纳账户名称")
|
||||
private String surplusAccountName;
|
||||
|
||||
/**
|
||||
* 取暖费户号
|
||||
*/
|
||||
@ExcelProperty(value = "取暖费户号")
|
||||
private String heatingNo;
|
||||
|
||||
|
||||
// /**
|
||||
// * 磁条卡更换登记id
|
||||
// */
|
||||
// @ExcelProperty(value = "磁条卡更换登记")
|
||||
// private BigDecimal magneticCardId;
|
||||
|
||||
/**
|
||||
* 老卡卡号
|
||||
*/
|
||||
@ExcelProperty(value = {"磁条卡更换","老卡卡号"}, index = 21)
|
||||
private String oldCardNo;
|
||||
|
||||
/**
|
||||
* 新卡卡号
|
||||
*/
|
||||
@ExcelProperty(value = {"磁条卡更换","新卡卡号"}, index =22)
|
||||
private String newCardNo;
|
||||
|
||||
/**
|
||||
* 网点
|
||||
*/
|
||||
@ExcelProperty(value = {"磁条卡更换","网点"}, index = 23)
|
||||
private String branchName;
|
||||
|
||||
/**
|
||||
* 事务
|
||||
*/
|
||||
@ExcelProperty(value = {"磁条卡更换","事务"}, index = 24)
|
||||
private String affair;
|
||||
|
||||
/**
|
||||
* 核对标志（0未核对 1核对通过 9核对失败）
|
||||
*/
|
||||
@ExcelProperty(value = "核对标志", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "0=未核对,1=核对通过,9=核对失败")
|
||||
private String checkFlag;
|
||||
|
||||
// /**
|
||||
// * 核对时间
|
||||
// */
|
||||
// @ExcelProperty(value = "核对时间")
|
||||
// private Date checkTime;
|
||||
|
||||
// /**
|
||||
// * 核对人员（人工核对时）
|
||||
// */
|
||||
// @ExcelProperty(value = "核对人员", converter = ExcelDictConvert.class)
|
||||
// @ExcelDictFormat(readConverterExp = "人=工核对时")
|
||||
// private String checkUser;
|
||||
|
||||
// /**
|
||||
// * 核对方式（0系统 1人工 2其他1 3其他2 4其他3）
|
||||
// */
|
||||
// @ExcelProperty(value = "核对方式", converter = ExcelDictConvert.class)
|
||||
// @ExcelDictFormat(readConverterExp = "0=系统,1=人工,2=其他1,3=其他2,4=其他3")
|
||||
// private String checkType;
|
||||
|
||||
/**
|
||||
* 核对结果
|
||||
*/
|
||||
@ExcelProperty(value = "核对结果")
|
||||
private String checkMsg;
|
||||
|
||||
|
||||
}
|
||||
@ -2,6 +2,8 @@ package org.dromara.mps.domain.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
import cn.idev.excel.annotation.ExcelIgnore;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.dromara.mps.domain.MpsDetailEntry;
|
||||
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
|
||||
@ -14,7 +16,7 @@ import lombok.Data;
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
@ -128,6 +130,10 @@ public class MpsDetailEntryVo implements Serializable {
|
||||
@ExcelProperty(value = "磁条卡更换登记id")
|
||||
private BigDecimal magneticCardId;
|
||||
|
||||
@ExcelProperty(value = "磁条卡更换登记记录")
|
||||
@ExcelIgnore
|
||||
private List<MpsMagneticcardVo> magneticCardList;
|
||||
|
||||
/**
|
||||
* 综合收单商户名
|
||||
*/
|
||||
@ -153,6 +159,10 @@ public class MpsDetailEntryVo implements Serializable {
|
||||
@ExcelProperty(value = "交警处罚决定书")
|
||||
private BigDecimal trafficId;
|
||||
|
||||
@ExcelProperty(value = "交警处罚决定书列表")
|
||||
@ExcelIgnore
|
||||
private List<MpsTrafficVo> trafficList;
|
||||
|
||||
/**
|
||||
* 职工所属单位
|
||||
*/
|
||||
@ -204,5 +214,4 @@ public class MpsDetailEntryVo implements Serializable {
|
||||
@ExcelProperty(value = "核对结果")
|
||||
private String checkMsg;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
package org.dromara.mps.mapper;
|
||||
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
import org.dromara.mps.domain.MpsDetailEntry;
|
||||
import org.dromara.mps.domain.vo.MpsDetailEntryExportVo;
|
||||
import org.dromara.mps.domain.vo.MpsDetailEntryVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
@ -10,6 +12,8 @@ import org.apache.ibatis.annotations.Param;
|
||||
import org.dromara.common.mybatis.annotation.DataColumn;
|
||||
import org.dromara.common.mybatis.annotation.DataPermission;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 每日录入明细Mapper接口
|
||||
*
|
||||
@ -33,4 +37,16 @@ public interface MpsDetailEntryMapper extends BaseMapperPlus<MpsDetailEntry, Mps
|
||||
//})
|
||||
// List<SysUserExportVo> selectMpsDetailEntryExportList(@Param(Constants.WRAPPER) Wrapper<MpsDetailEntry> queryWrapper);
|
||||
|
||||
@Select({
|
||||
"select " +
|
||||
"c.old_card_no as oldCardNo , c.new_card_no as newCardNo, " +
|
||||
"t.traffic_no as trafficNo ,t.traffic_amt as trafficAmt, " +
|
||||
"m.* " +
|
||||
"from mps_market m " +
|
||||
" left join mps_traffic t on m.traffic_id = t.traffic_id " +
|
||||
" left join mps_magneticcard c on m.magnetic_card_id = c.magnetic_card_id " +
|
||||
"${ew.customSqlSegment}"
|
||||
})
|
||||
List<MpsDetailEntryExportVo> selectMpsDetailEntryExportList(@Param(Constants.WRAPPER) Wrapper<MpsDetailEntry> queryWrapper);
|
||||
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package org.dromara.mps.service;
|
||||
|
||||
import org.dromara.mps.domain.MpsDetailEntry;
|
||||
import org.dromara.mps.domain.vo.MpsDetailEntryExportVo;
|
||||
import org.dromara.mps.domain.vo.MpsDetailEntryVo;
|
||||
import org.dromara.mps.domain.bo.MpsDetailEntryBo;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
@ -47,7 +48,7 @@ public interface IMpsDetailEntryService {
|
||||
* @param bo 查询条件
|
||||
* @return 每日录入明细列表
|
||||
*/
|
||||
List<MpsDetailEntryVo> queryList(MpsDetailEntryBo bo);
|
||||
List<MpsDetailEntryExportVo> queryList(MpsDetailEntryBo bo);
|
||||
|
||||
/**
|
||||
* 新增每日录入明细
|
||||
|
||||
@ -11,6 +11,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.dromara.mps.domain.MpsMagneticcard;
|
||||
import org.dromara.mps.domain.MpsTraffic;
|
||||
import org.dromara.mps.domain.vo.MpsDetailEntryExportVo;
|
||||
import org.dromara.mps.mapper.MpsMagneticcardMapper;
|
||||
import org.dromara.mps.mapper.MpsTrafficMapper;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.dromara.mps.domain.bo.MpsDetailEntryBo;
|
||||
import org.dromara.mps.domain.vo.MpsDetailEntryVo;
|
||||
@ -34,7 +39,8 @@ import java.util.*;
|
||||
public class MpsDetailEntryServiceImpl implements IMpsDetailEntryService {
|
||||
|
||||
private final MpsDetailEntryMapper baseMapper;
|
||||
|
||||
private final MpsMagneticcardMapper magneticcardMapper;
|
||||
private final MpsTrafficMapper mpsTrafficMapper;
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void batchInsertOrUpdate(Collection<MpsDetailEntry> list, Boolean isUpdateSupport) {
|
||||
@ -87,6 +93,8 @@ public class MpsDetailEntryServiceImpl implements IMpsDetailEntryService {
|
||||
public TableDataInfo<MpsDetailEntryVo> queryPageList(MpsDetailEntryBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<MpsDetailEntry> lqw = buildQueryWrapper(bo);
|
||||
Page<MpsDetailEntryVo> result = baseMapper.selectPageMpsDetailEntryList(pageQuery.build(), lqw);
|
||||
result.getRecords().forEach(r -> r.setMagneticCardList(magneticcardMapper.selectVoList(new LambdaQueryWrapper<MpsMagneticcard>().eq(MpsMagneticcard::getMagneticCardId, r.getMagneticCardId()))));
|
||||
result.getRecords().forEach(r -> r.setTrafficList(mpsTrafficMapper.selectVoList(new LambdaQueryWrapper<MpsTraffic>().eq(MpsTraffic::getTrafficId, r.getTrafficId()))));
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
@ -97,9 +105,10 @@ public class MpsDetailEntryServiceImpl implements IMpsDetailEntryService {
|
||||
* @return 每日录入明细列表
|
||||
*/
|
||||
@Override
|
||||
public List<MpsDetailEntryVo> queryList(MpsDetailEntryBo bo) {
|
||||
public List<MpsDetailEntryExportVo> queryList(MpsDetailEntryBo bo) {
|
||||
LambdaQueryWrapper<MpsDetailEntry> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
return baseMapper.selectMpsDetailEntryExportList(lqw);
|
||||
// return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<MpsDetailEntry> buildQueryWrapper(MpsDetailEntryBo bo) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user