From abb552cd6d4ece72a42f5e187844607b02793d2e Mon Sep 17 00:00:00 2001 From: ligaode Date: Thu, 23 Jan 2025 19:13:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/portal/api/sysuser/DeptUserVo.java | 16 + .../portal/api/sysuser/SysUserFeign.java | 4 + .../api/sysuser/SysUserFeignFallback.java | 501 +++++++++--------- .../biz/sysstaffinfo/SysStaffinfoMapper.xml | 6 +- .../biz/sysstafforg/SysStaffOrgMapper.xml | 26 +- .../portal/biz/sysuser/SysUserMapper.java | 7 +- .../portal/biz/sysuser/SysUserMapper.xml | 57 +- .../anrui/portal/biz/sysuser/SysUserRest.java | 5 + .../portal/biz/sysuser/SysUserService.java | 5 + .../terminal/api/oa/common/OaCommonFeign.java | 4 +- .../terminal/biz/oa/common/OaCommonRest.java | 5 + .../biz/oa/common/OaCommonService.java | 26 +- .../anrui/oa/api/AdExpatriatesApplyRest.java | 39 +- .../AdExpatriatesApplyDetailVo.java | 29 + .../AdExpatriatesApplyDto.java | 2 +- .../AdExpatriatesApplyMapper.java | 4 +- .../AdExpatriatesApplyMapper.xml | 53 +- .../AdExpatriatesApplyQuery.java | 54 -- .../AdExpatriatesApplyService.java | 140 +++-- .../AdExpatriatesApplyVo.java | 70 +-- .../AdExpatriatesDetailDto.java | 36 +- .../AdExpatriatesDetailMapper.java | 7 +- .../AdExpatriatesDetailMapper.xml | 15 +- .../AdExpatriatesDetailService.java | 39 +- .../AdExpatriatesDetailVo.java | 36 +- ...ry.java => AdExpatriatesListDetailVo.java} | 41 +- 26 files changed, 627 insertions(+), 600 deletions(-) create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/DeptUserVo.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyDetailVo.java delete mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyQuery.java rename yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/{AdExpatriatesDetailQuery.java => AdExpatriatesListDetailVo.java} (62%) diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/DeptUserVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/DeptUserVo.java new file mode 100644 index 0000000000..63059cf818 --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/DeptUserVo.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.portal.api.sysuser; + +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/1/16 + **/ +@Data +public class DeptUserVo { + + private String sid; + + private String name; +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java index 00d74393ee..21f08f2218 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java @@ -239,6 +239,10 @@ public interface SysUserFeign { @GetMapping(value = "getUserByDeptSid") ResultBean>> getUserByDeptSid(@RequestParam("deptSid") String deptSid); + @ApiOperation(value = "获取本部门下人员") + @GetMapping(value = "getAllPeo") + ResultBean> getAllPeo(@RequestParam("deptSid") String deptSid); + @ApiOperation(value = "根据用户sid获取用户id") @PostMapping(value = "selectIdBySid") ResultBean selectIdBySid(@RequestBody List stringList); diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java index 78c38e5d2c..e2f823e5f9 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java @@ -27,252 +27,257 @@ import java.util.Map; @Component public class SysUserFeignFallback implements SysUserFeign { - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui_portal/sysuser/listPage无法访问"); - } - - @Override - public ResultBean> listAll(SysUserQuery query){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui_portal/sysuser/listAll无法访问"); - } - - @Override - public ResultBean> list(){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui_portal/sysuser/list无法访问"); - } - - @Override - public ResultBean save(SysUserDto dto){ - return ResultBean.fireFail().setMsg("接口anrui_portal/sysuser/save无法访问"); - } - - @Override - public ResultBean saveCustUser(SysUserDto dto) { - return null; - } - - @Override - public ResultBean delSysUserByMobile(String sid) { - return ResultBean.fireFail().setMsg("接口anrui_portal/sysuser/delSysUserByMobile无法访问"); - } - - @Override - public ResultBean getSysUserByMobile(String staffSid) { - return null; - } - - @Override - public ResultBean update(SysUserDto dto,String sid){ - return ResultBean.fireFail().setMsg("接口anrui_portal/sysuser/update无法访问"); - } - - @Override - public ResultBean updatePassword(String original, String password, String confirmPassword, String userSid, HttpServletRequest httpServletRequest) { - return ResultBean.fireFail().setMsg("接口anrui_portal/sysuser/updatePassword无法访问"); - } - - @Override - public ResultBean del(String ids){ - return ResultBean.fireFail().setMsg("接口anrui_portal/sysuser/del无法访问"); - } - - @Override - public ResultBean delBySid(String sid) { - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui_portal/sysuser/delBySid无法访问"); - } - - @Override - public ResultBean selectByUserName(String mobile) { - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui_portal/sysuser/fetchByMobile无法访问"); - } - - @Override - public ResultBean fetch(String id){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui_portal/sysuser/fetch无法访问"); - } - - @Override - public ResultBean fetchBySid(String sid) { - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui_portal/sysuser/fetchBySid无法访问"); - } - - @Override - public ResultBean> fetchBySids(String sids) { - return null; - } - - @Override - public ResultBean reGetPwd(String userName, String userPhone) { - return null; - } - - @Override - public ResultBean initPwd(String sid) { - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui_portal/sysuser/initPwd无法访问"); - } - - @Override - public ResultBean login(SysUserQuery sysUserQuery) { - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui_portal/sysuser/login无法访问"); - } - - @Override - public ResultBean loginByNoVeriCode(SysUserQuery sysUserQuery) { - return null; - } - - @Override - public ResultBean signOut(HttpServletRequest httpServletRequest) { - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui_portal/sysuser/signOut无法访问"); - } - - @Override - public ResultBean sendMessageCode(String mobile) { - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui_portal/sysuser/sendMessageCode无法访问"); - } - - @Override - public ResultBean selectByStaffsid(String staffsid) { - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui_portal/sysuser/selectByStaffsid无法访问"); - } - - @Override - public ResultBean selectBySid(String sid) { - return null; - } - - @Override - public ResultBean loginDetails(HttpServletRequest httpServletRequest) { - return null; - } - - @Override - public ResultBean getUserOrgInfoByUserSid(String userSid) { - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui_portal/sysuser/getUserOrgInfoByUserSid无法访问"); - } - - @Override - public ResultBean selectUserInfoByUserSid(String userSid) { - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui_portal/sysuser/selectUserInfoByUserSid无法访问"); - } - - @Override - public ResultBean selectUserInfoByUserSid(String userSid, String orgSid) { - return null; - } - - @Override - public ResultBean setIsEnable(String sid, String isEnable) { - return null; - } - - @Override - public ResultBean getUsersByRoleSid(String roleSid) { - return null; - } - - @Override - public ResultBean> getUserByRole(UserQuery query) { - return null; - } - - @Override - public ResultBean> getUserSidByRole(UserQuery query) { - return null; - } - - @Override - public ResultBean> getUsersByRoles(UserssQuery usersQuery) { - return null; - } - - @Override - public ResultBean> getUserByOrgRole(UserRoleQuery query) { - return null; - } - - @Override - public ResultBean> getOtherOrgRoleUser(UserRoleQuery query) { - return null; - } - - @Override - public ResultBean>> getUserByOrgSid(String orgSid, String userSid) { - return null; - } - - @Override - public ResultBean>> getUserByDeptSid(String deptSid) { - return null; - } - - @Override - public ResultBean selectIdBySid(List stringList) { - return null; - } - - @Override - public ResultBean> selectSysUserList(String userSid,String orgPath) { - return null; - } - - @Override - public ResultBean selectPasswordByUserSid(String userSid) { - return null; - } - - @Override - public ResultBean selectHaveMessage(SysHaveMessageQuery sysHaveMessageQuery) { - return null; - } - - @Override - public ResultBean> getOrgListByUserSid(String userSid) { - return null; - } - - @Override - public ResultBean> getUserByRoles(UserByRolesAndOrgQuery userQuery) { - return null; - } - - @Override - public ResultBean> shareSelectUser(ShareUserQuery shareUserQuery) { - return null; - } - - @Override - public ResultBean selectPrivilegeLevel(PrivilegeQuery query) { - return null; - } - - @Override - public ResultBean selectPrivilegeLevelPath(PrivilegeQuery query) { - return null; - } - - @Override - public ResultBean removeRedis() { - return null; - } - - @Override - public ResultBean fetchBySidWx(String sid) { - return null; - } + @Override + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/listPage无法访问"); + } + + @Override + public ResultBean> listAll(SysUserQuery query) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/listAll无法访问"); + } + + @Override + public ResultBean> list() { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/list无法访问"); + } + + @Override + public ResultBean save(SysUserDto dto) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysuser/save无法访问"); + } + + @Override + public ResultBean saveCustUser(SysUserDto dto) { + return null; + } + + @Override + public ResultBean delSysUserByMobile(String sid) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysuser/delSysUserByMobile无法访问"); + } + + @Override + public ResultBean getSysUserByMobile(String staffSid) { + return null; + } + + @Override + public ResultBean update(SysUserDto dto, String sid) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysuser/update无法访问"); + } + + @Override + public ResultBean updatePassword(String original, String password, String confirmPassword, String userSid, HttpServletRequest httpServletRequest) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysuser/updatePassword无法访问"); + } + + @Override + public ResultBean del(String ids) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysuser/del无法访问"); + } + + @Override + public ResultBean delBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/delBySid无法访问"); + } + + @Override + public ResultBean selectByUserName(String mobile) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/fetchByMobile无法访问"); + } + + @Override + public ResultBean fetch(String id) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/fetch无法访问"); + } + + @Override + public ResultBean fetchBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/fetchBySid无法访问"); + } + + @Override + public ResultBean> fetchBySids(String sids) { + return null; + } + + @Override + public ResultBean reGetPwd(String userName, String userPhone) { + return null; + } + + @Override + public ResultBean initPwd(String sid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/initPwd无法访问"); + } + + @Override + public ResultBean login(SysUserQuery sysUserQuery) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/login无法访问"); + } + + @Override + public ResultBean loginByNoVeriCode(SysUserQuery sysUserQuery) { + return null; + } + + @Override + public ResultBean signOut(HttpServletRequest httpServletRequest) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/signOut无法访问"); + } + + @Override + public ResultBean sendMessageCode(String mobile) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/sendMessageCode无法访问"); + } + + @Override + public ResultBean selectByStaffsid(String staffsid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/selectByStaffsid无法访问"); + } + + @Override + public ResultBean selectBySid(String sid) { + return null; + } + + @Override + public ResultBean loginDetails(HttpServletRequest httpServletRequest) { + return null; + } + + @Override + public ResultBean getUserOrgInfoByUserSid(String userSid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/getUserOrgInfoByUserSid无法访问"); + } + + @Override + public ResultBean selectUserInfoByUserSid(String userSid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/selectUserInfoByUserSid无法访问"); + } + + @Override + public ResultBean selectUserInfoByUserSid(String userSid, String orgSid) { + return null; + } + + @Override + public ResultBean setIsEnable(String sid, String isEnable) { + return null; + } + + @Override + public ResultBean getUsersByRoleSid(String roleSid) { + return null; + } + + @Override + public ResultBean> getUserByRole(UserQuery query) { + return null; + } + + @Override + public ResultBean> getUserSidByRole(UserQuery query) { + return null; + } + + @Override + public ResultBean> getUsersByRoles(UserssQuery usersQuery) { + return null; + } + + @Override + public ResultBean> getUserByOrgRole(UserRoleQuery query) { + return null; + } + + @Override + public ResultBean> getOtherOrgRoleUser(UserRoleQuery query) { + return null; + } + + @Override + public ResultBean>> getUserByOrgSid(String orgSid, String userSid) { + return null; + } + + @Override + public ResultBean>> getUserByDeptSid(String deptSid) { + return null; + } + + @Override + public ResultBean> getAllPeo(String deptSid) { + return null; + } + + @Override + public ResultBean selectIdBySid(List stringList) { + return null; + } + + @Override + public ResultBean> selectSysUserList(String userSid, String orgPath) { + return null; + } + + @Override + public ResultBean selectPasswordByUserSid(String userSid) { + return null; + } + + @Override + public ResultBean selectHaveMessage(SysHaveMessageQuery sysHaveMessageQuery) { + return null; + } + + @Override + public ResultBean> getOrgListByUserSid(String userSid) { + return null; + } + + @Override + public ResultBean> getUserByRoles(UserByRolesAndOrgQuery userQuery) { + return null; + } + + @Override + public ResultBean> shareSelectUser(ShareUserQuery shareUserQuery) { + return null; + } + + @Override + public ResultBean selectPrivilegeLevel(PrivilegeQuery query) { + return null; + } + + @Override + public ResultBean selectPrivilegeLevelPath(PrivilegeQuery query) { + return null; + } + + @Override + public ResultBean removeRedis() { + return null; + } + + @Override + public ResultBean fetchBySidWx(String sid) { + return null; + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml index 248d9b2067..a8b5053dc7 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml @@ -321,7 +321,7 @@ SELECT DISTINCT ss.sid, ss.name FROM sys_staffinfo ss LEFT JOIN sys_staff_org sso - ON ss.`sid` = sso.`staffSid` + ON ss.sid = sso.staffSid ${ew.customSqlSegment} @@ -330,7 +330,7 @@ ss.name FROM sys_staffinfo ss LEFT JOIN sys_staff_org sso - ON ss.`sid` = sso.`staffSid` + ON ss.sid = sso.staffSid ${ew.customSqlSegment} @@ -398,7 +398,7 @@ SELECT - su.`sid`, - ss.`name` + su.sid, + ss.name FROM sys_staff_org sso LEFT JOIN sys_user su - ON sso.`staffSid` = su.`staffSid` + ON sso.staffSid = su.staffSid LEFT JOIN sys_user_role sur - ON su.`sid` = sur.`userSid` + ON su.sid = sur.userSid LEFT JOIN sys_staffinfo ss - ON sso.`staffSid` = ss.`sid` + ON sso.staffSid = ss.sid ${ew.sqlSegment} @@ -150,13 +150,13 @@ SELECT su.sid, ss.name, sso.orgNamePath departmentName - FROM `sys_user` su - LEFT JOIN `sys_staffinfo` ss ON su.staffSid = ss.sid - LEFT JOIN `sys_staff_org` sso ON sso.staffSid = ss.sid - LEFT JOIN `sys_user_role` sur ON sur.userSid = su.sid - LEFT JOIN `sys_role` sr ON sr.sid = sur.roleSid + FROM sys_user su + LEFT JOIN sys_staffinfo ss ON su.staffSid = ss.sid + LEFT JOIN sys_staff_org sso ON sso.staffSid = ss.sid + LEFT JOIN sys_user_role sur ON sur.userSid = su.sid + LEFT JOIN sys_role sr ON sr.sid = sur.roleSid WHERE sr.sid = #{roleSid} @@ -306,15 +306,15 @@ sp.name as postName FROM sys_user su LEFT JOIN sys_staffinfo st - ON su.`staffSid` = st.`sid` + ON su.staffSid = st.sid LEFT JOIN sys_staff_org sso - ON st.`sid` = sso.`staffSid` + ON st.sid = sso.staffSid LEFT JOIN sys_staff_post ssp - ON st.sid = ssp.`staffSid` + ON st.sid = ssp.staffSid LEFT JOIN sys_post sp - ON ssp.`postSid` = sp.`sid` + ON ssp.postSid = sp.sid WHERE su.sid != #{userSid} - AND sso.`orgSidPath` LIKE concat('%' + AND sso.orgSidPath LIKE concat('%' , #{orgSid} , '%') @@ -366,7 +366,7 @@ where sr.roleSid = #{roleSid} and find_in_set(#{levelOrgSid}, replace(so.orgSidPath, '/', ',')) and si.personTypeKey != '01' - AND so.`manageType` = 3 + AND so.manageType = 3 and su.sid in #{item} @@ -382,7 +382,7 @@ where sr.roleSid = #{roleSid} and find_in_set(#{levelOrgSid}, replace(so.orgSidPath, '/', ',')) and si.personTypeKey != '01' - AND so.`manageType` = 3 + AND so.manageType = 3 and su.sid in #{item} @@ -398,10 +398,10 @@ @@ -448,20 +448,37 @@ FROM sys_user su LEFT JOIN sys_staffinfo st - ON su.`staffSid` = st.`sid` + ON su.staffSid = st.sid LEFT JOIN sys_staff_org sso - ON st.`sid` = sso.`staffSid` + ON st.sid = sso.staffSid LEFT JOIN sys_staff_post ssp - ON st.sid = ssp.`staffSid` + ON st.sid = ssp.staffSid LEFT JOIN sys_post sp - ON ssp.`postSid` = sp.`sid` + ON ssp.postSid = sp.sid LEFT JOIN sys_user_role sur - ON sur.`userSid` = su.`sid` - WHERE sso.`orgSidPath` LIKE CONCAT( + ON sur.userSid = su.sid + WHERE sso.orgSidPath LIKE CONCAT( '%', #{deptSid}, '%' ) AND sur.roleSid = 'de8bfb73-8a08-46bc-beab-f981bf8c8de8' + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java index 00b69bf427..b9a1f3cbcd 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java @@ -664,6 +664,11 @@ public class SysUserRest implements SysUserFeign { return sysUserService.getUserByDeptSid(deptSid); } + @Override + public ResultBean> getAllPeo(String deptSid) { + return sysUserService.getAllPeo(deptSid); + } + @Override public ResultBean selectIdBySid(List stringList) { return sysUserService.selectIdBySid(stringList); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index 39e3ab10c5..2de9c42154 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -1718,4 +1718,9 @@ public class SysUserService extends MybatisBaseService { } + public ResultBean> getAllPeo(String deptSid) { + ResultBean rb = ResultBean.fireFail(); + List allPeo = baseMapper.getAllPeo(deptSid); + return rb.success().setData(allPeo); + } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/common/OaCommonFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/common/OaCommonFeign.java index 9925a26835..11dbaba5fe 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/common/OaCommonFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/common/OaCommonFeign.java @@ -29,5 +29,7 @@ public interface OaCommonFeign { @GetMapping("/getAllDeptByPath") ResultBean> getAllDeptByPath(@RequestParam("orgPath") String orgPath); - + @ApiOperation("查询部门人员") + @GetMapping("/getAllPeoByDept") + ResultBean> getAllPeoByDept(@RequestParam("deptSid") String deptSid); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/oa/common/OaCommonRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/oa/common/OaCommonRest.java index 1600d40260..59540bdc81 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/oa/common/OaCommonRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/oa/common/OaCommonRest.java @@ -30,4 +30,9 @@ public class OaCommonRest implements OaCommonFeign { public ResultBean> getAllDeptByPath(String orgPath) { return oaCommonService.getAllDeptByPath(orgPath); } + + @Override + public ResultBean> getAllPeoByDept(String deptSid) { + return oaCommonService.getAllPeoByDept(deptSid); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/oa/common/OaCommonService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/oa/common/OaCommonService.java index 1e0dd56e86..1f75c230a6 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/oa/common/OaCommonService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/oa/common/OaCommonService.java @@ -5,16 +5,15 @@ import com.yxt.anrui.portal.api.sysorganization.OrgDeptVo; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.syspost.SysPostAllVo; import com.yxt.anrui.portal.api.syspost.SysPostFeign; +import com.yxt.anrui.portal.api.sysuser.DeptUserVo; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.terminal.api.base.common.PublicModelVo; import com.yxt.anrui.terminal.api.oa.common.OaCommonDictVo; import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Optional; +import java.util.*; import java.util.stream.Collectors; /** @@ -29,6 +28,8 @@ public class OaCommonService { private SysPostFeign sysPostFeign; @Autowired private SysOrganizationFeign sysOrganizationFeign; + @Autowired + private SysUserFeign sysUserFeign; public ResultBean> getAllPost(String name) { ResultBean> rb = ResultBean.fireFail(); @@ -63,4 +64,21 @@ public class OaCommonService { .collect(Collectors.toList()); return rb.success().setData(voList); } + + public ResultBean> getAllPeoByDept(String deptSid) { + ResultBean> rb = ResultBean.fireFail(); + ResultBean> allPeo = sysUserFeign.getAllPeo(deptSid); + List voList = Optional.ofNullable(allPeo.getData()) + .orElse(Collections.emptyList()) // 如果为 null，则返回一个空列表 + .stream() + .map(peo -> { + OaCommonDictVo oaCommonDictVo = new OaCommonDictVo(); + // 映射属性：手动指定属性名称和类型不一致时的赋值方式 + oaCommonDictVo.setId(peo.getSid()); + oaCommonDictVo.setDictValue(peo.getName()); + return oaCommonDictVo; + }) + .collect(Collectors.toList()); + return rb.success().setData(voList); + } } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdExpatriatesApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdExpatriatesApplyRest.java index 02620ee559..a8130ced27 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdExpatriatesApplyRest.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdExpatriatesApplyRest.java @@ -26,6 +26,8 @@ package com.yxt.anrui.oa.api; import com.yxt.anrui.oa.biz.adexpatriatesapply.*; +import com.yxt.anrui.oa.biz.hrhireapply.HrHireApplyDetailVo; +import com.yxt.anrui.oa.biz.hrhireapply.HrHireApplyVo; import com.yxt.anrui.oa.biz.oaform.flowable.CompleteDto; import com.yxt.anrui.oa.biz.oaform.flowable.NodeQuery; import com.yxt.anrui.oa.biz.oaform.flowable.NodeVo; @@ -51,12 +53,23 @@ public class AdExpatriatesApplyRest { @Autowired private AdExpatriatesApplyService adExpatriatesApplyService; - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = adExpatriatesApplyService.listPageVo(pq); - return rb.success().setData(pv); + @ApiOperation("初始化（新增或修改）") + @GetMapping({"/getInit", "/getInit/{sid}"}) + public ResultBean getInit( + @PathVariable(value = "sid", required = false) String sid, + @RequestParam(value = "userSid", required = false) String userSid, + @RequestParam(value = "orgPath", required = false) String orgPath) { + ResultBean rb = ResultBean.fireFail(); + if (sid == null || sid.isEmpty()) { + // 执行新增初始化 + if (userSid == null || orgPath == null) { + return rb.setMsg("userSid和orgPath不能为空"); + } + return adExpatriatesApplyService.getSaveInit(userSid, orgPath); + } else { + // 执行修改初始化 + return adExpatriatesApplyService.getUpdateInit(sid); + } } @ApiOperation("新增或修改") @@ -65,6 +78,13 @@ public class AdExpatriatesApplyRest { return adExpatriatesApplyService.saveOrUpdateDto(dto); } + @ApiOperation("详情") + @GetMapping("/details/{sid}") + ResultBean details(@PathVariable("sid") String sid + , @RequestParam(value = "application", required = false) String application) { + return adExpatriatesApplyService.details(sid,application); + } + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids) { @@ -73,13 +93,6 @@ public class AdExpatriatesApplyRest { return rb.success(); } - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { - ResultBean rb = ResultBean.fireFail(); - AdExpatriatesApplyVo vo = adExpatriatesApplyService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } @ApiOperation("提交审批流程") @PostMapping("/submit") diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyDetailVo.java new file mode 100644 index 0000000000..4e8bda9e90 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyDetailVo.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.oa.biz.adexpatriatesapply; + +import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesListDetailVo; +import com.yxt.anrui.oa.biz.hrhiredetails.HrHireListDetailVo; +import com.yxt.anrui.oa.biz.oaform.OaFormCommonVo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/1/21 + **/ +@Data +public class AdExpatriatesApplyDetailVo extends OaFormCommonVo { + + @ApiModelProperty("备注") + private String remarks; + + @ApiModelProperty("图片") + private List files = new ArrayList<>(); + @ApiModelProperty("附件") + private List appes = new ArrayList<>(); + + private List list = new ArrayList<>(); +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyDto.java index 936d82f01c..081b16f2a6 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyDto.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyDto.java @@ -67,5 +67,5 @@ public class AdExpatriatesApplyDto extends OaFormDto { @ApiModelProperty("文件") private List appes = new ArrayList<>(); - private List adExpatriatesDetailList = new ArrayList<>(); + private List list = new ArrayList<>(); } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyMapper.java index ad9e7a3dea..87976d8720 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyMapper.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyMapper.java @@ -35,9 +35,7 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface AdExpatriatesApplyMapper extends BaseMapper { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - int selectBySid(String join); - AdExpatriatesApplyVo fetchDetailsVoBySid(String sid); + AdExpatriatesApplyDetailVo details(String sid); } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyMapper.xml index abac44113c..1cc89c8780 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyMapper.xml +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyMapper.xml @@ -3,32 +3,6 @@ - - + select remarks, sid + from ad_expatriates_apply + where sid = #{sid} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyQuery.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyQuery.java deleted file mode 100644 index 0dbf06cd5c..0000000000 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyQuery.java +++ /dev/null @@ -1,54 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.anrui.oa.biz.adexpatriatesapply; - - -import com.yxt.common.core.query.Query; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: oa(驻外人员认定申请)
- * File: AdExpatriatesApplyQuery.java
- * Class: com.yxt.anrui.oa.api.adexpatriatesapply.AdExpatriatesApplyQuery
- * Description: 驻外人员认定申请 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-16 15:22:53
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "驻外人员认定申请 查询条件", description = "驻外人员认定申请 查询条件") -public class AdExpatriatesApplyQuery implements Query { - - @ApiModelProperty("单据编号") - private String billNo; -} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyService.java index 96bab2324c..fe39388619 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyService.java @@ -26,33 +26,28 @@ package com.yxt.anrui.oa.biz.adexpatriatesapply; import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailDto; import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailService; import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailVo; +import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesListDetailVo; import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService; +import com.yxt.anrui.oa.biz.oaform.FormCommon; +import com.yxt.anrui.oa.biz.oaform.OaForm; import com.yxt.anrui.oa.biz.oaform.OaFormRuleEnum; import com.yxt.anrui.oa.biz.oaform.OaFormService; import com.yxt.anrui.oa.biz.oaform.flowable.*; -import com.yxt.anrui.oa.biz.oamendapply.OaMendApplyDto; -import com.yxt.anrui.oa.biz.oamendapply.OaMendApplyVo; import com.yxt.anrui.oa.feign.file.OaFileEnum; import com.yxt.anrui.oa.feign.flowable.flow.ProcDefEnum; +import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationVo; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; @Service public class AdExpatriatesApplyService extends MybatisBaseService { @@ -63,19 +58,51 @@ public class AdExpatriatesApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { - AdExpatriatesApplyQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if (query != null) { - if (StringUtils.isNotBlank(query.getBillNo())) { - qw.like("ofm.billNo", query.getBillNo()); - } + public ResultBean getSaveInit(String userSid, String orgPath) { + ResultBean rb = ResultBean.fireFail(); + AdExpatriatesApplyVo adExpatriatesApplyVo = new AdExpatriatesApplyVo(); + adExpatriatesApplyVo.setCreateBySid(userSid); + adExpatriatesApplyVo.setOrgSidPath(orgPath); + return rb.success().setData(adExpatriatesApplyVo); + } + + public ResultBean getUpdateInit(String sid) { + ResultBean rb = ResultBean.fireFail(); + AdExpatriatesApplyVo adExpatriatesApplyVo = new AdExpatriatesApplyVo(); + AdExpatriatesApply adExpatriatesApply = fetchBySid(sid); + if (adExpatriatesApply == null) { + return rb.setMsg("该申请不存在"); + } +// adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage()); + OaForm oaForm = oaFormService.fetchBySid(sid); + adExpatriatesApplyVo.setTaskId(oaForm.getTaskId()); + adExpatriatesApplyVo.setProcInsId(oaForm.getProcInstId()); + //根据部门sid获取orgPath并赋值 + SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(oaForm.getDeptSid()).getData(); + String orgSidPath = organizationVo.getOrgSidPath(); + adExpatriatesApplyVo.setOrgSidPath(orgSidPath); + adExpatriatesApplyVo.setCreateBySid(oaForm.getCreateBySid()); + BeanUtil.copyProperties(adExpatriatesApply, adExpatriatesApplyVo); + List list = adExpatriatesDetailService.getUpdateInit(sid); + list.removeAll(Collections.singleton(null)); + if (!list.isEmpty()) { + list.stream().forEach(details -> { + FormCommon deptObj = FormCommon.of(details.getDeptKey(), details.getDeptValue()); + details.setDeptObj(deptObj); + FormCommon jobObj = FormCommon.of(details.getJobKey(), details.getJobValue()); + details.setJobObj(jobObj); + }); } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; + List files = oaAppendixService.selectByLinkSid(sid, "图片"); + adExpatriatesApplyVo.setFiles(files); + List appes = oaAppendixService.selectByLinkSid(sid, "文件"); + adExpatriatesApplyVo.setAppes(appes); + adExpatriatesApplyVo.setList(list); + adExpatriatesApplyVo.setSid(sid); + return rb.success().setData(adExpatriatesApplyVo); } public ResultBean saveOrUpdateDto(AdExpatriatesApplyDto dto) { @@ -83,7 +110,7 @@ public class AdExpatriatesApplyService extends MybatisBaseService files = dto.getFiles(); List appes = dto.getAppes(); - List adExpatriatesDetailList = dto.getAdExpatriatesDetailList(); + List list = dto.getList(); if (StringUtils.isBlank(sid)) { // 新建操作 AdExpatriatesApply entity = new AdExpatriatesApply(); @@ -100,24 +127,13 @@ public class AdExpatriatesApplyService extends MybatisBaseService files = oaAppendixService.selectByLinkSid(sid); - vo.setFiles(files); - List adExpatriatesDetailList = adExpatriatesDetailService.fetchByMainSid(sid); - vo.setAdExpatriatesDetailList(adExpatriatesDetailList); - return vo; + public ResultBean delAll(String[] sids) { + ResultBean rb = ResultBean.fireFail(); + //查询该sid中是否有流程不是待提交的 + int count = baseMapper.selectBySid(StringUtils.join(sids, ",")); + if (count > 0) { + return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败"); + } + delBySids(sids); + return rb.success(); + } + + public ResultBean details(String sid, String application) { + ResultBean rb = ResultBean.fireFail(); + AdExpatriatesApplyDetailVo adExpatriatesApplyDetailVo = baseMapper.details(sid); + if (adExpatriatesApplyDetailVo == null) { + return rb.setMsg("该申请不存在"); + } + List files = oaAppendixService.selectByLinkSid(sid, "图片"); + List appes = oaAppendixService.selectByLinkSid(sid, "文件"); + adExpatriatesApplyDetailVo.setFiles(files); + adExpatriatesApplyDetailVo.setAppes(appes); + + List updateInit = adExpatriatesDetailService.getUpdateInit(sid); + List adExpatriatesListDetailVos = new ArrayList<>(); + if (!updateInit.isEmpty()) { + updateInit.stream().forEach(details -> { + AdExpatriatesListDetailVo adExpatriatesListDetailVo = new AdExpatriatesListDetailVo(); + BeanUtil.copyProperties(details,adExpatriatesListDetailVo); + adExpatriatesListDetailVos.add(adExpatriatesListDetailVo); + }); + } + adExpatriatesApplyDetailVo.setList(adExpatriatesListDetailVos); + + //基础字段赋值 + BeanUtil.copyProperties(oaFormService.getDetails(sid), adExpatriatesApplyDetailVo); + return rb.success().setData(adExpatriatesApplyDetailVo); } /** @@ -244,15 +289,4 @@ public class AdExpatriatesApplyService extends MybatisBaseService 0) { - return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败"); - } - delBySids(sids); - return rb.success(); - } } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyVo.java index e0d689d2e2..2a49361183 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyVo.java @@ -25,79 +25,35 @@ *********************************************************/ package com.yxt.anrui.oa.biz.adexpatriatesapply; - -import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailDto; import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailVo; -import com.yxt.common.core.vo.Vo; - -import io.swagger.annotations.ApiModel; +import com.yxt.anrui.oa.biz.hrhiredetails.HrHireDetailsVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.ArrayList; import java.util.List; -/** - * Project: oa(驻外人员认定申请)
- * File: AdExpatriatesApplyVo.java
- * Class: com.yxt.anrui.oa.api.adexpatriatesapply.AdExpatriatesApplyVo
- * Description: 驻外人员认定申请 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-16 15:22:53
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data -@ApiModel(value = "驻外人员认定申请 视图数据对象", description = "驻外人员认定申请 视图数据对象") -public class AdExpatriatesApplyVo implements Vo { +public class AdExpatriatesApplyVo { private String sid; + /* private String userSid; + private String orgPath;*/ + private String orgSidPath; + private String createBySid; @ApiModelProperty("备注") private String remarks; - private String formSid; - @ApiModelProperty("关联审批单") - private String linkFormSids; - @ApiModelProperty("表单类别-流程名称") - private String formType; - @ApiModelProperty("标题") - private String title; - @ApiModelProperty("单据编号") - private String billNo; - @ApiModelProperty("申请人") - private String createByName; - @ApiModelProperty("申请部门sid") - private String deptSid; - @ApiModelProperty("申请部门名称") - private String deptName; - @ApiModelProperty("分公司sid") - private String useOrgSid; - @ApiModelProperty("分公司名称") - private String useOrgName; - @ApiModelProperty("办结日期") - private String finishTime; - @ApiModelProperty("实例id") - private String procInstId; - @ApiModelProperty("流程定义id") - private String procDefId; - @ApiModelProperty("任务id") - private String taskId; - @ApiModelProperty("环节id") - private String nodeId; - @ApiModelProperty("流程状态") - private String nodeState; - @ApiModelProperty("创建组织sid") - private String createOrgSid; - @ApiModelProperty("创建组织") - private String createOrgName; - @ApiModelProperty("图片") private List files = new ArrayList<>(); @ApiModelProperty("附件") private List appes = new ArrayList<>(); - private List adExpatriatesDetailList = new ArrayList<>(); + private List list = new ArrayList<>(); + + private String taskId; + @ApiModelProperty("流程实例id") + private String procInsId; + +// private String testPage; } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailDto.java index c1c2bdd0d1..a5bd48be2e 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailDto.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailDto.java @@ -26,6 +26,7 @@ package com.yxt.anrui.oa.biz.adexpatriatesdetail; +import com.yxt.anrui.oa.biz.oaform.FormCommon; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; @@ -49,27 +50,24 @@ import lombok.Data; @ApiModel(value = "驻外人员认定列表 数据传输对象", description = "驻外人员认定列表 数据传输对象") public class AdExpatriatesDetailDto implements Dto { - private String sid; // sid + private String sid; - @ApiModelProperty("申请sid") - private String mainSid; // 申请sid - @ApiModelProperty("驻外人员sid") - private String expatriatesSid; // 驻外人员sid - @ApiModelProperty("驻外人员姓名") - private String expatriatesName; // 驻外人员姓名 - @ApiModelProperty("驻外人员部门sid") - private String expatriatesDeptSid; // 驻外人员部门sid - @ApiModelProperty("驻外人员部门名称") - private String expatriatesDeptName; // 驻外人员部门名称 - @ApiModelProperty("驻外人员职位sid") - private String expatriatesPostSid; // 驻外人员职位sid - @ApiModelProperty("驻外人员职位名称") - private String expatriatesPostName; // 驻外人员职位名称 + @ApiModelProperty("驻外人员") + private FormCommon expatriatesObj; + private String expatriatesKey; + private String expatriatesValue; + @ApiModelProperty("驻外人员部门") + private FormCommon deptObj; + private String deptKey; + private String deptValue; + @ApiModelProperty("驻外人员职位") + private FormCommon jobObj; + private String jobKey; + private String jobValue; @ApiModelProperty("驻外人员家庭常住地址") - private String expatriatesHomeAddress; // 驻外人员家庭常住地址 + private String expatriatesHomeAddress; @ApiModelProperty("驻外人员工作地址") - private String expatriatesWorkAddress; // 驻外人员工作地址 + private String expatriatesWorkAddress; @ApiModelProperty("驻外人员开始驻外时间") - private String expatriatesDate; // 驻外人员开始驻外时间 - + private String expatriatesDate; } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailMapper.java index 1819ecf583..11281e8948 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailMapper.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailMapper.java @@ -35,9 +35,8 @@ import java.util.List; @Mapper public interface AdExpatriatesDetailMapper extends BaseMapper { - @Delete("delete from ad_expatriates_detail where mainSid = #{mainSid}") - void delByMainSid(String mainSid); - @Select("select * from ad_expatriates_detail where mainSid = #{mainSid}") - List fetchByMainSid(String mainSid); + List selectByMainSid(String mainSid); + + List getUpdateInit(String sid); } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailMapper.xml index 439c1af05f..77928965c7 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailMapper.xml +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailMapper.xml @@ -1,5 +1,18 @@ - + \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailService.java index a9ed250863..c0ba9a0052 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailService.java @@ -26,26 +26,45 @@ package com.yxt.anrui.oa.biz.adexpatriatesdetail; import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.oa.biz.hrhiredetails.HrHireDetails; +import com.yxt.anrui.oa.feign.file.OaFileEnum; import com.yxt.common.base.service.MybatisBaseService; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.List; @Service public class AdExpatriatesDetailService extends MybatisBaseService { - public void insertByDto(AdExpatriatesDetailDto dto) { - AdExpatriatesDetail entity = new AdExpatriatesDetail(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); + public void saveDetails(List list, String sid) { + //根据sid查询明细并删除 + List list2 = baseMapper.selectByMainSid(sid); + list2.removeAll(Collections.singleton(null)); + if (!list2.isEmpty()) { + list2.stream().forEach(v -> { + deleteBySid(v.getSid()); + }); + } + list.removeAll(Collections.singleton(null)); + if (!list.isEmpty()) { + list.stream().forEach(details -> { + AdExpatriatesDetail adExpatriatesDetail = new AdExpatriatesDetail(); + BeanUtil.copyProperties(details, adExpatriatesDetail); + adExpatriatesDetail.setExpatriatesSid(details.getExpatriatesKey()); + adExpatriatesDetail.setExpatriatesName(details.getExpatriatesValue()); + adExpatriatesDetail.setExpatriatesDeptSid(details.getDeptKey()); + adExpatriatesDetail.setExpatriatesDeptName(details.getDeptValue()); + adExpatriatesDetail.setExpatriatesPostSid(details.getJobKey()); + adExpatriatesDetail.setExpatriatesPostName(details.getJobValue()); + adExpatriatesDetail.setMainSid(sid); + baseMapper.insert(adExpatriatesDetail); + }); + } } - public void delByMainSid(String mainSid) { - baseMapper.delByMainSid(mainSid); - } - - public List fetchByMainSid(String mainSid) { - return baseMapper.fetchByMainSid(mainSid); + public List getUpdateInit(String sid) { + return baseMapper.getUpdateInit(sid); } } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailVo.java index 44ca92b631..c5eadc6f4f 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailVo.java @@ -26,6 +26,7 @@ package com.yxt.anrui.oa.biz.adexpatriatesdetail; +import com.yxt.anrui.oa.biz.oaform.FormCommon; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; @@ -49,27 +50,24 @@ import lombok.Data; @ApiModel(value = "驻外人员认定列表 视图数据对象", description = "驻外人员认定列表 视图数据对象") public class AdExpatriatesDetailVo implements Vo { - private String sid; // sid + private String sid; - @ApiModelProperty("申请sid") - private String mainSid; // 申请sid - @ApiModelProperty("驻外人员sid") - private String expatriatesSid; // 驻外人员sid - @ApiModelProperty("驻外人员姓名") - private String expatriatesName; // 驻外人员姓名 - @ApiModelProperty("驻外人员部门sid") - private String expatriatesDeptSid; // 驻外人员部门sid - @ApiModelProperty("驻外人员部门名称") - private String expatriatesDeptName; // 驻外人员部门名称 - @ApiModelProperty("驻外人员职位sid") - private String expatriatesPostSid; // 驻外人员职位sid - @ApiModelProperty("驻外人员职位名称") - private String expatriatesPostName; // 驻外人员职位名称 + @ApiModelProperty("驻外人员") + private FormCommon expatriatesObj; + private String expatriatesKey; + private String expatriatesValue; + @ApiModelProperty("驻外人员部门") + private FormCommon deptObj; + private String deptKey; + private String deptValue; + @ApiModelProperty("驻外人员职位") + private FormCommon jobObj; + private String jobKey; + private String jobValue; @ApiModelProperty("驻外人员家庭常住地址") - private String expatriatesHomeAddress; // 驻外人员家庭常住地址 + private String expatriatesHomeAddress; @ApiModelProperty("驻外人员工作地址") - private String expatriatesWorkAddress; // 驻外人员工作地址 + private String expatriatesWorkAddress; @ApiModelProperty("驻外人员开始驻外时间") - private String expatriatesDate; // 驻外人员开始驻外时间 - + private String expatriatesDate; } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailQuery.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesListDetailVo.java similarity index 62% rename from yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailQuery.java rename to yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesListDetailVo.java index 443c54abac..9180039e2a 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailQuery.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesListDetailVo.java @@ -26,17 +26,16 @@ package com.yxt.anrui.oa.biz.adexpatriatesdetail; -import com.yxt.common.core.query.Query; - +import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * Project: yxt-oa(认定人员)
- * File: AdExpatriatesDetailQuery.java
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailQuery
- * Description: 驻外人员认定列表 查询条件.
+ * File: AdExpatriatesDetailVo.java
+ * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo
+ * Description: 驻外人员认定列表 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
* Makedate: 2025-01-20 15:35:08
@@ -46,28 +45,22 @@ import lombok.Data; * @since 1.0 */ @Data -@ApiModel(value = "驻外人员认定列表 查询条件", description = "驻外人员认定列表 查询条件") -public class AdExpatriatesDetailQuery implements Query { +@ApiModel(value = "驻外人员认定列表 视图数据对象", description = "驻外人员认定列表 视图数据对象") +public class AdExpatriatesListDetailVo implements Vo { + + private String sid; - @ApiModelProperty("申请sid") - private String mainSid; // 申请sid - @ApiModelProperty("驻外人员sid") - private String expatriatesSid; // 驻外人员sid - @ApiModelProperty("驻外人员姓名") - private String expatriatesName; // 驻外人员姓名 - @ApiModelProperty("驻外人员部门sid") - private String expatriatesDeptSid; // 驻外人员部门sid - @ApiModelProperty("驻外人员部门名称") - private String expatriatesDeptName; // 驻外人员部门名称 - @ApiModelProperty("驻外人员职位sid") - private String expatriatesPostSid; // 驻外人员职位sid - @ApiModelProperty("驻外人员职位名称") - private String expatriatesPostName; // 驻外人员职位名称 + @ApiModelProperty("驻外人员") + private String expatriatesValue; + @ApiModelProperty("驻外人员部门") + private String expatriatesDeptValue; + @ApiModelProperty("驻外人员职位") + private String expatriatesPostValue; @ApiModelProperty("驻外人员家庭常住地址") - private String expatriatesHomeAddress; // 驻外人员家庭常住地址 + private String expatriatesHomeAddress; @ApiModelProperty("驻外人员工作地址") - private String expatriatesWorkAddress; // 驻外人员工作地址 + private String expatriatesWorkAddress; @ApiModelProperty("驻外人员开始驻外时间") - private String expatriatesDate; // 驻外人员开始驻外时间 + private String expatriatesDate; }