|
|
@@ -283,22 +283,62 @@ public class UserController {
|
|
|
if (ObjectUtil.isNotEmpty(userDTO)) {
|
|
|
// 当certType传值时，获取拥有此资格证类型的人员
|
|
|
if (StringUtils.isNotBlank(userDTO.getCertType())) {
|
|
|
- queryWrapper.eq("sc.type",userDTO.getCertType());
|
|
|
+
|
|
|
+ //获取当前登录人信息
|
|
|
+ UserDTO loginUserDTO = UserUtils.getCurrentUserDTO();
|
|
|
+ //如果当前登录人是中审的管理咨询部人员，则注会列表中添加该部门选择项
|
|
|
+ if(null != loginUserDTO && null != loginUserDTO.getOfficeDTO()){
|
|
|
+ OfficeDTO officeDTO = loginUserDTO.getOfficeDTO();
|
|
|
+ if(StringUtils.isNotBlank(officeDTO.getId())){
|
|
|
+ if("1602840084816138241".equals(officeDTO.getId())){
|
|
|
+ queryWrapper.and(
|
|
|
+ wrapper -> wrapper.eq("sc.type",userDTO.getCertType()).or().eq("a.office_id","1602840084816138241")
|
|
|
+ );
|
|
|
+ //queryWrapper.eq("sc.type",userDTO.getCertType()).or().eq("a.office_id","1602840084816138241");
|
|
|
+ }else{
|
|
|
+ queryWrapper.eq("sc.type",userDTO.getCertType());
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ queryWrapper.eq("sc.type",userDTO.getCertType());
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ queryWrapper.eq("sc.type",userDTO.getCertType());
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
if ( userDTO.getTenantDTO ( ) != null && StrUtil.isNotBlank ( userDTO.getTenantDTO ( ).getId ( ) ) ) {
|
|
|
queryWrapper.eq ( "a.tenant_id", userDTO.getTenantDTO ( ).getId ( ) );
|
|
|
}
|
|
|
}
|
|
|
IPage <UserDTO> result = userService.findPage ( page, queryWrapper );
|
|
|
+ IPage<UserDTO> result2 = userService.findPage3(userDTO);
|
|
|
//判断 如果是签字注师筛选，则获取签字注师的被选择次数
|
|
|
if(StringUtils.isNotBlank(userDTO.getCertType()) && "6".equals(userDTO.getCertType())){
|
|
|
List<UserDTO> userList = result.getRecords();
|
|
|
+ List<UserDTO> user2List = result2.getRecords();
|
|
|
+ List<String> idList = Lists.newArrayList();
|
|
|
+ for (UserDTO dto : user2List) {
|
|
|
+ idList.add(dto.getId());
|
|
|
+ }
|
|
|
for (UserDTO info : userList) {
|
|
|
- if("潘中".equals(info.getName())){
|
|
|
+ if(idList.size()>0){
|
|
|
+ if(idList.contains(info.getId())){
|
|
|
+ info.setAccountantUserFlag(0);
|
|
|
+ }else{
|
|
|
+ info.setAccountantUserFlag(1);
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ if("潘中".equals(info.getName())){
|
|
|
+ info.setAccountantUserFlag(0);
|
|
|
+ }else{
|
|
|
+ info.setAccountantUserFlag(1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ /*if("潘中".equals(info.getName())){
|
|
|
info.setAccountantUserFlag(0);
|
|
|
}else{
|
|
|
info.setAccountantUserFlag(1);
|
|
|
- }
|
|
|
+ }*/
|
|
|
Integer accountantUserCount = userService.getAccountantUserCount(info.getId());
|
|
|
info.setAccountantUserCount(accountantUserCount);
|
|
|
}
|
|
|
@@ -313,11 +353,22 @@ public class UserController {
|
|
|
@GetMapping("getCount")
|
|
|
public ResponseEntity getCount(String id){
|
|
|
UserDTO userDTO = userService.get(id);
|
|
|
- if (userDTO.getName().equals("潘中")){
|
|
|
+ List<UserDTO> signatureAnnotator2List = userService.getSignatureAnnotator2List(new UserDTO());
|
|
|
+ for (UserDTO dto : signatureAnnotator2List) {
|
|
|
+
|
|
|
+ if (userDTO.getId().equals(dto.getId())){
|
|
|
+ userDTO.setAccountantUserFlag(0);
|
|
|
+ break;
|
|
|
+ }else{
|
|
|
+ userDTO.setAccountantUserFlag(1);
|
|
|
+ // break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ /*if (userDTO.getName().equals("潘中")){
|
|
|
userDTO.setAccountantUserFlag(0);
|
|
|
}else{
|
|
|
userDTO.setAccountantUserFlag(1);
|
|
|
- }
|
|
|
+ }*/
|
|
|
userDTO.setAccountantUserCount(userService.getAccountantUserCount(id));
|
|
|
return ResponseEntity.ok(userDTO);
|
|
|
}
|
|
|
@@ -412,11 +463,11 @@ public class UserController {
|
|
|
if (StringUtils.isNotBlank(userDTO.getCertType()) && "6".equals(userDTO.getCertType())) {
|
|
|
List<UserDTO> userList = result.getRecords();
|
|
|
for (UserDTO info : userList) {
|
|
|
- if ("潘中".equals(info.getName())) {
|
|
|
+ //if ("潘中".equals(info.getName())) {
|
|
|
info.setAccountantUserFlag(0);
|
|
|
- } else {
|
|
|
+ /*} else {
|
|
|
info.setAccountantUserFlag(1);
|
|
|
- }
|
|
|
+ }*/
|
|
|
Integer accountantUserCount = userService.getAccountantUserCount(info.getId());
|
|
|
info.setAccountantUserCount(accountantUserCount);
|
|
|
}
|
|
|
@@ -975,6 +1026,68 @@ public class UserController {
|
|
|
List rootTree = officeService.getFinanceTree (objects, extId, type, showAll, "1");
|
|
|
return ResponseEntity.ok (rootTree);
|
|
|
|
|
|
+ }else if (id.equals("10006")){
|
|
|
+ String officeName="兴光会计师事务所";
|
|
|
+ List<OfficeDTO> list = officeService.getOfficeAllByOfficeName (officeName);
|
|
|
+ if(list.size()>0){
|
|
|
+ List<String> officeIds = Lists.newArrayList();
|
|
|
+ for (OfficeDTO info : list) {
|
|
|
+ info.setTypeFlag(true);
|
|
|
+ officeIds.add(info.getId());
|
|
|
+ }
|
|
|
+ //根据部门查询对应部门下的所有数据
|
|
|
+ List<OfficeDTO> officeDTOList = userService.getUserByOffice(officeIds,type);
|
|
|
+ list.addAll(officeDTOList);
|
|
|
+ }
|
|
|
+ String officeName1="苏州分公司";
|
|
|
+ List<OfficeDTO> list1 = officeService.getOfficeAllByOfficeName (officeName1);
|
|
|
+ if(list1.size()>0){
|
|
|
+ List<String> officeIds = Lists.newArrayList();
|
|
|
+ for (OfficeDTO info : list1) {
|
|
|
+ info.setTypeFlag(true);
|
|
|
+ officeIds.add(info.getId());
|
|
|
+ }
|
|
|
+ //根据部门查询对应部门下的所有数据
|
|
|
+ List<OfficeDTO> officeDTOList = userService.getUserByOffice(officeIds,type);
|
|
|
+ list1.addAll(officeDTOList);
|
|
|
+ }
|
|
|
+ List<OfficeDTO> objects = new ArrayList<>();
|
|
|
+ objects.addAll(list);
|
|
|
+ objects.addAll(list1);
|
|
|
+ List rootTree = officeService.getFinanceTree (objects, extId, type, showAll, "1");
|
|
|
+ return ResponseEntity.ok (rootTree);
|
|
|
+
|
|
|
+ }else if (id.equals("10004")){
|
|
|
+ String officeName="兴光会计师事务所";
|
|
|
+ List<OfficeDTO> list = officeService.getOfficeAllByOfficeName (officeName);
|
|
|
+ if(list.size()>0){
|
|
|
+ List<String> officeIds = Lists.newArrayList();
|
|
|
+ for (OfficeDTO info : list) {
|
|
|
+ info.setTypeFlag(true);
|
|
|
+ officeIds.add(info.getId());
|
|
|
+ }
|
|
|
+ //根据部门查询对应部门下的所有数据
|
|
|
+ List<OfficeDTO> officeDTOList = userService.getUserByOffice(officeIds,type);
|
|
|
+ list.addAll(officeDTOList);
|
|
|
+ }
|
|
|
+ String officeName1="中审江苏分所";
|
|
|
+ List<OfficeDTO> list1 = officeService.getOfficeAllByOfficeName (officeName1);
|
|
|
+ if(list1.size()>0){
|
|
|
+ List<String> officeIds = Lists.newArrayList();
|
|
|
+ for (OfficeDTO info : list1) {
|
|
|
+ info.setTypeFlag(true);
|
|
|
+ officeIds.add(info.getId());
|
|
|
+ }
|
|
|
+ //根据部门查询对应部门下的所有数据
|
|
|
+ List<OfficeDTO> officeDTOList = userService.getUserByOffice(officeIds,type);
|
|
|
+ list1.addAll(officeDTOList);
|
|
|
+ }
|
|
|
+ List<OfficeDTO> objects = new ArrayList<>();
|
|
|
+ objects.addAll(list);
|
|
|
+ objects.addAll(list1);
|
|
|
+ List rootTree = officeService.getFinanceTree (objects, extId, type, showAll, "1");
|
|
|
+ return ResponseEntity.ok (rootTree);
|
|
|
+
|
|
|
}else {
|
|
|
String officeName="兴光会计师事务所";
|
|
|
List<OfficeDTO> list = officeService.getOfficeAllByOfficeName (officeName);
|
user5