项目组成员权限

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/common/FindUtils.java

@@ -0,0 +1,35 @@
+package com.jeeplus.test.cw.common;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.jeeplus.sys.service.dto.RoleDTO;
+import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.sys.utils.UserUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class FindUtils {
+
+    /**
+     * 判断当前用户是否拥有 “ 财务部门主任 ” 的角色
+     * @return
+     */
+    public static boolean haveRoleCwBmzr() {
+        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        List<RoleDTO> roles = new ArrayList<>(); // 当前用户拥有的角色
+        if (CollectionUtil.isNotEmpty(userDTO.getRoleDTOList())) {
+            roles = userDTO.getRoleDTOList().stream().filter(item -> {
+                // 过滤当前用户是否拥有财务部门主任角色
+                if ("1589893310822690818".equals(item.getId())) {
+                    return true;
+                }
+                return false;
+            }).collect(Collectors.toList());
+        }
+        if (CollectionUtil.isNotEmpty(roles)) {
+            return true;
+        }
+        return false;
+    }
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/controller/CwProjectRecordsController.java

@@ -191,4 +191,14 @@ public class CwProjectRecordsController {
         return ResponseEntity.ok(cwProjectRecordsDTOList);
     }
 
+    /**
+     * 查询当前登录人创建的项目 以及 所属项目组的项目(当前登录人未被移除项目组)
+     * @return
+     */
+    @ApiOperation(value = "查询当前登录人创建的项目以及所属项目组的项目")
+    @GetMapping(value = "/getHaveProjectIds")
+    public ResponseEntity<List<String>> getHaveProjectIds() {
+        return cwProjectRecordsService.getHaveProjectIds();
+    }
+
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/mapper/CwProjectRecordsMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.test.cw.projectRecords.domain.CwProjectRecords;
 import com.jeeplus.test.cw.projectRecords.service.dto.CwProjectClientInfoDTO;
 import com.jeeplus.test.cw.projectRecords.service.dto.CwProjectRecordsDTO;
@@ -26,8 +27,7 @@ public interface CwProjectRecordsMapper extends BaseMapper<CwProjectRecords> {
      * @param queryWrapper
      * @return
      */
-    IPage<CwProjectRecordsDTO> findList(Page<CwProjectRecordsDTO> page, @Param(Constants.WRAPPER) QueryWrapper<CwProjectRecords> queryWrapper);
-
+    IPage<CwProjectRecordsDTO> findList(Page<CwProjectRecordsDTO> page,@Param("currentUser") UserDTO currentUser,@Param("isBmzr") String isBmzr, @Param(Constants.WRAPPER) QueryWrapper<CwProjectRecords> queryWrapper);
     /**
      * 根据id查询项目详情
      * @param id
@@ -54,4 +54,6 @@ public interface CwProjectRecordsMapper extends BaseMapper<CwProjectRecords> {
     List<CwProjectRecordsDTO> getProjectByIdList(@Param(Constants.WRAPPER) QueryWrapper<CwProjectRecords> queryWrapper);
 
     List<CwProjectRecordsDTO> getByContractId(@Param(Constants.WRAPPER) QueryWrapper<CwProjectRecords> queryWrapper);
+
+    List<String> getHaveProjectIds(@Param("currentUser") UserDTO currentUser);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/mapper/xml/CwProjectRecordsMapper.xml

@@ -236,6 +236,26 @@
                     group by rec.id
                     ) b on b.id = a.id
         ${ew.customSqlSegment}
+        <if test="currentUser.id != '1'.toString">
+            <if test="isBmzr == '0'.toString">
+                and a.create_by = #{currentUser.id} or a.id in (
+                select cw_pm.project_id
+                from cw_project_members cw_pm
+                where cw_pm.user_id = #{currentUser.id} and cw_pm.del_flag = '0' and cw_pm.status = '0'
+                )
+            </if>
+            <if test="isBmzr == '1'.toString">
+                and a.create_by in (
+                select su.id from sys_user su where su.del_flag = '0' and su.office_id in
+                (select so.id from sys_office so where so.id = #{currentUser.officeDTO.id} or so.parent_ids like concat('%',#{currentUser.officeDTO.id},'%') and so.del_flag = '0')
+                ) or a.id in (
+                select cw_pm.project_id
+                from cw_project_members cw_pm
+                where cw_pm.user_id = #{currentUser.id} and cw_pm.del_flag = '0' and cw_pm.status = '0'
+                )
+            </if>
+        </if>
+        ORDER BY a.create_date DESC
     </select>
 
     <select id="queryById" resultMap="BaseResultMap">
@@ -297,4 +317,17 @@
         left join sys_user su2 on su2.id = a.project_master_id and su2.del_flag = '0'
         ${ew.customSqlSegment}
     </select>
+
+    <select id="getHaveProjectIds" resultType="string">
+        select
+            distinct id
+        from
+        (select cw_pm.project_id as id
+        from cw_project_members cw_pm
+        where cw_pm.user_id = #{currentUser.id} and cw_pm.del_flag = '0' and cw_pm.status = '0'
+        union
+        select cw_pr.id as id
+        from cw_project_records cw_pr
+        where cw_pr.create_by = #{currentUser.id} and cw_pr.del_flag = '0') a
+    </select>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/service/CwProjectRecordsService.java

@@ -15,10 +15,12 @@ import com.google.gson.reflect.TypeToken;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.sys.domain.User;
 import com.jeeplus.sys.mapper.UserMapper;
+import com.jeeplus.sys.service.dto.RoleDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.Global;
 import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.sys.utils.UserUtils;
+import com.jeeplus.test.cw.common.FindUtils;
 import com.jeeplus.test.cw.contractRegistration.domain.ContractFile;
 import com.jeeplus.test.cw.contractRegistration.domain.ContractInfo;
 import com.jeeplus.test.cw.contractRegistration.mapper.ContractInfoMapper;
@@ -44,6 +46,7 @@ import com.jeeplus.test.oss.service.OSSClientService;
 import com.jeeplus.test.oss.service.OssService;
 import com.jeeplus.test.signature.domain.*;
 import com.jeeplus.test.signature.utils.SignaturePostUtil;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.data.redis.connection.jedis.JedisUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@@ -95,7 +98,7 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
     public IPage<CwProjectRecordsDTO> findList(Page<CwProjectRecordsDTO> page, CwProjectRecordsDTO cwProjectRecordsDTO) throws Exception{
         QueryWrapper<CwProjectRecords> queryWrapper = QueryWrapperGenerator.buildQueryCondition ( CwProjectRecordsWrapper.INSTANCE.toEntity(cwProjectRecordsDTO), CwProjectRecords.class );
         queryWrapper.eq("a.del_flag","0");
-        queryWrapper.orderByDesc("a.create_date");
+//        queryWrapper.orderByDesc("a.create_date");
         if (ObjectUtil.isNotEmpty(cwProjectRecordsDTO)) {
             if (ArrayUtil.isNotEmpty(cwProjectRecordsDTO.getCreateDates())) {
                 queryWrapper.between("a.create_date", cwProjectRecordsDTO.getCreateDates()[0], cwProjectRecordsDTO.getCreateDates()[1]);
@@ -113,7 +116,16 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
                 queryWrapper.eq("a.create_by", cwProjectRecordsDTO.getCreateId());
             }
         }
-        IPage<CwProjectRecordsDTO> list = cwProjectRecordsMapper.findList(page, queryWrapper);
+        // 如果当前用户是部门主任，则可以查看部门所有的项目、自己创建的项目以及所属项目组的项目
+        // 如果当前用户是员工，则可以查看自己创建的项目以及所属项目组的项目
+        String isBmzr = "0";
+        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        if (FindUtils.haveRoleCwBmzr()) {
+            isBmzr = "1";
+        } else {
+            isBmzr = "0";
+        }
+        IPage<CwProjectRecordsDTO> list = cwProjectRecordsMapper.findList(page,userDTO,isBmzr, queryWrapper);
         return list;
     }
 
@@ -397,4 +409,13 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
         return ResponseEntity.ok("操作成功");
     }
 
+    /**
+     * 查询当前登录人创建的项目以及所属项目组的项目
+     * @return
+     */
+    public ResponseEntity<List<String>> getHaveProjectIds(){
+        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        return ResponseEntity.ok(cwProjectRecordsMapper.getHaveProjectIds(userDTO));
+    }
+
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/mapper/CwProjectReportMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.test.cw.projectRecords.domain.CwProjectRecords;
 import com.jeeplus.test.cw.projectRecords.service.dto.CwProjectRecordsDTO;
 import com.jeeplus.test.cw.projectReport.domain.CwProjectReport;
@@ -33,7 +34,7 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
      * @param queryWrapper
      * @return
      */
-    IPage<CwProjectReportData> findList(Page<CwProjectReportData> page, @Param(Constants.WRAPPER) QueryWrapper<CwProjectReportData> queryWrapper);
+    IPage<CwProjectReportData> findList(Page<CwProjectReportData> page, @Param("currentUser") UserDTO currentUser, @Param("isBmzr") String isBmzr, @Param(Constants.WRAPPER) QueryWrapper<CwProjectReportData> queryWrapper);
 
     List<WorkAttachment> findFileList(@Param("id") String id);
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -92,6 +92,26 @@
         left join cw_project_report_new_line new_line on a.id = new_line.report_id and new_line.del_flag = '0'
         left join cw_project_report_review cw_rev on a.id = cw_rev.report_id and cw_rev.del_flag = '0'
         ${ew.customSqlSegment}
+        <if test="currentUser.id != '1'.toString">
+            <if test="isBmzr == '0'.toString">
+                and a.create_by = #{currentUser.id} or b.id in (
+                select cw_pm.project_id
+                from cw_project_members cw_pm
+                where cw_pm.user_id = #{currentUser.id} and cw_pm.del_flag = '0' and cw_pm.status = '0'
+                )
+            </if>
+            <if test="isBmzr == '1'.toString">
+                and a.create_by in (
+                select su.id from sys_user su where su.del_flag = '0' and su.office_id in
+                (select so.id from sys_office so where so.id = #{currentUser.officeDTO.id} or so.parent_ids like concat('%',#{currentUser.officeDTO.id},'%') and so.del_flag = '0')
+                ) or b.id in (
+                select cw_pm.project_id
+                from cw_project_members cw_pm
+                where cw_pm.user_id = #{currentUser.id} and cw_pm.del_flag = '0' and cw_pm.status = '0'
+                )
+            </if>
+        </if>
+        ORDER BY a.create_date DESC
     </select>
     <select id="queryById" resultType="com.jeeplus.test.cw.projectReport.domain.CwProjectReportData">
         SELECT

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/service/CwProjectReportService.java

@@ -22,6 +22,7 @@ import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.Global;
 import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.sys.utils.UserUtils;
+import com.jeeplus.test.cw.common.FindUtils;
 import com.jeeplus.test.cw.common.flowable.dto.CommitParamDTO;
 import com.jeeplus.test.cw.contractRegistration.domain.ContractInfo;
 import com.jeeplus.test.cw.invoice.domain.CwFinanceInvoice;
@@ -385,7 +386,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
     public IPage<CwProjectReportData> findList(Page<CwProjectReportData> page, CwProjectReportData projectReportData) throws Exception{
         QueryWrapper<CwProjectReportData> queryWrapper = QueryWrapperGenerator.buildQueryCondition (projectReportData,CwProjectReportData.class);
         queryWrapper.eq("a.del_flag","0");
-        queryWrapper.orderByDesc("a.create_date");
+//        queryWrapper.orderByDesc("a.create_date");
         //条件
         if (StringUtils.isNotEmpty(projectReportData.getProjectNumber())) {
             queryWrapper.like("b.project_number", projectReportData.getProjectNumber());
@@ -419,9 +420,16 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                 queryWrapper.le("a.audit_fees", contractAmounts[1]);
             }
         }
-
-        IPage<CwProjectReportData> list = reportMapper.findList(page, queryWrapper);
+        String isBmzr = "0";
+        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        if (FindUtils.haveRoleCwBmzr()) {
+            isBmzr = "1";
+        } else {
+            isBmzr = "0";
+        }
+        IPage<CwProjectReportData> list = reportMapper.findList(page,userDTO,isBmzr, queryWrapper);
         return list;
+
     }
 
     /**

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReportArchive/mapper/CwProjectReportArchiveMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.test.cw.projectReportArchive.domain.CwProjectReportArchive;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.test.cw.projectReportArchive.service.dto.CwProjectReportArchiveDTO;
@@ -14,7 +15,7 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface CwProjectReportArchiveMapper extends BaseMapper<CwProjectReportArchive> {
 
-    IPage<CwProjectReportArchiveDTO> findList(Page<CwProjectReportArchiveDTO> page, @Param(Constants.WRAPPER) QueryWrapper<CwProjectReportArchive> queryWrapper);
+    IPage<CwProjectReportArchiveDTO> findList(Page<CwProjectReportArchiveDTO> page, @Param("currentUser") UserDTO currentUser, @Param("isBmzr") String isBmzr, @Param(Constants.WRAPPER) QueryWrapper<CwProjectReportArchive> queryWrapper);
 
     CwProjectReportArchiveDTO queryById(@Param("id") String id);
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReportArchive/mapper/xml/CwProjectReportArchiveMapper.xml

@@ -234,6 +234,26 @@
         left join sys_user su1 on cw_pr.project_master_id = su1.id and su1.del_flag = '0'
         left join cw_project_report_new_line cw_prnl on cw_prnl.report_id = cw_pa.report_id and cw_prnl.del_flag = '0'
         ${ew.customSqlSegment}
+        <if test="currentUser.id != '1'.toString">
+            <if test="isBmzr == '0'.toString">
+                and cw_pa.create_by = #{currentUser.id} or cw_pa.project_id in (
+                select cw_pm.project_id
+                from cw_project_members cw_pm
+                where cw_pm.user_id = #{currentUser.id} and cw_pm.del_flag = '0' and cw_pm.status = '0'
+                )
+            </if>
+            <if test="isBmzr == '1'.toString">
+                and cw_pa.create_by in (
+                select su.id from sys_user su where su.del_flag = '0' and su.office_id in
+                (select so.id from sys_office so where so.id = #{currentUser.officeDTO.id} or so.parent_ids like concat('%',#{currentUser.officeDTO.id},'%') and so.del_flag = '0')
+                ) or cw_pa.project_id in (
+                select cw_pm.project_id
+                from cw_project_members cw_pm
+                where cw_pm.user_id = #{currentUser.id} and cw_pm.del_flag = '0' and cw_pm.status = '0'
+                )
+            </if>
+        </if>
+        ORDER BY cw_pa.create_date DESC
     </select>
 
     <sql id="prnl_column">

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReportArchive/service/CwProjectReportArchiveService.java

@@ -15,6 +15,7 @@ import com.jeeplus.sys.mapper.UserMapper;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.sys.utils.UserUtils;
+import com.jeeplus.test.cw.common.FindUtils;
 import com.jeeplus.test.cw.projectRecords.domain.CwProjectRecords;
 import com.jeeplus.test.cw.projectReport.domain.CwProjectInfoData;
 import com.jeeplus.test.cw.projectReport.mapper.CwProjectInfoMapper;
@@ -79,7 +80,7 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
     public IPage<CwProjectReportArchiveDTO> findList(Page<CwProjectReportArchiveDTO> page, CwProjectReportArchiveDTO cwProjectReportArchiveDTO) throws Exception{
         QueryWrapper<CwProjectReportArchive> queryWrapper = QueryWrapperGenerator.buildQueryCondition ( CwProjectReportArchiveWrapper.INSTANCE.toEntity(cwProjectReportArchiveDTO), CwProjectReportArchive.class );
         queryWrapper.eq("cw_pa.del_flag","0");
-        queryWrapper.orderByDesc("cw_pa.create_date");
+//        queryWrapper.orderByDesc("cw_pa.create_date");
         if (ObjectUtil.isNotEmpty(cwProjectReportArchiveDTO)) {
             if (ObjectUtil.isNotEmpty(cwProjectReportArchiveDTO.getCwProjectRecordsDTO())){
                 // 项目名称
@@ -135,7 +136,14 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
 
             }
         }
-        return cwProjectReportArchiveMapper.findList(page, queryWrapper);
+        String isBmzr = "0";
+        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        if (FindUtils.haveRoleCwBmzr()) {
+            isBmzr = "1";
+        } else {
+            isBmzr = "0";
+        }
+        return cwProjectReportArchiveMapper.findList(page,userDTO,isBmzr, queryWrapper);
     }
 
     /**

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/workClientInfo/service/CwWorkClientService.java

@@ -76,6 +76,11 @@ public class CwWorkClientService extends ServiceImpl<CwWorkClientBaseMapper, CwW
         queryWrapper.eq("cw_wcb.del_flag","0");
         queryWrapper.orderByDesc("cw_wcb.create_date");
         if (ObjectUtil.isNotEmpty(cwWorkClientBaseDTO)) {
+            if (StringUtils.isNotBlank(cwWorkClientBaseDTO.getIsTrue())) {
+                if ("1".equals(cwWorkClientBaseDTO.getIsTrue())){
+                    queryWrapper.eq("cw_wcb.status","0").or().eq("cw_wcb.status","5");
+                }
+            }
             if (ArrayUtil.isNotEmpty(cwWorkClientBaseDTO.getCreateDates())) {
                 queryWrapper.between("cw_wcb.create_date", cwWorkClientBaseDTO.getCreateDates()[0], cwWorkClientBaseDTO.getCreateDates()[1]);
             }
@@ -175,6 +180,11 @@ public class CwWorkClientService extends ServiceImpl<CwWorkClientBaseMapper, CwW
             if (StringUtils.isNotBlank(cwWorkClientBaseDTO.getStatus())) {
                 queryWrapper.eq("cw_wcb.status",cwWorkClientBaseDTO.getStatus());
             }
+            if (StringUtils.isNotBlank(cwWorkClientBaseDTO.getIsTrue())) {
+                if ("1".equals(cwWorkClientBaseDTO.getIsTrue())){
+                    queryWrapper.eq("cw_wcb.status","0").or().eq("cw_wcb.status","5");
+                }
+            }
         }
         return cwWorkClientBaseMapper.findList(page, queryWrapper);
     }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/workClientInfo/service/dto/CwWorkClientBaseDTO.java

@@ -273,5 +273,10 @@ public class CwWorkClientBaseDTO extends BaseDTO {
      */
     private String requestUserId;
 
+    /**
+     * 值为 “1”，则查询客户status为 0 或 5 的数据
+     */
+    private String isTrue;
+
     private static final long serialVersionUID = 1L;
 }