Merge branch 'feature-dingwf-0715' into develop

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

@@ -2,17 +2,14 @@ package com.dituhui.pea.order.entity;
 
 
 import lombok.Data;
 import lombok.Data;
 
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 
 @Data
 @Data
 @Entity
 @Entity
 @Table(name="v_engineer_skill")
 @Table(name="v_engineer_skill")
 public class EngineerSkillEntity {
 public class EngineerSkillEntity {
     @Id
     @Id
-    @GeneratedValue
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
     private Long id;
     private String engineerCode;
     private String engineerCode;
     private String skillGroupCode;
     private String skillGroupCode;

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

 package com.dituhui.pea.order.service.impl;
 package com.dituhui.pea.order.service.impl;
 
 
-import cn.hutool.core.date.LocalDateTimeUtil;
 import com.dituhui.pea.common.Result;
 import com.dituhui.pea.common.Result;
 import com.dituhui.pea.order.common.CapacityUtils;
 import com.dituhui.pea.order.common.CapacityUtils;
 import com.dituhui.pea.order.common.DateUtils;
 import com.dituhui.pea.order.common.DateUtils;
@@ -16,16 +15,12 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
-import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.LocalDate;
-import java.time.format.TextStyle;
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.Stream;
 
 
-import static com.dituhui.pea.order.config.OrderConfig.PATTERN_DATE;
-
 @Service
 @Service
 @Slf4j
 @Slf4j
 public class CapacityQueryServiceImpl implements CapacityQueryService {
 public class CapacityQueryServiceImpl implements CapacityQueryService {