公积金缴存明细

cds-fontend-2025.V1/src/views/mps/market/index.vue

@@ -82,22 +82,22 @@ const {
       width: 64,
       resizable: true
     },
-    {
+    // {
-      key: 'dataId',
+    //   key: 'dataId',
-      title: '主键',
+    //   title: '主键',
-      align: 'center',
+    //   align: 'center',
-      minWidth: 120,
+    //   minWidth: 120,
-      ellipsis: true,
+    //   ellipsis: true,
-      resizable: true
+    //   resizable: true
-    },
+    // },
-    {
+    // {
-      key: 'subcategoryId',
+    //   key: 'subcategoryId',
-      title: '业务类型id',
+    //   title: '业务类型id',
-      align: 'center',
+    //   align: 'center',
-      minWidth: 120,
+    //   minWidth: 120,
-      ellipsis: true,
+    //   ellipsis: true,
-      resizable: true
+    //   resizable: true
-    },
+    // },
     {
       key: 'subcategoryName',
       title: '业务类型名称',

cds-fontend-2025.V1/src/views/mps/market/modules/market-operate-drawer.vue

@@ -37,6 +37,7 @@ const visible = defineModel<boolean>('visible', {
 });
 
 const {options: mpsCheckStatusOptions} = useDict('mps_check_status');
+const {options: mpsCheckTypeOptions} = useDict('mps_check_type');
 
 const { formRef, validate, restoreValidation } = useNaiveForm();
 const { createRequiredRule } = useFormRules();
@@ -79,10 +80,10 @@ function createDefaultModel(): Model {
       workplace: '',
       surplusAccountName: '',
       heatingNo: '',
-      checkFlag: '',
+      checkFlag: '0',
       checkTime: undefined,
       checkUser: '',
-      checkType: '',
+      checkType: '0',
       checkMsg: '',
   };
 }
@@ -92,6 +93,7 @@ type RuleKey = Extract<
   | 'subcategoryId'
   | 'jbName'
   | 'jbId'
+  | 'subcategoryName'
   | 'date'
 >;
 
@@ -99,6 +101,7 @@ const rules: Record<RuleKey, App.Global.FormRule> = {
   subcategoryId: createRequiredRule('业务类型id不能为空'),
   jbName: createRequiredRule('经办人员名称不能为空'),
   jbId: createRequiredRule('经办人员营销号不能为空'),
+  subcategoryName: createRequiredRule('业务类型名称不能为空'),
   date: createRequiredRule('数据日期不能为空'),
 };
 
@@ -136,7 +139,7 @@ async function handleSubmit() {
     if (error) return;
   }
 
-  window.$message?.success($t('common.updateSuccess'));
+  window.$message?.success($t('common.saveSuccess'));
   // closeDrawer();
   emit('submitted');
 }
@@ -637,8 +640,8 @@ watch(visible, () => {
         <NFormItem label="核对人员（人工核对时）" path="checkUser">
           <NInput v-model:value="model.checkUser" placeholder="请输入核对人员（人工核对时）" />
         </NFormItem>
-        <NFormItem label="核对方式（0系统 1人工 2其他1 3其他2 4其他3）" path="checkType">
+        <NFormItem label="核对方式" path="checkType">
-          <NInput v-model:value="model.checkType" placeholder="请输入核对方式（0系统 1人工 2其他1 3其他2 4其他3）" />
+          <NSelect v-model:value="model.checkType" :options="mpsCheckTypeOptions" placeholder="请输入核对方式" />
         </NFormItem>
         <NFormItem label="核对结果" path="checkMsg">
           <NInput v-model:value="model.checkMsg" placeholder="请输入核对结果" />

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

@@ -28,7 +28,7 @@ public class MpsManualPricing extends TenantEntity {
      * 主键
      */
     @TableId(value = "id")
-    private Integer id;
+    private Long id;
 
     /**
      * 营销人员营销号

cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mps/domain/MpsMarket.java

@@ -4,9 +4,7 @@ import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.math.BigDecimal;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serial;
 
@@ -28,12 +26,12 @@ public class MpsMarket extends TenantEntity {
      * 主键
      */
     @TableId(value = "data_id")
-    private BigDecimal dataId;
+    private Long dataId;
 
     /**
      * 业务类型id
      */
-    private BigDecimal subcategoryId;
+    private Long subcategoryId;
 
     /**
      * 业务类型名称
@@ -103,7 +101,7 @@ public class MpsMarket extends TenantEntity {
     /**
      * 磁条卡更换登记id
      */
-    private BigDecimal magneticCardId;
+    private Long magneticCardId;
 
     /**
      * 综合收单商户名
@@ -123,7 +121,7 @@ public class MpsMarket extends TenantEntity {
     /**
      * 交警处罚决定书
      */
-    private BigDecimal trafficId;
+    private Long trafficId;
 
     /**
      * 职工所属单位

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

@@ -26,7 +26,7 @@ public class MpsManualPricingBo extends BaseEntity {
     /**
      * 主键
      */
-    private Integer id;
+    private Long id;
 
     /**
      * 营销人员营销号
@@ -51,43 +51,36 @@ public class MpsManualPricingBo extends BaseEntity {
     /**
      * 存量综合收单商户留存率提升
      */
-    @NotNull(message = "存量综合收单商户留存率提升不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal clzhsdshlclts;
 
     /**
      * 代收水费
      */
-    @NotNull(message = "代收水费不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal water;
 
     /**
      * 代收电费
      */
-    @NotNull(message = "代收电费不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal electricity;
 
     /**
      * 缴费业务
      */
-    @NotNull(message = "缴费业务不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal charge;
 
     /**
      * 外汇业务
      */
-    @NotNull(message = "外汇业务不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal forex;
 
     /**
      * 理财业务
      */
-    @NotNull(message = "理财业务不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal financing;
 
     /**
      * 新增公积金缴存账户
      */
-    @NotNull(message = "新增公积金缴存账户不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal xzgjjjczh;
 
 

cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mps/domain/bo/MpsMarketBo.java

@@ -8,9 +8,7 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
-import java.math.BigDecimal;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * 营销数据管理业务对象 mps_market
@@ -26,16 +24,18 @@ public class MpsMarketBo extends BaseEntity {
     /**
      * 主键
      */
-    private BigDecimal dataId;
+    private Long dataId;
 
     /**
      * 业务类型id
      */
-    private BigDecimal subcategoryId;
+    @NotNull(message = "业务类型ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long subcategoryId;
 
     /**
      * 业务类型名称
      */
+    @NotBlank(message = "业务类型名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String subcategoryName;
 
     /**
@@ -46,6 +46,7 @@ public class MpsMarketBo extends BaseEntity {
     /**
      * 经办人员名称
      */
+    @NotBlank(message = "经办人员名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String jbName;
 
     /**
@@ -56,17 +57,17 @@ public class MpsMarketBo extends BaseEntity {
     /**
      * 经办人员营销号
      */
+    @NotBlank(message = "经办人员营销号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String jbId;
 
     /**
      * 数据日期
      */
-    private Date date;
+    @NotNull(message = "数据日期不能为空", groups = { AddGroup.class, EditGroup.class })    private Date date;
 
     /**
      * 部门名称
      */
-    @NotBlank(message = "部门名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String deptName;
 
     /**
@@ -82,7 +83,6 @@ public class MpsMarketBo extends BaseEntity {
     /**
      * 客户身份证号
      */
-    @NotBlank(message = "客户身份证号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String custId;
 
     /**
@@ -98,85 +98,73 @@ public class MpsMarketBo extends BaseEntity {
     /**
      * 客户联系电话
      */
-    @NotBlank(message = "客户联系电话不能为空", groups = { AddGroup.class, EditGroup.class })
     private String custPhoneNo;
 
     /**
      * 磁条卡更换登记id
      */
-    @NotNull(message = "磁条卡更换登记id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long magneticCardId;
-    private BigDecimal magneticCardId;
 
     /**
      * 综合收单商户名
      */
-    @NotBlank(message = "综合收单商户名不能为空", groups = { AddGroup.class, EditGroup.class })
     private String acquiringName;
 
     /**
      * 综合收单商户号
      */
-    @NotBlank(message = "综合收单商户号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String acquiringId;
 
     /**
      * 网上支付开通渠道
      */
-    @NotBlank(message = "网上支付开通渠道不能为空", groups = { AddGroup.class, EditGroup.class })
     private String internetChannel;
 
     /**
      * 交警处罚决定书
      */
-    @NotNull(message = "交警处罚决定书不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long trafficId;
-    private BigDecimal trafficId;
 
     /**
      * 职工所属单位
      */
-    @NotBlank(message = "职工所属单位不能为空", groups = { AddGroup.class, EditGroup.class })
     private String workplace;
 
     /**
      * 公积金缴纳账户名称
      */
-    @NotBlank(message = "公积金缴纳账户名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String surplusAccountName;
 
     /**
      * 取暖费户号
      */
-    @NotBlank(message = "取暖费户号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String heatingNo;
 
     /**
      * 核对标志（0未核对 1核对通过 9核对失败）
      */
-    @NotBlank(message = "核对标志（0未核对 1核对通过 9核对失败）不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "核对状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private String checkFlag;
 
     /**
      * 核对时间
      */
-    @NotNull(message = "核对时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date checkTime;
 
     /**
      * 核对人员（人工核对时）
      */
-    @NotBlank(message = "核对人员（人工核对时）不能为空", groups = { AddGroup.class, EditGroup.class })
     private String checkUser;
 
     /**
      * 核对方式（0系统 1人工 2其他1 3其他2 4其他3）
      */
-    @NotBlank(message = "核对方式（0系统 1人工 2其他1 3其他2 4其他3）不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "核对方式不能为空", groups = { AddGroup.class, EditGroup.class })
     private String checkType;
 
     /**
      * 核对结果
      */
-    @NotBlank(message = "核对结果不能为空", groups = { AddGroup.class, EditGroup.class })
     private String checkMsg;
 
 

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

@@ -35,7 +35,7 @@ public class MpsManualPricingImportVo implements Serializable {
      * 主键
      */
     @ExcelProperty(value = "主键")
-    private Integer id;
+    private Long id;
 
     /**
      * 营销人员营销号

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

@@ -35,7 +35,7 @@ public class MpsManualPricingVo implements Serializable {
      * 主键
      */
     @ExcelProperty(value = "主键")
-    private Integer id;
+    private Long id;
 
     /**
      * 营销人员营销号

cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mps/domain/vo/MpsMarketImportVo.java

@@ -35,13 +35,13 @@ public class MpsMarketImportVo implements Serializable {
      * 主键
      */
     @ExcelProperty(value = "主键")
-    private BigDecimal dataId;
+    private Long dataId;
 
     /**
      * 业务类型id
      */
     @ExcelProperty(value = "业务类型id")
-    private BigDecimal subcategoryId;
+    private Long subcategoryId;
 
     /**
      * 业务类型名称
@@ -126,7 +126,7 @@ public class MpsMarketImportVo implements Serializable {
      * 磁条卡更换登记id
      */
     @ExcelProperty(value = "磁条卡更换登记id")
-    private BigDecimal magneticCardId;
+    private Long magneticCardId;
 
     /**
      * 综合收单商户名
@@ -150,7 +150,7 @@ public class MpsMarketImportVo implements Serializable {
      * 交警处罚决定书
      */
     @ExcelProperty(value = "交警处罚决定书")
-    private BigDecimal trafficId;
+    private Long trafficId;
 
     /**
      * 职工所属单位

cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mps/domain/vo/MpsMarketVo.java

@@ -1,8 +1,6 @@
 package org.dromara.mps.domain.vo;
 
-import java.math.BigDecimal;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.mps.domain.MpsMarket;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
@@ -35,13 +33,13 @@ public class MpsMarketVo implements Serializable {
      * 主键
      */
     @ExcelProperty(value = "主键")
-    private BigDecimal dataId;
+    private Long dataId;
 
     /**
      * 业务类型id
      */
     @ExcelProperty(value = "业务类型id")
-    private BigDecimal subcategoryId;
+    private Long subcategoryId;
 
     /**
      * 业务类型名称
@@ -126,7 +124,7 @@ public class MpsMarketVo implements Serializable {
      * 磁条卡更换登记id
      */
     @ExcelProperty(value = "磁条卡更换登记id")
-    private BigDecimal magneticCardId;
+    private Long magneticCardId;
 
     /**
      * 综合收单商户名
@@ -150,7 +148,7 @@ public class MpsMarketVo implements Serializable {
      * 交警处罚决定书
      */
     @ExcelProperty(value = "交警处罚决定书")
-    private BigDecimal trafficId;
+    private Long trafficId;
 
     /**
      * 职工所属单位