Merge remote-tracking branch 'origin/develop' into develop-16542

# Conflicts:
#	project-order/pom.xml

project-order/pom.xml

@@ -130,6 +130,12 @@
             <artifactId>spring-kafka</artifactId>
         </dependency>
 
+
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>3.17</version>
+        </dependency>
     </dependencies>
 
     <build>

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

+package com.dituhui.pea.order.controller;
+
+import com.dituhui.pea.order.service.ImportEngineerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class ImportEngineerContrloller {
+
+    @Autowired
+    private ImportEngineerService importEngineerService;
+
+    @GetMapping("/importEngineer")
+    public void importEngineer(String excelUrl) {
+        importEngineerService.ImportEngineerByExcel(excelUrl);
+    }
+    @GetMapping("/ImportEngineerAndSkillByExcel")
+    public void ImportEngineerAndSkillByExcel(String excelUrl) {
+        importEngineerService.ImportEngineerAndSkillByExcel(excelUrl);
+    }
+}

project-order/src/main/java/com/dituhui/pea/order/dao/EngineerSkillGroupDao.java

@@ -8,9 +8,16 @@ import java.util.List;
 
 public interface EngineerSkillGroupDao extends JpaRepository<EngineerSkillGroupEntity, Integer> {
     List<EngineerSkillGroupEntity> findByEngineerCode(String engineerCode);
+
+    EngineerSkillGroupEntity findByEngineerCodeAndSkillGroupCode(String engineerCode, String skillGroupCode);
+
     List<EngineerSkillGroupEntity> findByEngineerCodeAndStatus(String engineerCode, boolean status);
+
     List<EngineerSkillGroupEntity> findByEngineerCodeInAndStatus(List<String> engineerCodes, boolean status);
+
     List<EngineerSkillGroupEntity> findByEngineerCodeInAndStatusIn(List<String> engineerCodes, List<Boolean> status);
+
     List<EngineerSkillGroupEntity> findBySkillGroupCode(String skillGroupCode);
+
     List<EngineerSkillGroupEntity> findBySkillGroupCodeAndStatus(String skillGroupCode, boolean status);
 }

project-order/src/main/java/com/dituhui/pea/order/dao/SkillGroupDao.java

@@ -4,4 +4,5 @@ import com.dituhui.pea.order.entity.SkillGroupEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface SkillGroupDao extends JpaRepository<SkillGroupEntity, Long> {
+    SkillGroupEntity findBySkillGroup(String stringCellValue);
 }

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

@@ -29,14 +29,14 @@ public class EngineerSkillGroupEntity {
     @Column(nullable = false)
     private Boolean status;
 
-    @Column(length = 100, nullable = false)
+    @Column(length = 100, nullable = true)
     private String memo;
 
     @Column(name = "create_time", nullable = false, columnDefinition = "timestamp DEFAULT CURRENT_TIMESTAMP")
-    private LocalDateTime createTime;
+    private LocalDateTime createTime = LocalDateTime.now();
 
     @Column(name = "update_time", nullable = false, columnDefinition = "timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private LocalDateTime updateTime;
+    private LocalDateTime updateTime = LocalDateTime.now();
 
     // Getters and Setters
     // ...

project-order/src/main/java/com/dituhui/pea/order/feign/bean/BeanResultEnum.java

+package com.dituhui.pea.order.feign.bean;
+
+import com.dituhui.pea.common.IResult;
+
+/**
+ * boxi bean传输接口状态码枚举
+ * bean doc url https://publink-hz.feishu.cn/wiki/L4d1wwuGGiQcDqkGh3LcDJPon1i
+ */
+public enum BeanResultEnum implements IResult {
+
+    SUCCESS("0", "接口调用成功"),
+
+    SYSTEM_ERROR("-1", "系统错误"),
+
+    SERVICE_ERROR("2000", "业务异常"),
+
+    PARAM_ERROR("2002", "参数错误"),
+
+    TOKEN_FAILED("2005", "无效的token");
+
+    private String code;
+
+    private String message;
+
+    BeanResultEnum() {
+    }
+
+    BeanResultEnum(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    @Override
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    @Override
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+}

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

+package com.dituhui.pea.order.service;
+
+public interface ImportEngineerService {
+
+    void ImportEngineerByExcel(String excelurl);
+
+    void ImportEngineerAndSkillByExcel(String excelurl);
+}