diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index e434cb1a..00000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -financial \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index f7443930..e24ccc08 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -11,6 +11,7 @@ + @@ -27,6 +28,7 @@ + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 7dfdfa3a..30d52777 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -7,6 +7,7 @@ + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 4b661a5f..43126308 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,6 +5,7 @@ diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java index e3e1e317..7e7d20d0 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java @@ -6,6 +6,7 @@ import com.daqing.framework.domain.hrms.EmployeeEntity; import com.daqing.framework.domain.hrms.ext.EmployeeTO; import com.daqing.framework.domain.hrms.ext.EmployeeVO; import com.daqing.framework.model.response.ResponseResult; +import com.daqing.framework.utils.PageUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -33,7 +34,8 @@ public class EmployeeController implements EmployeeControllerApi { public ResponseResult list(@RequestParam("page") Integer page, @RequestParam("size") Integer size, EmployeeEntity employee) { - return ResponseResult.SUCCESS(); + PageUtils data = employeeService.queryPage(page, size, employee); + return new ResponseResult().SUCCESS(data); } /** diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/EmployeeDao.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/EmployeeDao.java index 0ad091ae..be862b2b 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/EmployeeDao.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/EmployeeDao.java @@ -1,9 +1,12 @@ package com.daqing.financial.hrms.dao; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.daqing.framework.domain.hrms.EmployeeEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.daqing.framework.domain.hrms.ext.EmployeeTO; import com.daqing.framework.domain.hrms.ext.EmployeeVO; +import com.daqing.framework.domain.hrms.ext.PositionVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -26,4 +29,6 @@ public interface EmployeeDao extends BaseMapper { List listEmployeeByDeptId(Long id); List listEmployeeName(); + + IPage pageByCondition(Page page, @Param("employee") EmployeeEntity employee); } diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/EmployeeService.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/EmployeeService.java index 0facb246..d716be3e 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/EmployeeService.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/EmployeeService.java @@ -23,5 +23,7 @@ public interface EmployeeService extends IService { EmployeeEntity getEmployeeById(Long id); List listEmployeeName(); + + PageUtils queryPage(Integer page, Integer size, EmployeeEntity employee); } diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java index 4d458102..eaedcf4e 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java @@ -1,7 +1,11 @@ package com.daqing.financial.hrms.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.daqing.framework.domain.hrms.ext.EmployeeTO; import com.daqing.framework.domain.hrms.ext.EmployeeVO; +import com.daqing.framework.domain.hrms.ext.PositionVO; +import com.daqing.framework.utils.PageUtils; import org.springframework.stereotype.Service; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -23,6 +27,19 @@ public class EmployeeServiceImpl extends ServiceImpl employeeVO = this.getBaseMapper().pageByCondition(new Page(page, size), employee); + + return new PageUtils(employeeVO); + } /** * 根据id查询员工的id * @param id diff --git a/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml b/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml index 319113ee..2a7a70fe 100644 --- a/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml +++ b/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml @@ -63,4 +63,23 @@ SELECT id,name FROM hrms_employee + + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class index b955b96c..3ae3e99b 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/EmployeeDao.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/EmployeeDao.class index 7324c23a..454674a6 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/EmployeeDao.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/EmployeeDao.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/EmployeeService.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/EmployeeService.class index 8fa777c9..3e73b628 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/EmployeeService.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/EmployeeService.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.class index 4b57229b..79cfc9c9 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.class differ diff --git a/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDao.xml index 319113ee..12205e22 100644 --- a/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDao.xml +++ b/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDao.xml @@ -63,4 +63,22 @@ SELECT id,name FROM hrms_employee + + \ No newline at end of file diff --git a/dq-govern-gateway/dq-govern-gateway.iml b/dq-govern-gateway/dq-govern-gateway.iml deleted file mode 100644 index 99f60a52..00000000 --- a/dq-govern-gateway/dq-govern-gateway.iml +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dq-govern-gateway/src/main/resources/application.yml b/dq-govern-gateway/src/main/resources/application.yml index 1c28ccc3..93356590 100644 --- a/dq-govern-gateway/src/main/resources/application.yml +++ b/dq-govern-gateway/src/main/resources/application.yml @@ -14,7 +14,7 @@ spring: # - id: hrms_route uri: lb://dq-financial-hrms - predicates: - - Path=/api/hrms/** - filters: - - RewritePath=/api/(?.*),/ $\{segment} \ No newline at end of file + predicates: + - Path=/api/hrms/** + filters: + - RewritePath=/api/(?.*),/ $\{segment} \ No newline at end of file