feat: 财务复核功能-结算表加状态字段

db/v2.0/20240105.sql

@@ -1,22 +1,11 @@
 alter table sys_dept
     add financial_review_type char(10) default 'AUTO' null comment '财务复核方式';
 
-create table wm_score_package_settle_financial_review
-(
-    id             int auto_increment
-        primary key,
-    package_id     varchar(1024)                      not null comment '积分包id',
-    username       varchar(64)                        not null comment '结算人员手机号',
-    realname       varchar(64)                        not null comment '结算人员姓名',
-    id_card_number varchar(20)                        not null comment '身份证号',
-    package_number int                                not null comment '积分包个数',
-    settle_amount  decimal(11, 2)                     not null comment '实际结算金额(不带服务费)',
-    actual_amount  decimal(11, 2)                     not null comment '实际支付金额(带服务费)',
-    remark         varchar(256)                       null comment '备注',
-    review_time    datetime                           null comment '复核时间',
-    review_user    int                                null comment '复核人',
-    review_status  char(10)                           null comment '复核状态',
-    create_time    datetime default CURRENT_TIMESTAMP not null comment '创建时间',
-    update_time    datetime default CURRENT_TIMESTAMP not null on update CURRENT_TIMESTAMP comment '修改时间'
-)
-    comment '积分包结算财务复核功能' charset = utf8mb4;
+alter table wm_score_package_settle_note
+    add review_status char(10) default 'AUTO' comment '财务复核状态';
+
+alter table wm_score_package_settle_note
+    add review_time datetime null comment '复核时间';
+
+alter table wm_score_package_settle_note
+    add review_user int null comment '复核人';

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/constant/UpmsState.java

@@ -30,4 +30,22 @@ public class UpmsState {
 		private final String status;
 		private final String description;
 	}
+
+	/**
+	 * 积分包结算财务复核状态
+	 *
+	 * @author lixuesong
+	 * @date 2024/01/05
+	 */
+	@Getter
+	@AllArgsConstructor
+	public enum SettleFinancialReviewStatus {
+		AUTO("AUTO", "自动"),
+		PASSED("PASSED", "通过"),
+		REJECTED("REJECTED", "拒绝");
+
+		@EnumValue
+		private final String status;
+		private final String description;
+	}
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/WmScorePackageSettleNote.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.qunzhixinxi.hnqz.admin.api.constant.UpmsState;
 import com.qunzhixinxi.hnqz.admin.enums.CategoryEnum;
 import com.qunzhixinxi.hnqz.admin.enums.SubjectLocation;
 import lombok.Data;
@@ -165,6 +166,21 @@ public class WmScorePackageSettleNote extends Model<WmScorePackageSettleNote> {
 	 */
 	private Integer settleDeptSubId;
 
+	/**
+	 * 复核状态
+	 */
+	private UpmsState.SettleFinancialReviewStatus reviewStatus;
+
+	/**
+	 * 复核时间
+	 */
+	private LocalDateTime reviewTime;
+
+	/**
+	 * 复核人
+	 */
+	private Integer reviewUser;
+
 	/**
 	 * 真实名称
 	 */