Merge remote-tracking branch 'origin/main'

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/voucher/vo/VoucherCreateReqVO.java

@@ -11,4 +11,12 @@ import javax.validation.constraints.*;
 @ToString(callSuper = true)
 public class VoucherCreateReqVO extends VoucherBaseVO {
 
+    @NotNull(message = "凭证号不能为空")
+    private String voucherNum;
+
+    @NotNull(message = "年度不能为空")
+    private String year;
+
+    @NotNull(message = "会计期间不能为空")
+    private String period;
 }

yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electroniccontracts/ElectronicContractsController.java

@@ -98,5 +98,4 @@ public class ElectronicContractsController {
         List<ElectronicContractsExcelVO> datas = ElectronicContractsConvert.INSTANCE.convertList02(list);
         ExcelUtils.write(response, "合同档案.xls", "数据", ElectronicContractsExcelVO.class, datas);
     }
-
 }

yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electroniccontracts/vo/ElectronicContractsBaseVO.java

@@ -1,13 +1,10 @@
 package cn.iocoder.yudao.module.ea.controller.admin.electroniccontracts.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
 
 import java.time.LocalDate;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import javax.validation.constraints.*;
 
 /**
  * 合同档案 Base VO，提供给添加、修改、详细的子 VO 使用
@@ -43,12 +40,15 @@ public class ElectronicContractsBaseVO {
     @Schema(description = "签署方")
     private String signatory;
 
+    @JsonFormat(pattern="yyyy-MM-dd")
     @Schema(description = "签署日期")
     private LocalDate signDate;
 
+    @JsonFormat(pattern="yyyy-MM-dd")
     @Schema(description = "生效日期")
     private LocalDate effectiveDate;
 
+    @JsonFormat(pattern="yyyy-MM-dd")
     @Schema(description = "截止日期")
     private LocalDate expiryDate;
 

yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicemployee/ElectronicEmployeeController.java

@@ -1,32 +1,29 @@
 package cn.iocoder.yudao.module.ea.controller.admin.electronicemployee;
 
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
-import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
-
 import cn.iocoder.yudao.module.ea.controller.admin.electronicemployee.vo.*;
-import cn.iocoder.yudao.module.ea.dal.dataobject.electronicemployee.ElectronicEmployeeDO;
 import cn.iocoder.yudao.module.ea.convert.electronicemployee.ElectronicEmployeeConvert;
+import cn.iocoder.yudao.module.ea.dal.dataobject.electronicemployee.ElectronicEmployeeDO;
 import cn.iocoder.yudao.module.ea.service.electronicemployee.ElectronicEmployeeService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 员工档案")
 @RestController

yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicemployee/vo/ElectronicEmployeeBaseVO.java

@@ -1,11 +1,9 @@
 package cn.iocoder.yudao.module.ea.controller.admin.electronicemployee.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import javax.validation.constraints.*;
+import lombok.Data;
+
+import java.time.LocalDate;
 
 /**
  * 员工档案 Base VO，提供给添加、修改、详细的子 VO 使用
@@ -62,4 +60,86 @@ public class ElectronicEmployeeBaseVO {
     @Schema(description = "归档状态", example = "2")
     private String fileStatus;
 
+    @Schema(description = "出生日期")
+    private LocalDate birthdate;
+
+    @Schema(description = "地址")
+    private String address;
+
+    @Schema(description = "护照号码")
+    private String passportNumber;
+
+    @Schema(description = "毕业学校")
+    private String graduationSchool;
+
+    @Schema(description = "专业")
+    private String major;
+
+    @Schema(description = "学历")
+    private String education;
+
+    @Schema(description = "教育经历")
+    private String educationExperience;
+
+    @Schema(description = "工作经历")
+    private String workExperience;
+
+    @Schema(description = "职位")
+    private String jobTitle;
+
+    @Schema(description = "职位级别")
+    private String jobLevel;
+
+    @Schema(description = "职位描述")
+    private String jobDescription;
+
+    @Schema(description = "薪酬")
+    private Long salary;
+
+    @Schema(description = "身体状况")
+    private String healthCondition;
+
+    @Schema(description = "体检记录")
+    private String medicalRecords;
+
+    @Schema(description = "疾病史")
+    private String diseaseHistory;
+
+    @Schema(description = "社会保险")
+    private String socialInsurance;
+
+    @Schema(description = "养老保险")
+    private Long pensionInsurance;
+
+    @Schema(description = "医疗保险")
+    private Long medicalInsurance;
+
+    @Schema(description = "失业保险")
+    private Long unemploymentInsurance;
+
+    @Schema(description = "工伤保险")
+    private Long workInjuryInsurance;
+
+    @Schema(description = "考核评价")
+    private String leaveRecords;
+
+    @Schema(description = "奖惩记录")
+    private String overtimeRecords;
+
+    @Schema(description = "培训计划")
+    private String welfareBenefits;
+
+    @Schema(description = "培训成果")
+    private String performanceEvaluation;
+
+    @Schema(description = "个人标签")
+    private String rewardsPunishments;
+
+    @Schema(description = "兴趣爱好")
+    private String trainingRecords;
+
+    @Schema(description = "特长")
+    private String personalDescription;
+
+
 }

yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicemployee/vo/ElectronicEmployeePageReqVO.java

@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.module.ea.controller.admin.electronicemployee.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -65,4 +67,7 @@ public class ElectronicEmployeePageReqVO extends PageParam {
     @Schema(description = "归档状态", example = "2")
     private String fileStatus;
 
+    @Schema(description = "薪酬")
+    private Long salary;
+
 }

yudao-module-setting/yudao-module-setting-biz/src/main/java/cn/iocoder/yudao/module/setting/controller/admin/depot/vo/DepotCreateReqVO.java

@@ -11,4 +11,11 @@ import javax.validation.constraints.*;
 @ToString(callSuper = true)
 public class DepotCreateReqVO extends DepotBaseVO {
 
+    @NotNull(message = "库房名称不能为空")
+    private String name;
+
+    @NotNull(message = "所属立档单位名称不能为空")
+    private Long organizationId;
+
+
 }

yudao-module-setting/yudao-module-setting-biz/src/main/java/cn/iocoder/yudao/module/setting/controller/admin/depotcabinet/vo/DepotCabinetCreateReqVO.java

@@ -11,4 +11,10 @@ import javax.validation.constraints.*;
 @ToString(callSuper = true)
 public class DepotCabinetCreateReqVO extends DepotCabinetBaseVO {
 
+    @NotNull(message = "所属库房不能为空")
+    private Long depotId;
+
+    @NotNull(message = "档案柜名称不能为空")
+    private String name;
+
 }

yudao-module-setting/yudao-module-setting-biz/src/main/java/cn/iocoder/yudao/module/setting/controller/admin/organization/vo/OrganizationCreateReqVO.java

@@ -11,4 +11,11 @@ import javax.validation.constraints.*;
 @ToString(callSuper = true)
 public class OrganizationCreateReqVO extends OrganizationBaseVO {
 
+    @NotNull(message = "立档单位名称不能为空")
+    private String organizationName;
+
+    @NotNull(message = "全宗号不能为空")
+    private String caseNum;
+
+
 }