新增头像查询和合同签订时间查询

zjugis-business/src/main/java/com/zjugis/business/flow/staff/controller/vo/StaffPageVO.java

@@ -354,4 +354,9 @@ public class StaffPageVO extends PageParam {
      * 年假
      */
     private Integer nj;
+
+    /**
+     * 合同签订时间
+     */
+    private LocalDateTime htqdsj;
 }

zjugis-business/src/main/java/com/zjugis/business/flow/staff/controller/vo/StaffVO.java

@@ -351,4 +351,9 @@ public class StaffVO {
      * 年假
      */
     private Integer nj;
+
+    /**
+     * 合同签订时间
+     */
+    private LocalDateTime htqdsj;
 }

zjugis-business/src/main/java/com/zjugis/business/flow/staff/entity/StaffDO.java

@@ -81,7 +81,6 @@ public class StaffDO extends BaseEntity {
     /**
      * 出生日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime birthday;
 
     /**
@@ -137,7 +136,6 @@ public class StaffDO extends BaseEntity {
     /**
      * 毕业时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime bysj;
 
     /**
@@ -158,7 +156,6 @@ public class StaffDO extends BaseEntity {
     /**
      * 参加工作时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime cjgzsj;
 
     /**
@@ -224,19 +221,16 @@ public class StaffDO extends BaseEntity {
     /**
      * 入公司时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime rgssj;
 
     /**
      * 转正时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime zzsj;
 
     /**
      * 合同到期时
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime htdqs;
 
     /**
@@ -338,7 +332,6 @@ public class StaffDO extends BaseEntity {
     /**
      * 离职时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime lzsj;
 
     private String hz;
@@ -363,6 +356,10 @@ public class StaffDO extends BaseEntity {
      */
     private Integer nj;
 
+    /**
+     * 合同签订时间
+     */
+    private LocalDateTime htqdsj;
 
 
 }

zjugis-module-adm/zjugis-module-adm-api/src/main/java/com/zjugis/module/adm/api/staff/dto/StaffRecordsDTO.java

@@ -222,4 +222,7 @@ public class StaffRecordsDTO {
     @Schema(description = "年假")
     private Integer nj;
 
+    @Schema(description = "合同签订时间")
+    private LocalDateTime htqdsj;
+
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/controller/admin/staff/vo/records/RecordsBaseVO.java

@@ -212,4 +212,9 @@ public class RecordsBaseVO {
      * 司领
      */
     private Integer sl;
+
+    /**
+     * 合同签订时间
+     */
+    private LocalDateTime htqdsj;
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/dal/dataobject/staff/StaffRecordSDO.java

@@ -343,4 +343,9 @@ public class StaffRecordSDO extends BaseDO {
      * 年假
      */
     private Integer nj;
+
+    /**
+     * 合同签订时间
+     */
+    private LocalDateTime htqdsj;
 }