Merge branch 'feature_OrderServiceList_wangl' into 'develop'

请求参数类型变更

See merge request !20

project-order/src/main/java/com/alibaba/cloud/integration/order/controller/EngineerController.java

@@ -15,7 +15,7 @@ public class EngineerController {
 	private EngineerService engineerService;
 	private EngineerService engineerService;
 
 
 	@GetMapping("/engineer/info/list")
 	@GetMapping("/engineer/info/list")
-	public Result<?> getEngineerInfoList(@RequestParam Integer page, @RequestParam Integer size){
+	public Result<?> getEngineerInfoList(@RequestParam long page, @RequestParam long size){
 		// 获取工程师基础信息列表
 		// 获取工程师基础信息列表
 		Result<?> res = null;
 		Result<?> res = null;
 		try {
 		try {
@@ -27,7 +27,7 @@ public class EngineerController {
 	}
 	}
 
 
 	@GetMapping("/engineer/skill/list")
 	@GetMapping("/engineer/skill/list")
-	public Result<?> getEngineerSkillList(@RequestParam Integer page, @RequestParam Integer size) {
+	public Result<?> getEngineerSkillList(@RequestParam long page, @RequestParam long size) {
 		// 获取工程师技能信息列表
 		// 获取工程师技能信息列表
 		Result<?> res = null;
 		Result<?> res = null;
 		try {
 		try {

project-order/src/main/java/com/alibaba/cloud/integration/order/service/EngineerService.java

@@ -5,8 +5,8 @@ import com.alibaba.cloud.integration.common.Result;
 public interface EngineerService {
 public interface EngineerService {
 
 
 	// 获取公司列表
 	// 获取公司列表
-	Result<?> getEngineerInfoList(Integer page, Integer size);
+	Result<?> getEngineerInfoList(long page, long size);
 
 
 	//获取工程师技能列表
 	//获取工程师技能列表
-	Result<?> getEngineerSkillList(Integer page, Integer size);
+	Result<?> getEngineerSkillList(long page, long size);
 }
 }

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/EngineerServiceImpl.java

@@ -6,7 +6,6 @@ import com.alibaba.cloud.integration.order.dao.EngineerSkillDao;
 import com.alibaba.cloud.integration.order.dao.OrgGroupDao;
 import com.alibaba.cloud.integration.order.dao.OrgGroupDao;
 import com.alibaba.cloud.integration.order.dto.EngineerInfoListResp;
 import com.alibaba.cloud.integration.order.dto.EngineerInfoListResp;
 import com.alibaba.cloud.integration.order.entity.EngineerInfo;
 import com.alibaba.cloud.integration.order.entity.EngineerInfo;
-import com.alibaba.cloud.integration.order.entity.EngineerSkill;
 import com.alibaba.cloud.integration.order.entity.OrgGroup;
 import com.alibaba.cloud.integration.order.entity.OrgGroup;
 import com.alibaba.cloud.integration.order.service.EngineerService;
 import com.alibaba.cloud.integration.order.service.EngineerService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -33,7 +32,7 @@ public class EngineerServiceImpl implements EngineerService {
 
 
 	@Transactional
 	@Transactional
 	@Override
 	@Override
-	public Result<?> getEngineerInfoList(Integer page, Integer size) {
+	public Result<?> getEngineerInfoList(long page, long size) {
 		// 查询工程师信息
 		// 查询工程师信息
 		IPage<EngineerInfo> pg = this.queryEngineerInfo(page, size);
 		IPage<EngineerInfo> pg = this.queryEngineerInfo(page, size);
 
 
@@ -60,11 +59,11 @@ public class EngineerServiceImpl implements EngineerService {
 
 
 	@Transactional
 	@Transactional
 	@Override
 	@Override
-	public Result<?> getEngineerSkillList(Integer page, Integer size) {
+	public Result<?> getEngineerSkillList(long page, long size) {
 		return null;
 		return null;
 	}
 	}
 
 
-	private IPage<EngineerInfo> queryEngineerInfo(Integer page, Integer size) {
+	private IPage<EngineerInfo> queryEngineerInfo(long page, long size) {
 		// 分页查询工程师基础信息
 		// 分页查询工程师基础信息
 		LambdaQueryWrapper<EngineerInfo> lqw = new LambdaQueryWrapper<>();
 		LambdaQueryWrapper<EngineerInfo> lqw = new LambdaQueryWrapper<>();
 		lqw.orderByAsc(EngineerInfo::getGroupId);
 		lqw.orderByAsc(EngineerInfo::getGroupId);
@@ -79,7 +78,7 @@ public class EngineerServiceImpl implements EngineerService {
 		//查询小组名称映射关系
 		//查询小组名称映射关系
 		HashMap<String, String> map = new HashMap<>();
 		HashMap<String, String> map = new HashMap<>();
 
 
-		if (groupIds.isEmpty() || groupIds == null) {
+		if (groupIds.isEmpty()) {
 			return map;
 			return map;
 		}
 		}
 		LambdaQueryWrapper<OrgGroup> lqw = new LambdaQueryWrapper<>();
 		LambdaQueryWrapper<OrgGroup> lqw = new LambdaQueryWrapper<>();
@@ -122,10 +121,10 @@ public class EngineerServiceImpl implements EngineerService {
 
 
 	private String getEngineerAge(String birth) {
 	private String getEngineerAge(String birth) {
 		// 获取工程师年龄
 		// 获取工程师年龄
-		if (birth.isEmpty() || birth == null) {
+		if (birth.isEmpty()) {
 			return "";
 			return "";
 		}
 		}
-		int age = 0;
+		int age;
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
 		try {
 		try {
 			Date birthDate = dateFormat.parse(birth);
 			Date birthDate = dateFormat.parse(birth);