diff --git a/src/com/engine/salary/entity/extemp/param/ExtEmpSaveParam.java b/src/com/engine/salary/entity/extemp/param/ExtEmpSaveParam.java index afb5ccb4b..f38362d8a 100644 --- a/src/com/engine/salary/entity/extemp/param/ExtEmpSaveParam.java +++ b/src/com/engine/salary/entity/extemp/param/ExtEmpSaveParam.java @@ -1,6 +1,5 @@ package com.engine.salary.entity.extemp.param; -import com.engine.salary.common.BaseQueryParam; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -18,7 +17,7 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor -public class ExtEmpSaveParam extends BaseQueryParam { +public class ExtEmpSaveParam { private Long id; diff --git a/src/com/engine/salary/entity/extemp/po/ExtEmpPO.java b/src/com/engine/salary/entity/extemp/po/ExtEmpPO.java index 82a24937a..e266f5ba2 100644 --- a/src/com/engine/salary/entity/extemp/po/ExtEmpPO.java +++ b/src/com/engine/salary/entity/extemp/po/ExtEmpPO.java @@ -1,11 +1,13 @@ package com.engine.salary.entity.extemp.po; +import com.engine.salary.annotation.TableTitle; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Collection; import java.util.Date; /** @@ -22,10 +24,12 @@ public class ExtEmpPO { /** * 姓名 */ + @TableTitle(title = "姓名", dataIndex = "username", key = "username") private String username; /** * 部门 */ + @TableTitle(title = "部门", dataIndex = "departmentName", key = "departmentName") private String departmentName; /** * 部门ID @@ -34,6 +38,7 @@ public class ExtEmpPO { /** * 分部 */ + @TableTitle(title = "分部", dataIndex = "subcompanyName", key = "subcompanyName") private String subcompanyName; /** * 分部ID @@ -42,6 +47,7 @@ public class ExtEmpPO { /** * 岗位 */ + @TableTitle(title = "岗位", dataIndex = "jobtitleName", key = "jobtitleName") private String jobtitleName; /** * 岗位ID @@ -50,6 +56,7 @@ public class ExtEmpPO { /** * 入职日期 */ + @TableTitle(title = "入职日期", dataIndex = "companystartdate", key = "companystartdate") private String companystartdate; /** * 手机 @@ -62,6 +69,7 @@ public class ExtEmpPO { /** * 工号 */ + @TableTitle(title = "工号", dataIndex = "workcode", key = "workcode") private String workcode; /** * 性别 @@ -120,4 +128,5 @@ public class ExtEmpPO { */ private String tenantKey; -} \ No newline at end of file + private Collection ids; +} diff --git a/src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.java b/src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.java index 5f052651c..7fa9abc28 100644 --- a/src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.java +++ b/src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.java @@ -6,59 +6,53 @@ import java.util.List; public interface ExternalEmployeeMapper { - /** + /** * 查询所有记录 * * @return 返回集合,没有返回空List */ - List listAll(); + List listAll(); - /** + /** * 根据主键查询 * * @param id 主键 * @return 返回记录,没有返回null */ - ExtEmpPO getById(Integer id); - - /** - * 新增,插入所有字段 - * - * @param externalEmployee 新增的记录 - * @return 返回影响行数 - */ - int insert(ExtEmpPO externalEmployee); - - /** + ExtEmpPO getById(Integer id); + + List listSome(ExtEmpPO po); + + /** * 新增,忽略null字段 * * @param externalEmployee 新增的记录 * @return 返回影响行数 */ - int insertIgnoreNull(ExtEmpPO externalEmployee); - - /** + int insertIgnoreNull(ExtEmpPO externalEmployee); + + /** * 修改,修改所有字段 * * @param externalEmployee 修改的记录 * @return 返回影响行数 */ - int update(ExtEmpPO externalEmployee); - - /** + int update(ExtEmpPO externalEmployee); + + /** * 修改,忽略null字段 * * @param externalEmployee 修改的记录 * @return 返回影响行数 */ - int updateIgnoreNull(ExtEmpPO externalEmployee); - - /** + int updateIgnoreNull(ExtEmpPO externalEmployee); + + /** * 删除记录 * * @return 返回影响行数 */ - int delete(Long id); - + int delete(Long id); + } \ No newline at end of file diff --git a/src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.xml b/src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.xml index aff4029da..730eae408 100644 --- a/src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.xml +++ b/src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.xml @@ -87,7 +87,7 @@ AND id = #{id} - + AND username = #{username} diff --git a/src/com/engine/salary/service/ExtEmpService.java b/src/com/engine/salary/service/ExtEmpService.java index 04a388f67..4c2bbf01f 100644 --- a/src/com/engine/salary/service/ExtEmpService.java +++ b/src/com/engine/salary/service/ExtEmpService.java @@ -1,7 +1,9 @@ package com.engine.salary.service; import com.engine.salary.entity.extemp.param.ExtEmpQueryParam; +import com.engine.salary.entity.extemp.param.ExtEmpSaveParam; import com.engine.salary.entity.extemp.po.ExtEmpPO; +import com.engine.salary.util.page.PageInfo; import java.util.Collection; import java.util.List; @@ -10,9 +12,11 @@ public interface ExtEmpService { List list(ExtEmpQueryParam param); - void save(ExtEmpPO po); + PageInfo listPage (ExtEmpQueryParam param); - void update(ExtEmpPO po); + void save(ExtEmpSaveParam po); + + void update(ExtEmpSaveParam po); void delete(Collection ids); diff --git a/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java b/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java index b61665f6b..64093fde4 100644 --- a/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java +++ b/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java @@ -2,13 +2,19 @@ package com.engine.salary.service.impl; import com.engine.core.impl.Service; import com.engine.salary.entity.extemp.param.ExtEmpQueryParam; +import com.engine.salary.entity.extemp.param.ExtEmpSaveParam; import com.engine.salary.entity.extemp.po.ExtEmpPO; import com.engine.salary.mapper.extemp.ExternalEmployeeMapper; import com.engine.salary.service.ExtEmpService; import com.engine.salary.util.db.MapperProxyFactory; +import com.engine.salary.util.page.PageInfo; +import com.engine.salary.util.page.SalaryPageUtil; +import dm.jdbc.util.IdGenerator; import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.BeanUtils; import java.util.Collection; +import java.util.Date; import java.util.List; /** @@ -29,16 +35,41 @@ public class ExtEmpServiceImpl extends Service implements ExtEmpService { @Override public List list(ExtEmpQueryParam param) { - return null; + return getExternalEmployeeMapper().listSome(ExtEmpPO.builder().username(param.getUsername()).build()); } @Override - public void save(ExtEmpPO po) { + public PageInfo listPage(ExtEmpQueryParam param) { + List extEmpPOS = list(param); + return SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), extEmpPOS, ExtEmpPO.class); + + } + + @Override + public void save(ExtEmpSaveParam param) { + ExtEmpPO po = new ExtEmpPO(); + BeanUtils.copyProperties(param, po); + + po.setId(IdGenerator.generate()); + po.setCreator((long) user.getUID()); + po.setModifier((long) user.getUID()); + Date now = new Date(); + po.setCreateTime(now); + po.setUpdateTime(now); + po.setDeleteType(0); + getExternalEmployeeMapper().insertIgnoreNull(po); } @Override - public void update(ExtEmpPO po) { + public void update(ExtEmpSaveParam param) { + ExtEmpPO po = new ExtEmpPO(); + BeanUtils.copyProperties(param, po); + + po.setModifier((long) user.getUID()); + Date now = new Date(); + po.setUpdateTime(now); + getExternalEmployeeMapper().updateIgnoreNull(po); } diff --git a/src/com/engine/salary/web/ExtEmpController.java b/src/com/engine/salary/web/ExtEmpController.java index bd5a02d04..24cd5fb17 100644 --- a/src/com/engine/salary/web/ExtEmpController.java +++ b/src/com/engine/salary/web/ExtEmpController.java @@ -5,6 +5,7 @@ import com.engine.salary.entity.extemp.param.ExtEmpQueryParam; import com.engine.salary.entity.extemp.param.ExtEmpSaveParam; import com.engine.salary.entity.extemp.po.ExtEmpPO; import com.engine.salary.util.ResponseResult; +import com.engine.salary.util.page.PageInfo; import com.engine.salary.wrapper.ExtEmpWrapper; import io.swagger.v3.oas.annotations.parameters.RequestBody; import weaver.hrm.HrmUserVarify; @@ -18,7 +19,6 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import java.util.Collection; -import java.util.List; /** * 外部人员 @@ -35,11 +35,11 @@ public class ExtEmpController { } @POST - @Path("/list") + @Path("/listPage") @Produces(MediaType.APPLICATION_JSON) public String list(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ExtEmpQueryParam param) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult>(user).run(getExtEmpWrapper(user)::list, param); + return new ResponseResult>(user).run(getExtEmpWrapper(user)::listPage, param); } @POST diff --git a/src/com/engine/salary/wrapper/ExtEmpWrapper.java b/src/com/engine/salary/wrapper/ExtEmpWrapper.java index 92ee40588..70f63b78c 100644 --- a/src/com/engine/salary/wrapper/ExtEmpWrapper.java +++ b/src/com/engine/salary/wrapper/ExtEmpWrapper.java @@ -7,11 +7,10 @@ import com.engine.salary.entity.extemp.param.ExtEmpSaveParam; import com.engine.salary.entity.extemp.po.ExtEmpPO; import com.engine.salary.service.ExtEmpService; import com.engine.salary.service.impl.ExtEmpServiceImpl; -import org.springframework.beans.BeanUtils; +import com.engine.salary.util.page.PageInfo; import weaver.hrm.User; import java.util.Collection; -import java.util.List; /** * 累计专项 @@ -28,22 +27,16 @@ public class ExtEmpWrapper extends Service { } - public List list(ExtEmpQueryParam param) { - return null; + public PageInfo listPage(ExtEmpQueryParam param) { + return getExtEmpService(user).listPage(param); } public void save(ExtEmpSaveParam param) { - - ExtEmpPO po = new ExtEmpPO(); - BeanUtils.copyProperties(param, po); - - getExtEmpService(user).save(po); + getExtEmpService(user).save(param); } public void update(ExtEmpSaveParam param) { - ExtEmpPO po = new ExtEmpPO(); - BeanUtils.copyProperties(param, po); - getExtEmpService(user).update(po); + getExtEmpService(user).update(param); } public void delete(Collection ids) {