Merge branch 'dev_mp2jpa0809' into 'develop'

Dev mp2jpa0809

See merge request !326

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

@@ -31,8 +31,8 @@ public class EngineerController {
     @GetMapping("/engineer/info/list")
     @GetMapping("/engineer/info/list")
     public Result<?> getEngineerInfoList(@RequestParam String levelType,
     public Result<?> getEngineerInfoList(@RequestParam String levelType,
                                          @RequestParam String levelValue,
                                          @RequestParam String levelValue,
-                                         @RequestParam long page,
-                                         @RequestParam long size,
+                                         @RequestParam int page,
+                                         @RequestParam int size,
                                          @RequestParam(required = false) String kind,
                                          @RequestParam(required = false) String kind,
                                          @RequestParam(required = false) String key) {
                                          @RequestParam(required = false) String key) {
         // 获取工程师基础信息列表
         // 获取工程师基础信息列表
@@ -60,8 +60,8 @@ public class EngineerController {
     @GetMapping("/engineer/skill/list")
     @GetMapping("/engineer/skill/list")
     public Result<?> getEngineerSkillList(@RequestParam String levelType,
     public Result<?> getEngineerSkillList(@RequestParam String levelType,
                                           @RequestParam String levelValue,
                                           @RequestParam String levelValue,
-                                          @RequestParam long page,
-                                          @RequestParam long size,
+                                          @RequestParam int page,
+                                          @RequestParam int size,
                                           @RequestParam(required = false) String kind,
                                           @RequestParam(required = false) String kind,
                                           @RequestParam(required = false) String key) {
                                           @RequestParam(required = false) String key) {
         // 获取工程师技能信息列表
         // 获取工程师技能信息列表
@@ -100,8 +100,8 @@ public class EngineerController {
     @GetMapping("/engineer/business/list")
     @GetMapping("/engineer/business/list")
     public Result<?> getEngineerBusinessList(@RequestParam String levelType,
     public Result<?> getEngineerBusinessList(@RequestParam String levelType,
                                              @RequestParam String levelValue,
                                              @RequestParam String levelValue,
-                                             @RequestParam long page,
-                                             @RequestParam long size,
+                                             @RequestParam int page,
+                                             @RequestParam int size,
                                              @RequestParam(required = false) String kind,
                                              @RequestParam(required = false) String kind,
                                              @RequestParam(required = false) String key) {
                                              @RequestParam(required = false) String key) {
         // 技术员业务属性配置列表
         // 技术员业务属性配置列表

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

@@ -23,4 +23,6 @@ public interface EngineerBusinessDao extends CrudRepository<EngineerBusinessEnti
     void updateEngineerCenter(String address, String x, String y, String engineerCode);
     void updateEngineerCenter(String address, String x, String y, String engineerCode);
 
 
     EngineerBusinessEntity getByEngineerCode(String engineerCode);
     EngineerBusinessEntity getByEngineerCode(String engineerCode);
+
+    List<EngineerBusinessEntity> findByEngineerCodeIn(List<String> engineerCodes);
 }
 }

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

@@ -10,6 +10,7 @@ public interface EngineerSkillGroupDao extends JpaRepository<EngineerSkillGroupE
 	List<EngineerSkillGroupEntity> findByEngineerCode(String engineerCode);
 	List<EngineerSkillGroupEntity> findByEngineerCode(String engineerCode);
 	List<EngineerSkillGroupEntity> findByEngineerCodeAndStatus(String engineerCode, boolean status);
 	List<EngineerSkillGroupEntity> findByEngineerCodeAndStatus(String engineerCode, boolean status);
 	List<EngineerSkillGroupEntity> findByEngineerCodeInAndStatus(List<String> engineerCodes, 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> findBySkillGroupCode(String skillGroupCode);
 	List<EngineerSkillGroupEntity> findBySkillGroupCodeAndStatus(String skillGroupCode, boolean status);
 	List<EngineerSkillGroupEntity> findBySkillGroupCodeAndStatus(String skillGroupCode, boolean status);
 }
 }

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

@@ -7,16 +7,16 @@ import java.util.List;
 public interface EngineerService {
 public interface EngineerService {
 
 
 	// 获取公司列表
 	// 获取公司列表
-	Result<?> getEngineerInfoList(String levelType, String levelValue, long page, long size, String kind, String key);
+	Result<?> getEngineerInfoList(String levelType, String levelValue, int page, int size, String kind, String key);
 	Result<?> getEngineerInfoDetail(String engineerCode);
 	Result<?> getEngineerInfoDetail(String engineerCode);
 
 
 	// 获取工程师技能列表
 	// 获取工程师技能列表
-	Result<?> getEngineerSkillList(String levelType, String levelValue, long page, long size, String kind, String key);
+	Result<?> getEngineerSkillList(String levelType, String levelValue, int page, int size, String kind, String key);
 	Result<?> getEngineerSkillDetail(String engineerCode);
 	Result<?> getEngineerSkillDetail(String engineerCode);
 	Result<?> engineerSkillUpdate(String engineerCode, List<String> categoryIds);
 	Result<?> engineerSkillUpdate(String engineerCode, List<String> categoryIds);
 
 
 	// 工程师业务属性配置列表
 	// 工程师业务属性配置列表
-	Result<?> getEngineerBusinessList(String levelType, String levelValue, long page, long size, String kind, String key);
+	Result<?> getEngineerBusinessList(String levelType, String levelValue, int page, int size, String kind, String key);
 	Result<?> getEngineerBusinessDetail(String engineerCode);
 	Result<?> getEngineerBusinessDetail(String engineerCode);
 
 
 	// 技术员业务属性配置修改
 	// 技术员业务属性配置修改