From dc4f8829472baf47345e3a01384d7b5eaf7ee727 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 20 五月 2025 14:49:10 +0800
Subject: [PATCH] 增加专家导出字段

---
 expert-system/src/main/java/com/gkhy/system/domain/vo/request/ProjectExpertScoreSaveReq.java |  137 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 135 insertions(+), 2 deletions(-)

diff --git a/expert-system/src/main/java/com/gkhy/system/domain/vo/request/ProjectExpertScoreSaveReq.java b/expert-system/src/main/java/com/gkhy/system/domain/vo/request/ProjectExpertScoreSaveReq.java
index 104a6ab..8d9a413 100644
--- a/expert-system/src/main/java/com/gkhy/system/domain/vo/request/ProjectExpertScoreSaveReq.java
+++ b/expert-system/src/main/java/com/gkhy/system/domain/vo/request/ProjectExpertScoreSaveReq.java
@@ -1,6 +1,139 @@
 package com.gkhy.system.domain.vo.request;
 
-import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
-public class ProjectExpertScoreReq implements Serializable {
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+@ApiModel(value = "项目专家人员考评分数" , description = "项目专家人员考评分数")
+@Data
+public class ProjectExpertScoreSaveReq implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "考评保存数据")
+    private List<Score> saveData;
+
+    @ApiModelProperty(value = "删除数据")
+    private List<Long> delData;
+
+    @ApiModelProperty(value = "项目专家id",required = true)
+    @NotNull
+    private Long projectExpertId;
+
+    @ApiModelProperty(value = "总分",required = true)
+    @NotNull(message = "得分不能为空")
+    private Long score;
+
+
+    @ApiModelProperty(value = "职业道德1优秀2合格3基本合格4不合格")
+    @NotNull(message = "职业道德不能为空")
+    private Long professionalEthics;
+
+    /** 公正廉洁1优秀2合格3基本合格4不合格 */
+    @ApiModelProperty(value = "公正廉洁1优秀2合格3基本合格4不合格")
+    @NotNull(message = "公正廉洁不能为空")
+    private Long impartialHonest;
+
+    /** 综合协调1优秀2合格3基本合格4不合格 */
+    @ApiModelProperty(value = "综合协调1优秀2合格3基本合格4不合格")
+    @NotNull(message = "综合协调不能为空")
+    private Long comprehensiveCoordination;
+
+    /** 专业能力1优秀2合格3基本合格4不合格 */
+    @ApiModelProperty(value = "专业能力1优秀2合格3基本合格4不合格")
+    @NotNull(message = "专业能力不能为空")
+    private Long professionalAbility;
+
+    /** 意见表达1优秀2合格3基本合格4不合格 */
+    @ApiModelProperty(value = "意见表达1优秀2合格3基本合格4不合格")
+    @NotNull(message = "意见表达不能为空")
+    private Long expressingOpinions;
+
+    /** 其他意见 */
+    @ApiModelProperty(value = "其他意见")
+    private String others;
+
+    /** 综合评价1优秀2合格3基本合格4不合格 */
+    @ApiModelProperty(value = "综合评价1优秀2合格3基本合格4不合格")
+    @NotNull(message = "综合评价不能为空")
+    private Long comprehensiveEvaluation;
+
+    /** 重大隐患 */
+    @ApiModelProperty(value = "重大隐患")
+    private Long majorDangers;
+
+    /** 一般隐患 */
+    @ApiModelProperty(value = "一般隐患")
+    private Long generalHazards;
+
+    /** 内容描述 */
+    @ApiModelProperty(value = "内容描述")
+    private String content;
+
+    /** 计费标准 */
+    @ApiModelProperty(value = "计费标准")
+    @NotBlank(message = "计费标准不能为空")
+    private String freightBasis;
+
+    @ApiModelProperty(value = "计费标准说明")
+    private String billingInstructions;
+
+    /** 计费时长 */
+    @ApiModelProperty(value = "计费时长")
+    @NotNull(message = "计费时长不能为空")
+    private BigDecimal billingDuration;
+
+
+    /** 开户行 */
+    @ApiModelProperty(value = "开户行")
+    @NotBlank(message = "开户行不能为空")
+    private String openBank;
+
+    /** 卡号 */
+    @ApiModelProperty(value = "卡号")
+    @NotBlank(message = "卡号不能为空")
+    private String bankCard;
+
+    @ApiModelProperty(value = "税后金额")
+    private BigDecimal afterTaxAmount;
+
+    @ApiModelProperty(value = "应纳税所得额")
+    private BigDecimal taxableIncome;
+
+    @ApiModelProperty(value = "应缴个税")
+    private BigDecimal incomeTaxPayable;
+
+    @ApiModelProperty(value = "专家费(税前)")
+    @NotNull(message = "专家费不能为空")
+    private BigDecimal taxExpertFee;
+
+    @ApiModelProperty(value = "交通费")
+    private BigDecimal travelExpenses;
+
+    @ApiModelProperty(value = "住宿费")
+    private BigDecimal accommodationFee;
+
+    @Data
+    static public class Score {
+
+        @ApiModelProperty(value = "数据id",required = false)
+        private Long id;
+
+        @ApiModelProperty(value = "评分",required = true)
+        @NotNull(message = "分数不能为空")
+        private Long score;
+
+        @ApiModelProperty(value = "类型1加分项2扣分项",required = true)
+        @NotBlank(message = "类型不能为空")
+        private String scoreType;
+
+        @ApiModelProperty(value = "评分内容",required = true)
+        @NotBlank(message = "内容不能为空")
+        private String content;
+    }
 }

--
Gitblit v1.9.2