Merge branch 'dev-capacity-adjust' into develop

project-order/src/main/java/com/dituhui/pea/order/controller/CapacityController.java

@@ -28,7 +28,7 @@ public class CapacityController {
     }
 
     @PostMapping("/capacity/adjust")
-    public Result<?> capacityAdjust(@Validated CapacityAdjustDTO.Request reqDTO) {
+    public Result<?> capacityAdjust(@Validated @RequestBody CapacityAdjustDTO.Request reqDTO) {
         Result<?> res = null;
         try {
             res = orgCapacityService.adjustCapacity(reqDTO);

project-order/src/main/java/com/dituhui/pea/order/dto/CapacityAdjustDTO.java

 package com.dituhui.pea.order.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
 import java.time.LocalDate;
 
 
@@ -15,12 +20,14 @@ public class CapacityAdjustDTO {
         @NotNull(message = "teamId不能为空")
         private String teamId;
 
-        @NotBlank(message = "日期字段不能为空")
-        @Pattern(regexp = "\\d{4}-\\d{2}-\\d{2}", message = "日期字段格式必须为 yyyy-MM-dd")
-        private LocalDate beginDate;
+        @JsonDeserialize(using = LocalDateDeserializer.class)
+        @JsonSerialize(using = LocalDateSerializer.class)
+        @JsonFormat(pattern = "yyyy-MM-dd")
+        private LocalDate startDate;
 
-        @NotBlank(message = "日期字段不能为空")
-        @Pattern(regexp = "\\d{4}-\\d{2}-\\d{2}", message = "日期字段格式必须为 yyyy-MM-dd")
+        @JsonDeserialize(using = LocalDateDeserializer.class)
+        @JsonSerialize(using = LocalDateSerializer.class)
+        @JsonFormat(pattern = "yyyy-MM-dd")
         private LocalDate endDate;
 
         private Integer capAdjust;

project-order/src/main/java/com/dituhui/pea/order/entity/CapacityTeamAdjustEntity.java

@@ -21,13 +21,14 @@ public class CapacityTeamAdjustEntity {
 
     private float capAdjust;
 
-    private String memo;
+    private String memo = "";
 
-    private LocalDateTime createTime;
+    @Column(name = "create_time", nullable = false, columnDefinition = "timestamp DEFAULT CURRENT_TIMESTAMP")
+    private LocalDateTime createTime = LocalDateTime.now();
 
-    private LocalDateTime updateTime;
+    @Column(name = "update_time", nullable = false, columnDefinition = "timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+    private LocalDateTime updateTime = LocalDateTime.now();
 
-    private String layer;
 
     // Constructors, getters, setters, and other methods can be added as needed
 

project-order/src/main/java/com/dituhui/pea/order/entity/EngineerSkillGroupEntity.java

@@ -32,7 +32,7 @@ public class EngineerSkillGroupEntity {
     @Column(length = 100, nullable = false)
     private String memo;
 
-    @Column(name = "create_time", nullable = false, columnDefinition = "timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+    @Column(name = "create_time", nullable = false, columnDefinition = "timestamp DEFAULT CURRENT_TIMESTAMP")
     private LocalDateTime createTime;
 
     @Column(name = "update_time", nullable = false, columnDefinition = "timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrgCapacityServiceImpl.java

@@ -14,6 +14,7 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -99,7 +100,7 @@ public class OrgCapacityServiceImpl implements OrgCapacityService {
                         .setCapTotal(e.getCapTotal())
                         .setCapUsed(e.getCapUsed())
                         .setCapLeft(e.getCapLeft())
-                        .setCapAdjust(e.getCapAdjust()*100)
+                        .setCapAdjust(e.getCapAdjust())
                         .setEngineerNum(e.getEngineerCount())
                         .setUpdateTime(e.getUpdateTime());
             }
@@ -114,11 +115,11 @@ public class OrgCapacityServiceImpl implements OrgCapacityService {
 
     @Override
     public Result<?> adjustCapacity(CapacityAdjustDTO.Request reqDTO) {
-        if (reqDTO.getBeginDate().isBefore(LocalDate.now())) {
+        if (reqDTO.getStartDate().isBefore(LocalDate.now())) {
             return Result.failed("日期不能小于当天");
         }
 // 遍历 startDate 到 endDate 之间的所有日期
-        LocalDate currentDate = reqDTO.getBeginDate();
+        LocalDate currentDate = reqDTO.getStartDate();
         while (!currentDate.isAfter(reqDTO.getEndDate())) {
             float adjuest = (float) (reqDTO.getCapAdjust() / 100.0);
             ajustCapacityByDate(reqDTO.getTeamId(), currentDate, adjuest);
@@ -133,8 +134,12 @@ public class OrgCapacityServiceImpl implements OrgCapacityService {
             entity = new CapacityTeamAdjustEntity();
             entity.setTeamId(teamId);
             entity.setWorkday(date);
+            entity.setMemo("");
+            entity.setCreateTime(LocalDateTime.now());
         }
         entity.setCapAdjust(adjust);
+        entity.setUpdateTime(LocalDateTime.now());
+        // todo 操作日志登记
         capacityTeamAdjustDao.save(entity);
     }
 }