feat:添加根据excel导入工程师，技能，业务信息相关代码

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

@@ -15,4 +15,8 @@ public class ImportEngineerContrloller {
     public void importEngineer(String excelUrl) {
     public void importEngineer(String excelUrl) {
         importEngineerService.ImportEngineerByExcel(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

@@ -7,10 +7,17 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 import java.util.List;
 
 
 public interface EngineerSkillGroupDao extends JpaRepository<EngineerSkillGroupEntity, Integer> {
 public interface EngineerSkillGroupDao extends JpaRepository<EngineerSkillGroupEntity, Integer> {
-	List<EngineerSkillGroupEntity> findByEngineerCode(String engineerCode);
-	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);
+    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;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 
 public interface SkillGroupDao extends JpaRepository<SkillGroupEntity, Long> {
 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)
     @Column(nullable = false)
     private Boolean status;
     private Boolean status;
 
 
-    @Column(length = 100, nullable = false)
+    @Column(length = 100, nullable = true)
     private String memo;
     private String memo;
 
 
     @Column(name = "create_time", nullable = false, columnDefinition = "timestamp DEFAULT CURRENT_TIMESTAMP")
     @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")
     @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
     // Getters and Setters
     // ...
     // ...

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

@@ -3,4 +3,6 @@ package com.dituhui.pea.order.service;
 public interface ImportEngineerService {
 public interface ImportEngineerService {
 
 
     void ImportEngineerByExcel(String excelurl);
     void ImportEngineerByExcel(String excelurl);
+
+    void ImportEngineerAndSkillByExcel(String excelurl);
 }
 }