GTsoft/mps-platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增党费、工会费拆分计算 up

Browse Source
This commit is contained in:
zhuangdashia 2025-09-03 17:04:03 +08:00
parent 2cb5a03bb9
commit 309724f2a4
10 changed files with 170 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cds-fontend-2025.V1/src/views/business/category/index.vue
View File

@ -132,12 +132,12 @@ const {
render: (row) => {
if (!row.pricingRule) return '';
const suffixMap = {
'BIZ030': ' * 交易金额',
'BIZ032': ' * 交易金额',
'BIZ031': ' * 交易金额',
'default': '元/条'
};
let formattedValue;
if(row.typeId !== 'BIZ030' && row.typeId !== 'BIZ031' ){
if(row.typeId !== 'BIZ032' && row.typeId !== 'BIZ031' ){
formattedValue = parseFloat(row.pricingRule).toFixed(2);
}else{
formattedValue = row.pricingRule;

2
cds-fontend-2025.V1/src/views/business/category/modules/subcategory-operate-drawer.vue
View File

@ -149,7 +149,7 @@ watch(visible, () => {
:rows="3"
placeholder="请输入计价规则说明"
>
<template v-if="model.typeId === 'BIZ030' || model.typeId === 'BIZ031' " #suffix>
<template v-if="model.typeId === 'BIZ032' || model.typeId === 'BIZ031' " #suffix>
* 交易金额
</template>
<template else #suffix>

11
cds-fontend-2025.V1/src/views/mps/manual-pricing/index.vue
View File

@ -45,6 +45,7 @@ const {
marketingCode: null,
merchantRetentionRate: null,
newPartyFeeUnits: null,
newUnionFeeUnits: null,
newPropertyFeeUnits: null,
newCateringFeeUnits: null,
newForeignAccounts: null,
@ -135,7 +136,15 @@ const {
},
{
key: 'newPartyFeeUnits',
title: '新增党费、工会费缴费单位',
title: '新增党费缴费单位',
align: 'center',
minWidth: 120,
ellipsis: true,
resizable: true
},
{
key: 'newUnionFeeUnits',
title: '新增工会费缴费单位',
align: 'center',
minWidth: 120,
ellipsis: true,

80
cds-fontend-2025.V1/src/views/mps/manual-pricing/modules/manual-pricing-operate-drawer.vue
View File

@ -52,6 +52,7 @@ function createDefaultModel(): Model {
marketingCode: '',
merchantRetentionRate: undefined,
newPartyFeeUnits: undefined,
newUnionFeeUnits: undefined,
newPropertyFeeUnits: undefined,
newCateringFeeUnits: undefined,
newForeignAccounts: undefined,
@ -77,26 +78,8 @@ type RuleKey = Extract<
| 'branch'
| 'idcardNo'
| 'name'
| 'position'
| 'merchantRetentionRate'
| 'newPartyFeeUnits'
| 'newPropertyFeeUnits'
| 'newCateringFeeUnits'
| 'newForeignAccounts'
| 'newIndividualTreasury'
| 'newCorporateTreasury'
| 'treasuryTransactions'
| 'regularProducts'
| 'newHousingFund'
| 'totalScore'
| 'marketingCode'
| 'importTime'
| 'fill1'
| 'fill2'
| 'fill3'
| 'fill4'
| 'fill5'
| 'fill6'
| 'fill7'
| 'tenantId'
| 'createDept'
| 'createBy'
@ -107,28 +90,10 @@ type RuleKey = Extract<
const rules: Record<RuleKey, App.Global.FormRule> = {
branch: createRequiredRule('支行不能为空'),
idcardNo: createRequiredRule('员工身份证号不能为空'),
name: createRequiredRule('员工姓名不能为空'),
position: createRequiredRule('岗位不能为空'),
merchantRetentionRate: createRequiredRule('存量综合收单商户留存率提升不能为空'),
newPartyFeeUnits: createRequiredRule('新增党费、工会费缴费单位不能为空'),
newPropertyFeeUnits: createRequiredRule('新增物业费缴费单位不能为空'),
newCateringFeeUnits: createRequiredRule('新增餐费缴费单位不能为空'),
newForeignAccounts: createRequiredRule('新开立外汇账户有效户不能为空'),
newIndividualTreasury: createRequiredRule('新增理财销售有效户(个人)不能为空'),
newCorporateTreasury: createRequiredRule('新增理财销售有效户(对公)不能为空'),
treasuryTransactions: createRequiredRule('理财销售系统业务量不能为空'),
regularProducts: createRequiredRule('代销定期类理财产品不能为空'),
newHousingFund: createRequiredRule('新增公积金缴存账户不能为空'),
totalScore: createRequiredRule('合计计价不能为空'),
importTime: createRequiredRule('日期不能为空'),
fill1: createRequiredRule('冗余1不能为空'),
fill2: createRequiredRule('冗余2不能为空'),
fill3: createRequiredRule('冗余4不能为空'),
fill4: createRequiredRule('冗余4不能为空'),
fill5: createRequiredRule('冗余5不能为空'),
fill6: createRequiredRule('冗余6不能为空'),
fill7: createRequiredRule('冗余7不能为空'),
idcardNo: createRequiredRule('证件号码不能为空'),
name: createRequiredRule('姓名不能为空'),
marketingCode: createRequiredRule('营销号不能为空'),
importTime: createRequiredRule('计价月份不能为空'),
tenantId: createRequiredRule('租户编号不能为空'),
createDept: createRequiredRule('创建部门不能为空'),
createBy: createRequiredRule('创建者不能为空'),
@ -155,16 +120,16 @@ function closeDrawer() {
async function handleSubmit() {
await validate();
const { id, branch, idcardNo, name, position, marketingCode, merchantRetentionRate, newPartyFeeUnits, newPropertyFeeUnits, newCateringFeeUnits, newForeignAccounts, newIndividualTreasury, newCorporateTreasury, treasuryTransactions, regularProducts, newHousingFund, totalScore, importTime, fill1, fill2, fill3, fill4, fill5, fill6, fill7 } = model;
const { id, branch, idcardNo, name, position, marketingCode, merchantRetentionRate, newPartyFeeUnits, newUnionFeeUnits, newPropertyFeeUnits, newCateringFeeUnits, newForeignAccounts, newIndividualTreasury, newCorporateTreasury, treasuryTransactions, regularProducts, newHousingFund, totalScore, importTime, fill1, fill2, fill3, fill4, fill5, fill6, fill7 } = model;
// request
if (props.operateType === 'add') {
const { error } = await fetchCreateManualPricing({ branch, idcardNo, name, position, marketingCode, merchantRetentionRate, newPartyFeeUnits, newPropertyFeeUnits, newCateringFeeUnits, newForeignAccounts, newIndividualTreasury, newCorporateTreasury, treasuryTransactions, regularProducts, newHousingFund, totalScore, importTime, fill1, fill2, fill3, fill4, fill5, fill6, fill7 });
const { error } = await fetchCreateManualPricing({ branch, idcardNo, name, position, marketingCode, merchantRetentionRate, newPartyFeeUnits, newUnionFeeUnits, newPropertyFeeUnits, newCateringFeeUnits, newForeignAccounts, newIndividualTreasury, newCorporateTreasury, treasuryTransactions, regularProducts, newHousingFund, totalScore, importTime, fill1, fill2, fill3, fill4, fill5, fill6, fill7 });
if (error) return;
}
if (props.operateType === 'edit') {
const { error } = await fetchUpdateManualPricing({ id, branch, idcardNo, name, position, marketingCode, merchantRetentionRate, newPartyFeeUnits, newPropertyFeeUnits, newCateringFeeUnits, newForeignAccounts, newIndividualTreasury, newCorporateTreasury, treasuryTransactions, regularProducts, newHousingFund, totalScore, importTime, fill1, fill2, fill3, fill4, fill5, fill6, fill7 });
const { error } = await fetchUpdateManualPricing({ id, branch, idcardNo, name, position, marketingCode, merchantRetentionRate, newPartyFeeUnits, newUnionFeeUnits, newPropertyFeeUnits, newCateringFeeUnits, newForeignAccounts, newIndividualTreasury, newCorporateTreasury, treasuryTransactions, regularProducts, newHousingFund, totalScore, importTime, fill1, fill2, fill3, fill4, fill5, fill6, fill7 });
if (error) return;
}
@ -186,25 +151,28 @@ watch(visible, () => {
<NDrawerContent :title="title" :native-scrollbar="false" closable>
<NForm ref="formRef" :model="model" :rules="rules">
<NFormItem label="支行" path="branch">
<NInput v-model:value="model.branch" placeholder="请输入支行" />
<NInput v-model:value="model.branch" placeholder="请输入支行" :disabled="props.operateType==='edit'" />
</NFormItem>
<NFormItem label="员工身份证号" path="idcardNo">
<NInput v-model:value="model.idcardNo" placeholder="请输入员工身份证号" />
<NFormItem label="证件号码" path="idcardNo">
<NInput v-model:value="model.idcardNo" placeholder="请输入证件号码" :disabled="props.operateType==='edit'" />
</NFormItem>
<NFormItem label="员工姓名" path="name">
<NInput v-model:value="model.name" placeholder="请输入员工姓名" />
<NFormItem label="姓名" path="name">
<NInput v-model:value="model.name" placeholder="请输入姓名" :disabled="props.operateType==='edit'"/>
</NFormItem>
<NFormItem label="岗位" path="position">
<NInput v-model:value="model.position" placeholder="请输入岗位" />
<NInput v-model:value="model.position" placeholder="请输入岗位" :disabled="props.operateType==='edit'"/>
</NFormItem>
<NFormItem label="营销人员营销号" path="marketingCode">
<NInput v-model:value="model.marketingCode" placeholder="请输入营销人员营销号" />
<NFormItem label="营销号" path="marketingCode">
<NInput v-model:value="model.marketingCode" placeholder="请输入营销号" :disabled="props.operateType==='edit'"/>
</NFormItem>
<NFormItem label="存量综合收单商户留存率提升" path="merchantRetentionRate">
<NInput v-model:value="model.merchantRetentionRate" placeholder="请输入存量综合收单商户留存率提升" />
</NFormItem>
<NFormItem label="新增党费、工会费缴费单位" path="newPartyFeeUnits">
<NInput v-model:value="model.newPartyFeeUnits" placeholder="请输入新增党费、工会费缴费单位" />
<NFormItem label="新增党费缴费单位" path="newPartyFeeUnits">
<NInput v-model:value="model.newPartyFeeUnits" placeholder="请输入新增党费缴费单位" />
</NFormItem>
<NFormItem label="新增工会费缴费单位" path="newUnionFeeUnits">
<NInput v-model:value="model.newUnionFeeUnits" placeholder="请输入新增工会费缴费单位" />
</NFormItem>
<NFormItem label="新增物业费缴费单位" path="newPropertyFeeUnits">
<NInput v-model:value="model.newPropertyFeeUnits" placeholder="请输入新增物业费缴费单位" />
@ -233,8 +201,8 @@ watch(visible, () => {
<NFormItem label="合计计价" path="totalScore">
<NInput v-model:value="model.totalScore" placeholder="请输入合计计价" />
</NFormItem>
<NFormItem label="日期" path="importTime">
<NInput v-model:value="model.importTime" placeholder="请输入日期" disabled/>
<NFormItem label="计价月份" path="importTime">
<NInput v-model:value="model.importTime" placeholder="请输入计价月份" :disabled="props.operateType==='edit'"/>
</NFormItem>
<!-- <NFormItem label="冗余1" path="fill1">-->
<!-- <NInput v-model:value="model.fill1" placeholder="请输入冗余1" />-->

19
cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mps/domain/MpsManualPricing.java
View File

@ -12,7 +12,7 @@ import java.io.Serial;
* 手工导入计价对象 mps_manual_pricing
*
* @author Lion Li
* @date 2025-08-28
* @date 2025-09-03
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ -34,13 +34,12 @@ public class MpsManualPricing extends TenantEntity {
private String branch;
/**
* 员工身份证号
* 证件号码
*/
@TableField(value = "idcard_no")
private String idcardNo;
/**
* 员工姓名
* 姓名
*/
private String name;
@ -50,7 +49,7 @@ public class MpsManualPricing extends TenantEntity {
private String position;
/**
* 营销人员营销号
* 营销号
*/
private String marketingCode;
@ -60,10 +59,15 @@ public class MpsManualPricing extends TenantEntity {
private BigDecimal merchantRetentionRate;
/**
* 新增党费、工会费缴费单位
* 新增党费缴费单位
*/
private BigDecimal newPartyFeeUnits;
/**
* 新增工会费缴费单位
*/
private BigDecimal newUnionFeeUnits;
/**
* 新增物业费缴费单位
*/
@ -110,9 +114,8 @@ public class MpsManualPricing extends TenantEntity {
private BigDecimal totalScore;
/**
* 日期
* 计价月份
*/
@TableField(value = "import_time")
private String importTime;
/**

43
cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mps/domain/bo/MpsManualPricingBo.java
View File

@ -14,7 +14,7 @@ import java.math.BigDecimal;
* 手工导入计价业务对象 mps_manual_pricing
*
* @author Lion Li
* @date 2025-08-28
* @date 2025-09-03
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ -33,140 +33,127 @@ public class MpsManualPricingBo extends BaseEntity {
private String branch;
/**
* 员工身份证号
* 证件号码
*/
@NotBlank(message = "员工身份证号不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "证件号码不能为空", groups = { AddGroup.class, EditGroup.class })
private String idcardNo;
/**
* 员工姓名
* 姓名
*/
@NotBlank(message = "员工姓名不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "姓名不能为空", groups = { AddGroup.class, EditGroup.class })
private String name;
/**
* 岗位
*/
@NotBlank(message = "岗位不能为空", groups = { AddGroup.class, EditGroup.class })
private String position;
/**
* 营销人员营销号
* 营销号
*/
@NotBlank(message = "营销号不能为空", groups = { AddGroup.class, EditGroup.class })
private String marketingCode;
/**
* 存量综合收单商户留存率提升
*/
@NotNull(message = "存量综合收单商户留存率提升不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal merchantRetentionRate;
/**
* 新增党费、工会费缴费单位
* 新增党费缴费单位
*/
@NotNull(message = "新增党费、工会费缴费单位不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal newPartyFeeUnits;
/**
* 新增工会费缴费单位
*/
private BigDecimal newUnionFeeUnits;
/**
* 新增物业费缴费单位
*/
@NotNull(message = "新增物业费缴费单位不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal newPropertyFeeUnits;
/**
* 新增餐费缴费单位
*/
@NotNull(message = "新增餐费缴费单位不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal newCateringFeeUnits;
/**
* 新开立外汇账户有效户
*/
@NotNull(message = "新开立外汇账户有效户不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal newForeignAccounts;
/**
* 新增理财销售有效户(个人)
*/
@NotNull(message = "新增理财销售有效户(个人)不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal newIndividualTreasury;
/**
* 新增理财销售有效户(对公)
*/
@NotNull(message = "新增理财销售有效户(对公)不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal newCorporateTreasury;
/**
* 理财销售系统业务量
*/
@NotNull(message = "理财销售系统业务量不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal treasuryTransactions;
/**
* 代销定期类理财产品
*/
@NotNull(message = "代销定期类理财产品不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal regularProducts;
/**
* 新增公积金缴存账户
*/
@NotNull(message = "新增公积金缴存账户不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal newHousingFund;
/**
* 合计计价
*/
@NotNull(message = "合计计价不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal totalScore;
/**
* 日期
* 计价月份
*/
@NotBlank(message = "日期不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "计价月份不能为空", groups = { AddGroup.class, EditGroup.class })
private String importTime;
/**
* 冗余1
*/
@NotNull(message = "冗余1不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal fill1;
/**
* 冗余2
*/
@NotNull(message = "冗余2不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal fill2;
/**
* 冗余4
*/
@NotNull(message = "冗余4不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal fill3;
/**
* 冗余4
*/
@NotNull(message = "冗余4不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal fill4;
/**
* 冗余5
*/
@NotNull(message = "冗余5不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal fill5;
/**
* 冗余6
*/
@NotNull(message = "冗余6不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal fill6;
/**
* 冗余7
*/
@NotNull(message = "冗余7不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal fill7;

40
cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mps/domain/vo/MpsManualPricingImportVo.java
View File

@ -38,97 +38,103 @@ public class MpsManualPricingImportVo implements Serializable {
/**
* 支行
*/
@ExcelProperty(value = "支行")
@ExcelProperty(value = "支行", index = 0)
private String branch;
/**
* 员工身份证号
*/
@ExcelProperty(value = "证件号码")
@ExcelProperty(value = "证件号码", index = 1)
private String idcardNo;
/**
* 员工姓名
*/
@ExcelProperty(value = "姓名")
@ExcelProperty(value = "姓名", index = 2)
private String name;
/**
* 岗位
*/
@ExcelProperty(value = "岗位")
@ExcelProperty(value = "岗位", index = 3)
private String position;
/**
* 营销人员营销号
*/
@ExcelProperty(value = "营销号")
@ExcelProperty(value = "营销号", index = 4)
private String marketingCode;
/**
* 存量综合收单商户留存率提升
*/
@ExcelProperty(value = "存量综合收单商户留存率提升")
@ExcelProperty(value = "存量综合收单商户留存率提升", index = 5)
private BigDecimal merchantRetentionRate;
/**
* 新增党费、工会费缴费单位
* 新增党费缴费单位
*/
@ExcelProperty(value = "新增党费、工会费缴费单位")
@ExcelProperty(value = "新增党费缴费单位", index = 6)
private BigDecimal newPartyFeeUnits;
/**
* 新增工会费缴费单位
*/
@ExcelProperty(value = "新增工会费缴费单位", index = 7)
private BigDecimal newUnionFeeUnits;
/**
* 新增物业费缴费单位
*/
@ExcelProperty(value = "新增物业费缴费单位")
@ExcelProperty(value = "新增物业费缴费单位", index = 8)
private BigDecimal newPropertyFeeUnits;
/**
* 新增餐费缴费单位
*/
@ExcelProperty(value = "新增餐费缴费单位")
@ExcelProperty(value = "新增餐费缴费单位", index = 9)
private BigDecimal newCateringFeeUnits;
/**
* 新开立外汇账户有效户
*/
@ExcelProperty(value = "新开立外汇账户有效户")
@ExcelProperty(value = "新开立外汇账户有效户", index = 10)
private BigDecimal newForeignAccounts;
/**
* 新增理财销售有效户(个人)
*/
@ExcelProperty(value = "新增理财销售有效户(个人)")
@ExcelProperty(value = "新增理财销售有效户(个人)", index = 11)
private BigDecimal newIndividualTreasury;
/**
* 新增理财销售有效户(对公)
*/
@ExcelProperty(value = "新增理财销售有效户(对公)")
@ExcelProperty(value = "新增理财销售有效户(对公)", index = 12)
private BigDecimal newCorporateTreasury;
/**
* 理财销售系统业务量
*/
@ExcelProperty(value = "理财销售系统业务量")
@ExcelProperty(value = "理财销售系统业务量",index = 13)
private BigDecimal treasuryTransactions;
/**
* 代销定期类理财产品
*/
@ExcelProperty(value = "代销定期类理财产品")
@ExcelProperty(value = "代销定期类理财产品",index = 14)
private BigDecimal regularProducts;
/**
* 新增公积金缴存账户
*/
@ExcelProperty(value = "新增公积金缴存账户")
@ExcelProperty(value = "新增公积金缴存账户",index = 15)
private BigDecimal newHousingFund;
/**
* 合计计价
*/
@ExcelProperty(value = "合计计价")
@ExcelProperty(value = "合计计价",index = 16)
private BigDecimal totalScore;
/**

12
cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mps/domain/vo/MpsManualPricingVo.java
View File

@ -32,7 +32,7 @@ public class MpsManualPricingVo implements Serializable {
/**
* 主键
*/
@ExcelProperty(value = "主键")
@ExcelProperty(value = "ID")
private Long id;
/**
@ -72,11 +72,17 @@ public class MpsManualPricingVo implements Serializable {
private BigDecimal merchantRetentionRate;
/**
* 新增党费、工会费缴费单位
* 新增党费缴费单位
*/
@ExcelProperty(value = "新增党费、工会费缴费单位")
@ExcelProperty(value = "新增党费缴费单位")
private BigDecimal newPartyFeeUnits;
/**
* 新增工会费缴费单位
*/
@ExcelProperty(value = "新增工会费缴费单位")
private BigDecimal newUnionFeeUnits;
/**
* 新增物业费缴费单位
*/

1
cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mps/service/impl/MpsManualPricingServiceImpl.java
View File

@ -83,6 +83,7 @@ public class MpsManualPricingServiceImpl implements IMpsManualPricingService {
BigDecimal total = (
copy.getMerchantRetentionRate() != null ? copy.getMerchantRetentionRate() : existing.getMerchantRetentionRate())
.add(copy.getNewPartyFeeUnits() != null ? copy.getNewPartyFeeUnits() : existing.getNewPartyFeeUnits())
.add(copy.getNewUnionFeeUnits() != null ? copy.getNewUnionFeeUnits() : existing.getNewUnionFeeUnits())
.add(copy.getNewPropertyFeeUnits() != null ? copy.getNewPropertyFeeUnits() : existing.getNewPropertyFeeUnits())
.add(copy.getNewCateringFeeUnits() != null ? copy.getNewCateringFeeUnits() : existing.getNewCateringFeeUnits())
.add(copy.getNewForeignAccounts() != null ? copy.getNewForeignAccounts() : existing.getNewForeignAccounts())

2
cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/resources/mapper/mps/MpsManualPricingMapper.xml
View File

@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
marketing_code,
merchant_retention_rate,
new_party_fee_units,
new_union_fee_units,
new_property_fee_units,
new_catering_fee_units,
new_foreign_accounts,
@ -50,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{item.marketingCode},
COALESCE(#{item.merchantRetentionRate},0.00),
COALESCE(#{item.newPartyFeeUnits},0.00),
COALESCE(#{item.newUnionFeeUnits},0.00),
COALESCE(#{item.newPropertyFeeUnits},0.00),
COALESCE(#{item.newCateringFeeUnits},0.00),
COALESCE(#{item.newForeignAccounts},0.00),