财务模块代码提交

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/service/dto/UserDTO.java

@@ -42,6 +42,16 @@ public class UserDTO extends BaseDTO {
     private static final long serialVersionUID = 1L;
 
     /**
+     * 执业资格证类型
+     */
+    private String certType;
+
+    /**
+     * 前端组件传‘true’则查询全部
+     */
+    private String selectAll;
+
+    /**
      * 角色信息
      */
     private List<RoleDTO> roleList;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/mapper/ContractFileMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.finance.contractRegistration.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.finance.contractRegistration.domain.ContractFile;
 import com.jeeplus.sys.domain.WorkAttachmentInfo;
@@ -37,6 +38,6 @@ public interface ContractFileMapper extends BaseMapper<ContractFile> {
      * @param id
      */
     ContractFile getInfoByConId(String id);
-
+    @InterceptorIgnore(tenantLine = "true")
     ContractFile getById(String id);
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/mapper/ContractFilePaperMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.finance.contractRegistration.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.finance.contractRegistration.domain.ContractFilePaper;
 import com.jeeplus.sys.domain.WorkAttachmentInfo;
@@ -18,13 +19,13 @@ public interface ContractFilePaperMapper extends BaseMapper<ContractFilePaper> {
      * @return
      */
     ContractFilePaper selectFilePaperByContractInfoId(String id);
-
+    @InterceptorIgnore(tenantLine = "true")
     ContractFilePaper getById(String id);
 
     void updateStatusById(@Param("id") String id, @Param("filedType")String filedType);
-
+    @InterceptorIgnore(tenantLine = "true")
     List<WorkAttachmentInfo> findList(@Param("id") String id);
-
+    @InterceptorIgnore(tenantLine = "true")
     Integer findIsExit(@Param("id") String id, @Param("contractInfoId") String contractInfoId, @Param("name")String name);
 
     /**

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/mapper/ContractInfoMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.finance.contractRegistration.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -22,11 +23,11 @@ public interface ContractInfoMapper extends BaseMapper<ContractInfo> {
     ContractInfo getInfoById(String id);
 
     ContractFile getById(String id);
-
+    @InterceptorIgnore(tenantLine = "true")
     List<WorkAttachmentInfo> findDtos(@Param("id") String id);
-
+    @InterceptorIgnore(tenantLine = "true")
     IPage<ContractInfo> findPageList(Page<ContractInfo> page, @Param("officeIds") String officeIds, @Param(Constants.WRAPPER) QueryWrapper queryWrapper);
-
+    @InterceptorIgnore(tenantLine = "true")
     ContractInfo findById (@Param("id") String id);
 
     ContractInfo findFileInfoById (@Param("id") String id);
@@ -38,9 +39,9 @@ public interface ContractInfoMapper extends BaseMapper<ContractInfo> {
     void updatefiledTypeById(@Param("id") String id, @Param("status")String status);
 
     void updatefiledPaperTypeById(@Param("id") String id, @Param("status")String status);
-
+    @InterceptorIgnore(tenantLine = "true")
     List<WorkAttachmentInfo> findList(@Param("id") String id);
-
+    @InterceptorIgnore(tenantLine = "true")
     Integer findIsExit(@Param("id") String id, @Param("name")String name);
 
     /**

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/service/ContractInfoService.java

@@ -132,8 +132,8 @@ public class ContractInfoService {
             wrapper.between("a.signing_date", contractDates[0], contractDates[1]);
         }
         //5、创建人
-        if (StringUtils.isNotBlank(info.getCreateBy())) {
-            wrapper.like("c.`id`", info.getCreateBy());
+        if (StringUtils.isNotBlank(info.getCreateById())) {
+            wrapper.like("c.`id`", info.getCreateById());
         }
         //6、所属部门
         if (StringUtils.isNotBlank(info.getDepartment())) {
@@ -618,9 +618,10 @@ public class ContractInfoService {
             }
         }
         List<WorkAttachmentInfo> list = contractInfo.getContractProperList();
-        if (CollectionUtils.isNotEmpty(list)) {
-            saveFiles(list, userDTO, id);
-        }
+//        if (CollectionUtils.isNotEmpty(list)) {
+//            saveFiles(list, userDTO, id);
+//        }
+        saveFiles(list, userDTO, id);
 
         return id;
     }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/controller/CwManageLevelTypeController.java

@@ -46,9 +46,10 @@ public class CwManageLevelTypeController {
         if(ObjectUtil.isNotEmpty(cwManageLevelTypeDTO)){
             if(StringUtils.isNotBlank(cwManageLevelTypeDTO.getName())){
                 //根据type模糊查询
-                List<CwManageLevelType> cwManageLevelTypeList = cwManageLevelTypeService.list(new QueryWrapper<CwManageLevelType>().lambda()
-                        .like(StringUtils.isNotBlank(cwManageLevelTypeDTO.getName()), CwManageLevelType::getName, cwManageLevelTypeDTO.getName())
-                );
+                List<CwManageLevelType> cwManageLevelTypeList = cwManageLevelTypeService.selectByName(cwManageLevelTypeDTO);
+//                List<CwManageLevelType> cwManageLevelTypeList = cwManageLevelTypeService.list(new QueryWrapper<CwManageLevelType>().lambda()
+//                        .like(StringUtils.isNotBlank(cwManageLevelTypeDTO.getName()), CwManageLevelType::getName, cwManageLevelTypeDTO.getName())
+//                );
                 List<String> idList = new ArrayList<>();
                 cwManageLevelTypeList.stream().forEach(item->{
                     if (StringUtils.isNotBlank(item.getParentIds())){
@@ -57,7 +58,8 @@ public class CwManageLevelTypeController {
                             idList.add(s);
                         }
                     }
-                    List<CwManageLevelType> list = cwManageLevelTypeService.list(new QueryWrapper<CwManageLevelType>().lambda().like(CwManageLevelType::getParentIds, "," + item.getId() + ","));
+                    List<CwManageLevelType> list = cwManageLevelTypeService.selectByParentIds(new QueryWrapper<CwManageLevelType>().lambda().like(CwManageLevelType::getParentIds, "," + item.getId() + ","));
+//                    List<CwManageLevelType> list = cwManageLevelTypeService.list(new QueryWrapper<CwManageLevelType>().lambda().like(CwManageLevelType::getParentIds, "," + item.getId() + ","));
                     idList.addAll(list.stream().map(CwManageLevelType::getId).collect(Collectors.toList()));
                     idList.add(item.getId());
                 });

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/mapper/CwManageLevelTypeMapper.java

@@ -1,5 +1,7 @@
 package com.jeeplus.finance.workClientInfo.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
@@ -17,13 +19,17 @@ import java.util.List;
  */
 @Mapper
 public interface CwManageLevelTypeMapper extends BaseMapper<CwManageLevelType> {
-
+    @InterceptorIgnore(tenantLine = "true")
     public IPage<CwManageLevelTypeDTO> findList(Page<CwManageLevelTypeDTO> page, @Param(Constants.WRAPPER) QueryWrapper<CwManageLevelType> queryWrapper);
 
     public CwManageLevelTypeDTO queryById(@Param("id") String id);
 
     public List<CwManageLevelTypeDTO> getList();
 
+    @InterceptorIgnore(tenantLine = "true")
+    List<CwManageLevelType> selectByName(@Param(Constants.WRAPPER) QueryWrapper<CwManageLevelType> queryWrapper);
+    @InterceptorIgnore(tenantLine = "true")
+    List<CwManageLevelType> selectByParentIds(@Param(Constants.WRAPPER) LambdaQueryWrapper<CwManageLevelType> queryWrapper);
 }
 
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/mapper/CwOrganizationTypeMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.finance.workClientInfo.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
@@ -17,7 +18,7 @@ import java.util.List;
  */
 @Mapper
 public interface CwOrganizationTypeMapper extends BaseMapper<CwOrganizationType> {
-
+    @InterceptorIgnore(tenantLine = "true")
     public IPage<CwOrganizationTypeDTO> findList(Page<CwOrganizationTypeDTO> page, @Param(Constants.WRAPPER) QueryWrapper<CwOrganizationType> queryWrapper);
 
     public CwOrganizationTypeDTO queryById(@Param("id") String id);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/mapper/CwWorkClientBaseMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.finance.workClientInfo.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
@@ -20,9 +21,9 @@ import java.util.List;
  */
 @Mapper
 public interface CwWorkClientBaseMapper extends BaseMapper<CwWorkClientBase> {
-
+    @InterceptorIgnore(tenantLine = "true")
     public IPage<CwWorkClientBaseDTO> findList(Page<CwWorkClientBaseDTO> page, @Param(Constants.WRAPPER) QueryWrapper<CwWorkClientBase> queryWrapper);
-
+    @InterceptorIgnore(tenantLine = "true")
     public CwWorkClientBaseDTO queryById(@Param("id") String id);
 
     public List<CwWorkClientTempDTO>  queryUpdateLogList (@Param(Constants.WRAPPER) QueryWrapper<CwWorkClientTemp> queryWrapper);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/mapper/xml/CwManageLevelTypeMapper.xml

@@ -76,4 +76,14 @@
         from cw_manage_level_type cw_mlt
         where cw_mlt.del_flag = '0' and cw_mlt.parent_id = ${id}
     </select>
+    <select id="selectByName" resultType="com.jeeplus.finance.workClientInfo.domain.CwManageLevelType">
+        SELECT id, remarks, name, parent_id, level, sort, parent_ids, create_time, create_by_id, update_time, update_by_id, del_flag, tenant_id
+         FROM cw_manage_level_type
+         ${ew.customSqlSegment}
+    </select>
+    <select id="selectByParentIds" resultType="com.jeeplus.finance.workClientInfo.domain.CwManageLevelType">
+        SELECT id, remarks, name, parent_id, level, sort, parent_ids, create_time, create_by_id, update_time, update_by_id, del_flag, tenant_id
+         FROM cw_manage_level_type
+         ${ew.customSqlSegment}
+    </select>
 </mapper>

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/service/CwManageLevelTypeService.java

@@ -2,6 +2,7 @@ package com.jeeplus.finance.workClientInfo.service;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -76,4 +77,14 @@ public class CwManageLevelTypeService extends ServiceImpl<CwManageLevelTypeMappe
         return ResponseEntity.ok ("删除成功");
     }
 
+    public List<CwManageLevelType> selectByName(CwManageLevelTypeDTO cwManageLevelTypeDTO) {
+        QueryWrapper<CwManageLevelType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda()
+                .like(StringUtils.isNotBlank(cwManageLevelTypeDTO.getName()), CwManageLevelType::getName, cwManageLevelTypeDTO.getName());
+        return cwManageLevelTypeMapper.selectByName(queryWrapper);
+    }
+
+    public List<CwManageLevelType> selectByParentIds(LambdaQueryWrapper<CwManageLevelType> queryWrapper) {
+        return cwManageLevelTypeMapper.selectByParentIds(queryWrapper);
+    }
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/service/CwOrganizationTypeService.java

@@ -2,6 +2,7 @@ package com.jeeplus.finance.workClientInfo.service;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/controller/UserController.java

@@ -4,7 +4,9 @@
 package com.jeeplus.sys.controller;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -18,6 +20,7 @@ import com.jeeplus.common.excel.annotation.ExportMode;
 import com.jeeplus.common.utils.ResponseUtil;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.logging.annotation.ApiLog;
+import com.jeeplus.sys.domain.Office;
 import com.jeeplus.sys.domain.User;
 import com.jeeplus.sys.service.OfficeService;
 import com.jeeplus.sys.service.UserService;
@@ -29,6 +32,7 @@ import com.jeeplus.sys.utils.MenuUtils;
 import com.jeeplus.sys.utils.TenantUtils;
 import com.jeeplus.sys.utils.UserUtils;
 import com.jeeplus.sys.utils.excel.UserEasyExcel;
+import com.jeeplus.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +45,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 用户Controller
@@ -121,9 +126,74 @@ public class UserController {
     //@PreAuthorize("hasAuthority('sys:user:list')")
     @GetMapping("list")
     public ResponseEntity list(UserDTO userDTO, Page <UserDTO> page) throws Exception {
+//        QueryWrapper <UserDTO> queryWrapper = QueryWrapperGenerator.buildQueryCondition ( userDTO, UserDTO.class );
+//        if ( userDTO.getTenantDTO ( ) != null && StrUtil.isNotBlank ( userDTO.getTenantDTO ( ).getId ( ) ) ) {
+//            queryWrapper.eq ( "a.tenant_id", userDTO.getTenantDTO ( ).getId ( ) );
+//        }
+//        IPage <UserDTO> result = userService.findPage ( page, queryWrapper );
+//        return ResponseEntity.ok ( result );
+
         QueryWrapper <UserDTO> queryWrapper = QueryWrapperGenerator.buildQueryCondition ( userDTO, UserDTO.class );
-        if ( userDTO.getTenantDTO ( ) != null && StrUtil.isNotBlank ( userDTO.getTenantDTO ( ).getId ( ) ) ) {
-            queryWrapper.eq ( "a.tenant_id", userDTO.getTenantDTO ( ).getId ( ) );
+        // 管理员查询不限制
+        if (!UserUtils.getCurrentUserDTO().isAdmin()) {
+            queryWrapper.isNull("a.is_admin");
+            if (ObjectUtil.isNotEmpty(userDTO)){
+                if (ObjectUtil.isNotEmpty(userDTO.getCompanyDTO()) && ObjectUtil.isNotEmpty(userDTO.getOfficeDTO())) {
+                    OfficeDTO officeDTO = UserUtils.getCurrentUserDTO().getOfficeDTO();
+                    if (StringUtils.isNotBlank(userDTO.getCertType())) {
+                        //获取当前登陆人是否事中审公司人员
+                        if(officeDTO.getParentIds().contains("1615171302381182978")){
+
+                        }
+                    }else{
+                        // 当不是精确的部门查询时，再添加下面的筛选条件
+                        if ((StringUtils.isNotBlank(userDTO.getCompanyDTO().getId()) && StringUtils.isBlank(userDTO.getOfficeDTO().getId()))
+                                || "true".equals(userDTO.getSelectAll())) {
+                            // officeDTO.id是空，companyDTO.id不是空的话，说明前端组件点击的集团来进行查询
+                            // selectAll为‘true’的话，说明前端没有选择集团或者部门查询，这个时候要展示全部人员
+                            // 根据当前用户的部门id找到此部门的ids
+                            String ids = officeService.getById(UserUtils.getCurrentUserDTO().getOfficeDTO().getId()).getParentIds();
+                            // 根据ids分隔后的index[2],找到当前用户的所属公司id
+                            String companyId = null;
+                            String[] split = ids.split(",");
+                            // split.length大于2，说明当前登录人所属部门是普通部门，展示部分人员信息
+                            // 否则，当前登录人所属公共类部门（忘了叫什么类部门了，就是总经办那种部门），展示全部人员信息
+                            if(split.length>2){
+                                companyId = split[2];
+                                // 根据公司id,找到此公司下的所有部门
+                                List<Office> officeList = officeService.list(new QueryWrapper<Office>().lambda().eq(Office::getParentId, companyId));
+                                Set officeIdSet = new HashSet();
+                                for (Office office : officeList) {
+                                    if(StringUtils.isNotBlank(office.getId())){
+                                        officeIdSet.add(office.getId());
+                                    }
+                                }
+                                List<String> officeIdList = Lists.newArrayList(officeIdSet);
+                                // 拿到这些部门的id
+                                //List<String> officeIdList = officeList.stream().distinct().map(Office::getId).collect(Collectors.toList());
+                                // 拿到所有公有部门的id
+                                List<String> officePublicIdList = officeService.list(new LambdaQueryWrapper<Office>().eq(Office::getIsPublic,"1")).stream().map(Office::getId).collect(Collectors.toList());
+                                // 拿到直属公司的id
+                                officeIdList.add(companyId);
+                                // 最后得到的所有部门的id
+                                officeIdList.addAll(officePublicIdList);
+                                List<String> lastIds = officeIdList.stream().distinct().collect(Collectors.toList());
+                                // 添加筛选条件为这些部门的id
+                                queryWrapper.in("a.office_id",lastIds);
+                            }
+                        } else if(StringUtils.isBlank(userDTO.getCompanyDTO().getId()) && StringUtils.isNotBlank(userDTO.getOfficeDTO().getId())) {
+                            // officeDTO.id不是空，companyDTO.id是空的话，说明前端组件点击的部门查询
+                            queryWrapper.eq("a.office_id",userDTO.getOfficeDTO().getId());
+                        }
+                    }
+                }
+            }
+        }
+        if (ObjectUtil.isNotEmpty(userDTO)) {
+            // 当certType传值时，获取拥有此资格证类型的人员
+            if (StringUtils.isNotBlank(userDTO.getCertType())) {
+                queryWrapper.eq("sc.type",userDTO.getCertType());
+            }
         }
         IPage <UserDTO> result = userService.findPage ( page, queryWrapper );
         return ResponseEntity.ok ( result );

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/mapper/UserMapper.java

@@ -81,6 +81,7 @@ public interface UserMapper extends BaseMapper <User> {
      * @param queryWrapper
      * @return
      */
+    @InterceptorIgnore(tenantLine = "true")
     IPage <UserDTO> findList(Page <UserDTO> page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper);
 
     IPage <UserDTO> findList2(Page <UserDTO> page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper);

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/mapper/xml/UserMapper.xml

@@ -152,6 +152,7 @@
         SELECT
         <include refid="userColumns"/>
         FROM sys_user a
+        left join sys_cert sc on a.id = sc.user_id and sc.del_flag = '0'
         <include refid="userJoins"/>
         ${ew.customSqlSegment}
     </select>