手动导入计价优化
This commit is contained in:
parent
943079f32e
commit
c47dce9bff
@ -1,6 +1,8 @@
|
||||
package org.dromara.mps.domain.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
import cn.idev.excel.annotation.ExcelIgnore;
|
||||
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import cn.idev.excel.annotation.ExcelProperty;
|
||||
import org.dromara.common.excel.annotation.ExcelDictFormat;
|
||||
@ -32,109 +34,110 @@ public class MpsManualPricingImportVo implements Serializable {
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ExcelProperty(value = "主键")
|
||||
@ExcelIgnore
|
||||
@ExcelProperty(value = "ID")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 支行
|
||||
*/
|
||||
@ExcelProperty(value = "支行", index = 0)
|
||||
@ExcelProperty(value = "支行")
|
||||
private String branch;
|
||||
|
||||
/**
|
||||
* 员工身份证号
|
||||
*/
|
||||
@ExcelProperty(value = "证件号码", index = 1)
|
||||
@ExcelProperty(value = "证件号码")
|
||||
private String idcardNo;
|
||||
|
||||
/**
|
||||
* 员工姓名
|
||||
*/
|
||||
@ExcelProperty(value = "姓名", index = 2)
|
||||
@ExcelProperty(value = "姓名")
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 岗位
|
||||
*/
|
||||
@ExcelProperty(value = "岗位", index = 3)
|
||||
@ExcelProperty(value = "岗位")
|
||||
private String position;
|
||||
|
||||
/**
|
||||
* 营销人员营销号
|
||||
*/
|
||||
@ExcelProperty(value = "营销号", index = 4)
|
||||
@ExcelProperty(value = "营销号")
|
||||
private String marketingCode;
|
||||
|
||||
/**
|
||||
* 存量综合收单商户留存率提升
|
||||
*/
|
||||
@ExcelProperty(value = "存量综合收单商户留存率提升", index = 5)
|
||||
@ExcelProperty(value = "存量综合收单商户留存率提升")
|
||||
private BigDecimal merchantRetentionRate;
|
||||
|
||||
/**
|
||||
* 新增党费缴费单位
|
||||
*/
|
||||
@ExcelProperty(value = "新增党费缴费单位", index = 6)
|
||||
@ExcelProperty(value = "新增党费缴费单位")
|
||||
private BigDecimal newPartyFeeUnits;
|
||||
|
||||
/**
|
||||
* 新增工会费缴费单位
|
||||
*/
|
||||
@ExcelProperty(value = "新增工会费缴费单位", index = 7)
|
||||
@ExcelProperty(value = "新增工会费缴费单位")
|
||||
private BigDecimal newUnionFeeUnits;
|
||||
|
||||
/**
|
||||
* 新增物业费缴费单位
|
||||
*/
|
||||
@ExcelProperty(value = "新增物业费缴费单位", index = 8)
|
||||
@ExcelProperty(value = "新增物业费缴费单位")
|
||||
private BigDecimal newPropertyFeeUnits;
|
||||
|
||||
/**
|
||||
* 新增餐费缴费单位
|
||||
*/
|
||||
@ExcelProperty(value = "新增餐费缴费单位", index = 9)
|
||||
@ExcelProperty(value = "新增餐费缴费单位")
|
||||
private BigDecimal newCateringFeeUnits;
|
||||
|
||||
/**
|
||||
* 新开立外汇账户有效户
|
||||
*/
|
||||
@ExcelProperty(value = "新开立外汇账户有效户", index = 10)
|
||||
@ExcelProperty(value = "新开立外汇账户有效户")
|
||||
private BigDecimal newForeignAccounts;
|
||||
|
||||
/**
|
||||
* 新增理财销售有效户(个人)
|
||||
*/
|
||||
@ExcelProperty(value = "新增理财销售有效户(个人)", index = 11)
|
||||
@ExcelProperty(value = "新增理财销售有效户(个人)")
|
||||
private BigDecimal newIndividualTreasury;
|
||||
|
||||
/**
|
||||
* 新增理财销售有效户(对公)
|
||||
*/
|
||||
@ExcelProperty(value = "新增理财销售有效户(对公)", index = 12)
|
||||
@ExcelProperty(value = "新增理财销售有效户(对公)")
|
||||
private BigDecimal newCorporateTreasury;
|
||||
|
||||
/**
|
||||
* 理财销售系统业务量
|
||||
*/
|
||||
@ExcelProperty(value = "理财销售系统业务量",index = 13)
|
||||
@ExcelProperty(value = "理财销售系统业务量")
|
||||
private BigDecimal treasuryTransactions;
|
||||
|
||||
/**
|
||||
* 代销定期类理财产品
|
||||
*/
|
||||
@ExcelProperty(value = "代销定期类理财产品",index = 14)
|
||||
@ExcelProperty(value = "代销定期类理财产品")
|
||||
private BigDecimal regularProducts;
|
||||
|
||||
/**
|
||||
* 新增公积金缴存账户
|
||||
*/
|
||||
@ExcelProperty(value = "新增公积金缴存账户",index = 15)
|
||||
@ExcelProperty(value = "新增公积金缴存账户")
|
||||
private BigDecimal newHousingFund;
|
||||
|
||||
/**
|
||||
* 合计计价
|
||||
*/
|
||||
@ExcelProperty(value = "合计计价",index = 16)
|
||||
@ExcelProperty(value = "合计计价")
|
||||
private BigDecimal totalScore;
|
||||
|
||||
/**
|
||||
@ -144,45 +147,45 @@ public class MpsManualPricingImportVo implements Serializable {
|
||||
private String importTime;
|
||||
|
||||
/**
|
||||
* 冗余1
|
||||
* 项目1
|
||||
*/
|
||||
@ExcelProperty(value = "冗余1")
|
||||
@ExcelProperty(value = "项目1")
|
||||
private BigDecimal fill1;
|
||||
|
||||
/**
|
||||
* 冗余2
|
||||
* 项目2
|
||||
*/
|
||||
@ExcelProperty(value = "冗余2")
|
||||
@ExcelProperty(value = "项目2")
|
||||
private BigDecimal fill2;
|
||||
|
||||
/**
|
||||
* 冗余4
|
||||
* 项目4
|
||||
*/
|
||||
@ExcelProperty(value = "冗余4")
|
||||
@ExcelProperty(value = "项目4")
|
||||
private BigDecimal fill3;
|
||||
|
||||
/**
|
||||
* 冗余4
|
||||
* 项目4
|
||||
*/
|
||||
@ExcelProperty(value = "冗余4")
|
||||
@ExcelProperty(value = "项目4")
|
||||
private BigDecimal fill4;
|
||||
|
||||
/**
|
||||
* 冗余5
|
||||
* 项目5
|
||||
*/
|
||||
@ExcelProperty(value = "冗余5")
|
||||
@ExcelProperty(value = "项目5")
|
||||
private BigDecimal fill5;
|
||||
|
||||
/**
|
||||
* 冗余6
|
||||
* 项目6
|
||||
*/
|
||||
@ExcelProperty(value = "冗余6")
|
||||
@ExcelProperty(value = "项目6")
|
||||
private BigDecimal fill6;
|
||||
|
||||
/**
|
||||
* 冗余7
|
||||
* 项目7
|
||||
*/
|
||||
@ExcelProperty(value = "冗余7")
|
||||
@ExcelProperty(value = "项目7")
|
||||
private BigDecimal fill7;
|
||||
|
||||
|
||||
|
||||
@ -144,45 +144,45 @@ public class MpsManualPricingVo implements Serializable {
|
||||
private String importTime;
|
||||
|
||||
/**
|
||||
* 冗余1
|
||||
* 项目1
|
||||
*/
|
||||
@ExcelProperty(value = "冗余1")
|
||||
@ExcelProperty(value = "项目1")
|
||||
private BigDecimal fill1;
|
||||
|
||||
/**
|
||||
* 冗余2
|
||||
* 项目2
|
||||
*/
|
||||
@ExcelProperty(value = "冗余2")
|
||||
@ExcelProperty(value = "项目2")
|
||||
private BigDecimal fill2;
|
||||
|
||||
/**
|
||||
* 冗余4
|
||||
* 项目4
|
||||
*/
|
||||
@ExcelProperty(value = "冗余4")
|
||||
@ExcelProperty(value = "项目4")
|
||||
private BigDecimal fill3;
|
||||
|
||||
/**
|
||||
* 冗余4
|
||||
* 项目4
|
||||
*/
|
||||
@ExcelProperty(value = "冗余4")
|
||||
@ExcelProperty(value = "项目4")
|
||||
private BigDecimal fill4;
|
||||
|
||||
/**
|
||||
* 冗余5
|
||||
* 项目5
|
||||
*/
|
||||
@ExcelProperty(value = "冗余5")
|
||||
@ExcelProperty(value = "项目5")
|
||||
private BigDecimal fill5;
|
||||
|
||||
/**
|
||||
* 冗余6
|
||||
* 项目6
|
||||
*/
|
||||
@ExcelProperty(value = "冗余6")
|
||||
@ExcelProperty(value = "项目6")
|
||||
private BigDecimal fill6;
|
||||
|
||||
/**
|
||||
* 冗余7
|
||||
* 项目7
|
||||
*/
|
||||
@ExcelProperty(value = "冗余7")
|
||||
@ExcelProperty(value = "项目7")
|
||||
private BigDecimal fill7;
|
||||
|
||||
|
||||
|
||||
@ -64,11 +64,11 @@ public class MpsManualPricingImportListener extends AnalysisEventListener<MpsMan
|
||||
//MpsManualPricingVo mpsManualPricingVo1 = this.mpsManualPricingService.queryById(mpsManualPricingVo.getDataId());
|
||||
|
||||
// 1. 基本数据验证
|
||||
mpsManualPricingImportVo.setImportTime(importTime);
|
||||
ValidatorUtils.validate(mpsManualPricingImportVo);
|
||||
|
||||
// 2. 转换为业务对象
|
||||
MpsManualPricing mpsManualPricing = BeanUtil.toBean(mpsManualPricingImportVo, MpsManualPricing.class);
|
||||
mpsManualPricing.setImportTime(importTime);
|
||||
// 3. 添加到成功列表（稍后批量处理）
|
||||
successList.add(mpsManualPricing);
|
||||
|
||||
|
||||
@ -177,7 +177,7 @@ public class MpsManualPricingServiceImpl implements IMpsManualPricingService {
|
||||
private LambdaQueryWrapper<MpsManualPricing> buildQueryWrapper(MpsManualPricingBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<MpsManualPricing> lqw = Wrappers.lambdaQuery();
|
||||
lqw.orderByAsc(MpsManualPricing::getId);
|
||||
lqw.orderByDesc(MpsManualPricing::getImportTime);
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getBranch()), MpsManualPricing::getBranch, bo.getBranch());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getIdcardNo()), MpsManualPricing::getIdcardNo, bo.getIdcardNo());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getName()), MpsManualPricing::getName, bo.getName());
|
||||
|
||||
Loading…
Reference in New Issue
Block a user