lixing 4 years ago
parent
commit
fc5a6e1681

+ 2 - 0
fm-person/src/main/java/com/persagy/fm/department/controller/DepartmentController.java

@@ -18,6 +18,7 @@ import com.persagy.fm.department.utils.DepDataUtil;
 import com.persagy.fm.depproject.model.DepProject;
 import com.persagy.fm.depproject.model.DepProject;
 import com.persagy.fm.depproject.model.dto.QueryDepProjectDTO;
 import com.persagy.fm.depproject.model.dto.QueryDepProjectDTO;
 import com.persagy.fm.depproject.service.IDepProjectService;
 import com.persagy.fm.depproject.service.IDepProjectService;
+import com.persagy.fm.mybatis.annotations.FormatMybatisQueryParams;
 import com.persagy.fm.saas.project.model.vo.ProjectTreeItemVO;
 import com.persagy.fm.saas.project.model.vo.ProjectTreeItemVO;
 import com.persagy.fm.translate.model.Trans;
 import com.persagy.fm.translate.model.Trans;
 import com.persagy.fm.workresume.service.IWorkResumeService;
 import com.persagy.fm.workresume.service.IWorkResumeService;
@@ -107,6 +108,7 @@ public class DepartmentController {
 
 
     @ApiOperation(value = "部门列表")
     @ApiOperation(value = "部门列表")
     @PostMapping("/query")
     @PostMapping("/query")
+    @FormatMybatisQueryParams
     public CommonResult<PageList<ResponseDepartmentListItemVO>> queryDepartment(
     public CommonResult<PageList<ResponseDepartmentListItemVO>> queryDepartment(
             @Valid @RequestBody QueryDepartmentDTO queryDepartmentDTO) {
             @Valid @RequestBody QueryDepartmentDTO queryDepartmentDTO) {
         List<Department> departmentList = departmentService.queryDepartmentList(queryDepartmentDTO);
         List<Department> departmentList = departmentService.queryDepartmentList(queryDepartmentDTO);

+ 5 - 0
fm-person/src/main/java/com/persagy/fm/person/controller/PersonController.java

@@ -6,6 +6,7 @@ import com.persagy.fm.common.response.CommonResult;
 import com.persagy.fm.common.response.FmResponseUpsertVO;
 import com.persagy.fm.common.response.FmResponseUpsertVO;
 import com.persagy.fm.common.response.PageList;
 import com.persagy.fm.common.response.PageList;
 import com.persagy.fm.common.utils.ResultHelper;
 import com.persagy.fm.common.utils.ResultHelper;
+import com.persagy.fm.mybatis.annotations.FormatMybatisQueryParams;
 import com.persagy.fm.person.model.ConvertPersonTool;
 import com.persagy.fm.person.model.ConvertPersonTool;
 import com.persagy.fm.person.model.Person;
 import com.persagy.fm.person.model.Person;
 import com.persagy.fm.person.model.dto.*;
 import com.persagy.fm.person.model.dto.*;
@@ -91,6 +92,7 @@ public class PersonController {
 
 
     @ApiOperation(value = "查找人名")
     @ApiOperation(value = "查找人名")
     @PostMapping("/name_quick_search")
     @PostMapping("/name_quick_search")
+    @FormatMybatisQueryParams
     public CommonResult<PageList<SimplePersonListItemVO>> nameQuickSearch(
     public CommonResult<PageList<SimplePersonListItemVO>> nameQuickSearch(
             @Valid @RequestBody NameQuickSearchDTO nameQuickSearchDTO) {
             @Valid @RequestBody NameQuickSearchDTO nameQuickSearchDTO) {
         List<Person> personList = personService.nameQuickSearch(nameQuickSearchDTO);
         List<Person> personList = personService.nameQuickSearch(nameQuickSearchDTO);
@@ -101,6 +103,7 @@ public class PersonController {
 
 
     @ApiOperation(value = "人员列表, 分页查询")
     @ApiOperation(value = "人员列表, 分页查询")
     @PostMapping("/query")
     @PostMapping("/query")
+    @FormatMybatisQueryParams
     public CommonResult<PageList<ResponsePersonListItemVO>> pageQueryPerson(
     public CommonResult<PageList<ResponsePersonListItemVO>> pageQueryPerson(
             @Valid @RequestBody PageQueryPersonDTO pageQueryPersonDTO) {
             @Valid @RequestBody PageQueryPersonDTO pageQueryPersonDTO) {
         IPage<ResponsePersonListItemVO> pagedList = personService.pageQueryPerson(pageQueryPersonDTO);
         IPage<ResponsePersonListItemVO> pagedList = personService.pageQueryPerson(pageQueryPersonDTO);
@@ -109,6 +112,7 @@ public class PersonController {
 
 
     @ApiOperation(value = "根据姓名或用户名分页查询")
     @ApiOperation(value = "根据姓名或用户名分页查询")
     @PostMapping("/queryByNameOrUsername")
     @PostMapping("/queryByNameOrUsername")
+    @FormatMybatisQueryParams
     public CommonResult<PageList<ResponsePersonListItemVO>> pageQueryByNameOrUserName(
     public CommonResult<PageList<ResponsePersonListItemVO>> pageQueryByNameOrUserName(
             @Valid @RequestBody PageQueryPersonByNameOrUserNameDTO pageQueryPersonByNameOrUserNameDTO) {
             @Valid @RequestBody PageQueryPersonByNameOrUserNameDTO pageQueryPersonByNameOrUserNameDTO) {
         IPage<ResponsePersonListItemVO> pagedList = personService.pageQueryByNameOrUserName(pageQueryPersonByNameOrUserNameDTO);
         IPage<ResponsePersonListItemVO> pagedList = personService.pageQueryByNameOrUserName(pageQueryPersonByNameOrUserNameDTO);
@@ -117,6 +121,7 @@ public class PersonController {
 
 
     @ApiOperation(value = "根据用户名分页查询")
     @ApiOperation(value = "根据用户名分页查询")
     @PostMapping("/queryByUsername")
     @PostMapping("/queryByUsername")
+    @FormatMybatisQueryParams
     public CommonResult<PageList<ResponsePersonListItemVO>> queryByUserName(
     public CommonResult<PageList<ResponsePersonListItemVO>> queryByUserName(
             @Valid @RequestBody QueryByUserNameDTO queryByUserNameDTO) {
             @Valid @RequestBody QueryByUserNameDTO queryByUserNameDTO) {
         IPage<ResponsePersonListItemVO> pagedList = personService.queryByUserName(queryByUserNameDTO);
         IPage<ResponsePersonListItemVO> pagedList = personService.queryByUserName(queryByUserNameDTO);

+ 4 - 1
fm-person/src/main/java/com/persagy/fm/person/service/impl/PersonServiceImpl.java

@@ -1076,7 +1076,10 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
         SaasAccountListItemVO saasAccountListItemVO = saasAccountService.querySaasAccountDetail(accountId);
         SaasAccountListItemVO saasAccountListItemVO = saasAccountService.querySaasAccountDetail(accountId);
         responsePersonItemVO.setMail(saasAccountListItemVO.getMail());
         responsePersonItemVO.setMail(saasAccountListItemVO.getMail());
         responsePersonItemVO.setPhoneNum(saasAccountListItemVO.getPhoneNum());
         responsePersonItemVO.setPhoneNum(saasAccountListItemVO.getPhoneNum());
-        responsePersonItemVO.setExpireDate(saasAccountListItemVO.getValidEndTime());
+        if (ExpireTypeEnum.EXPIRY_DATE.getType().equals(saasAccountListItemVO.getValidLast())) {
+            responsePersonItemVO.setExpireDate(saasAccountListItemVO.getValidEndTime());
+        }
+
 
 
         // 设置人员岗位角色信息
         // 设置人员岗位角色信息
         Map<String, AccountRoleVO> accountRoleVoMap = saasAccountRoleService.
         Map<String, AccountRoleVO> accountRoleVoMap = saasAccountRoleService.