update

src/main/java/com/ffii/tsms/modules/data/web/models/NewStaffRequest.kt

@@ -13,21 +13,21 @@ data class NewStaffRequest(
     val companyId: Long,
     @field:NotNull(message = "Staff salaryId cannot be empty")
     val salaryId: Long,
-    @field:NotNull(message = "joinDate cannot be empty")
+//    @field:NotNull(message = "joinDate cannot be empty")
     val joinDate: LocalDate,
     @field:NotNull(message = "Staff currentPositionId cannot be empty")
     val currentPositionId: Long,
-    @field:NotNull(message = "Staff joinPositionId cannot be empty")
+//    @field:NotNull(message = "Staff joinPositionId cannot be empty")
     val joinPositionId: Long,
-    @field:NotNull(message = "Staff departmentId cannot be empty")
+//    @field:NotNull(message = "Staff departmentId cannot be empty")
     val departmentId: Long,
     @field:NotBlank(message = "Staff phone1 cannot be empty")
     val phone1: String,
     @field:NotBlank(message = "Staff email cannot be empty")
     val email: String,
-    @field:NotBlank(message = "Staff emergContactName cannot be empty")
+//    @field:NotBlank(message = "Staff emergContactName cannot be empty")
     val emergContactName: String,
-    @field:NotBlank(message = "Staff emergContactPhone cannot be empty")
+//    @field:NotBlank(message = "Staff emergContactPhone cannot be empty")
     val emergContactPhone: String,
     @field:NotBlank(message = "Staff employType cannot be empty")
     val employType: String,

src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt

@@ -1510,9 +1510,9 @@ open class ReportService(
                     + " left join project_task pt on t.projectTaskId = pt.id"
                     + " left join project p on p.id = pt.project_id"
                     + " where t.staffId = :staffId"
+                    + " and t.recordDate BETWEEN :startDate and :endDate"
                     + " group by p.id, t.recordDate"
                     + " order by p.id, t.recordDate"
-                    + " and t.recordDate BETWEEN :startDate and :endDate"
         )
         return jdbcDao.queryForList(sql.toString(), args)
     }