Merge remote-tracking branch 'origin/master'

projects-service/src/main/java/com/rtrh/projects/modules/projects/mapper/SubInfoMapper.java

@@ -56,27 +56,27 @@ public interface SubInfoMapper {
     @Update("update sub_fix set cat = #{fixCat} where sub_id = #{subInfoId} and cat = #{oldCat}")
     void updateFixeCat(@Param("subInfoId") String subInfoId, @Param("fixCat") String fixCat, @Param("oldCat") String oldCat);
 
-    List<SubInfoTotalExcel> getFixTotalExcel(@Param("stateFix") String stateFix,@Param("year") String year,@Param("subName") String subName, @Param("indusKinds") List<String> indusKinds, @Param("sbdw") String sbdw, @Param("subjectId") String subjectId, @Param("startAmt") String startAmt, @Param("endAmt") String endAmt);
+    List<SubInfoTotalExcel> getFixTotalExcel(@Param("stateFix") String stateFix,@Param("year") String year,@Param("subName") String subName, @Param("indusKinds") List<String> indusKinds, @Param("sbdw") String sbdw, @Param("subjectId") String subjectId, @Param("startAmt") String startAmt, @Param("endAmt") String endAmt,@Param("subjectIds") List<String> subjectIds);
 
     List<SubInfoTotalExcel> exportTotalExcelByStatus(@Param("status") String status);
 
-    List<SubInfoFixDetail> exportFixDetailExcel(@Param("stateFix")String stateFix, @Param("year") String year,@Param("subName") String subName, @Param("indusKinds") List<String> indusKinds, @Param("sbdw") String sbdw, @Param("subjectId") String subjectId, @Param("startAmt") String startAmt, @Param("endAmt") String endAmt);
+    List<SubInfoFixDetail> exportFixDetailExcel(@Param("stateFix")String stateFix, @Param("year") String year,@Param("subName") String subName, @Param("indusKinds") List<String> indusKinds, @Param("sbdw") String sbdw, @Param("subjectId") String subjectId, @Param("startAmt") String startAmt, @Param("endAmt") String endAmt,@Param("subjectIds") List<String> subjectIds);
 
     List<SubInfoFixDetailPreNew> selectSubPreNewBySubIds(@Param("subIdList")List<String> subIdList);
 
     List<RptCont> selectNewestMonthReport(@Param("ids") List<String> ids);
 
-    List<SubInfoFixCbDetail> exportFixCbDetailExcel(@Param("stateFix") String stateFix, @Param("year") String year,@Param("subName") String subName, @Param("indusKinds") List<String> indusKinds, @Param("sbdw") String sbdw, @Param("subjectId") String subjectId, @Param("startAmt") String startAmt, @Param("endAmt") String endAmt);
+    List<SubInfoFixCbDetail> exportFixCbDetailExcel(@Param("stateFix") String stateFix, @Param("year") String year,@Param("subName") String subName, @Param("indusKinds") List<String> indusKinds, @Param("sbdw") String sbdw, @Param("subjectId") String subjectId, @Param("startAmt") String startAmt, @Param("endAmt") String endAmt,@Param("subjectIds") List<String> subjectIds);
 
-    List<SubInfoFixZjDetail> exportFixZjDetailExcel(@Param("stateFix") String stateFix, @Param("year") String year,@Param("subName") String subName, @Param("indusKinds") List<String> indusKinds, @Param("sbdw") String sbdw, @Param("subjectId") String subjectId, @Param("startAmt") String startAmt, @Param("endAmt") String endAmt);
+    List<SubInfoFixZjDetail> exportFixZjDetailExcel(@Param("stateFix") String stateFix, @Param("year") String year,@Param("subName") String subName, @Param("indusKinds") List<String> indusKinds, @Param("sbdw") String sbdw, @Param("subjectId") String subjectId, @Param("startAmt") String startAmt, @Param("endAmt") String endAmt,@Param("subjectIds") List<String> subjectIds);
 
     List<MoneyMap> selectYearMoney(@Param("subIdList") List<String> subIdList, @Param("year") String year);
 
-    List<SubInfoFixTcDetail> exportFixTcDetailExcel(@Param("stateFix") String stateFix,@Param("year") String year,@Param("subName") String subName, @Param("indusKinds") List<String> indusKinds, @Param("sbdw") String sbdw, @Param("subjectId") String subjectId, @Param("startAmt") String startAmt, @Param("endAmt") String endAmt);
+    List<SubInfoFixTcDetail> exportFixTcDetailExcel(@Param("stateFix") String stateFix,@Param("year") String year,@Param("subName") String subName, @Param("indusKinds") List<String> indusKinds, @Param("sbdw") String sbdw, @Param("subjectId") String subjectId, @Param("startAmt") String startAmt, @Param("endAmt") String endAmt,@Param("subjectIds") List<String> subjectIds);
 
-    List<SubFixGetBeginRateVo> subFixGetBeginRate(@Param("queryVO")SubInfoQueryTzVO queryVO,@Param("indusKinds") List<String> indusKinds);
+    List<SubFixGetBeginRateVo> subFixGetBeginRate(@Param("queryVO")SubInfoQueryTzVO queryVO,@Param("indusKinds") List<String> indusKinds,@Param("subjectIds") List<String> subjectIds);
 
-    List<SubFixListVo> subFixGetAll(@Param("queryVO")SubInfoQueryTzVO queryVO,@Param("indusKinds") List<String> indusKinds);
+    List<SubFixListVo> subFixGetAll(@Param("queryVO")SubInfoQueryTzVO queryVO,@Param("indusKinds") List<String> indusKinds,@Param("subjectIds") List<String> subjectIds);
 
     Long queryWarning();
 

projects-service/src/main/java/com/rtrh/projects/modules/projects/mapper/SubInfoMapper.xml

@@ -462,6 +462,12 @@
         <if test="subjectId != null and subjectId != ''">
             AND sub_info.subject_id = #{subjectId}
         </if>
+        <if test="subjectIds != null and subjectIds.size() &gt; 0">
+            AND sub_info.subject_id IN
+            <foreach collection="subjectIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="indusKinds != null and indusKinds.size() &gt; 0">
             AND sub_info.indus_kind IN
             <foreach collection="indusKinds" item="item" separator="," open="(" close=")">
@@ -510,6 +516,12 @@
         <if test="subjectId != null and subjectId != ''">
             AND sub_info.subject_id = #{subjectId}
         </if>
+        <if test="subjectIds != null and subjectIds.size() &gt; 0">
+            AND sub_info.subject_id IN
+            <foreach collection="subjectIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="indusKinds != null and indusKinds.size() &gt; 0">
             AND sub_info.indus_kind IN
             <foreach collection="indusKinds" item="item" separator="," open="(" close=")">
@@ -590,6 +602,12 @@
         <if test="subjectId != null and subjectId != ''">
             AND sub_info.subject_id = #{subjectId}
         </if>
+        <if test="subjectIds != null and subjectIds.size() &gt; 0">
+            AND sub_info.subject_id IN
+            <foreach collection="subjectIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="indusKinds != null and indusKinds.size() &gt; 0">
             AND sub_info.indus_kind IN
             <foreach collection="indusKinds" item="item" separator="," open="(" close=")">
@@ -631,6 +649,12 @@
         <if test="subjectId != null and subjectId != ''">
             AND sub_info.subject_id = #{subjectId}
         </if>
+        <if test="subjectIds != null and subjectIds.size() &gt; 0">
+            AND sub_info.subject_id IN
+            <foreach collection="subjectIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="indusKinds != null and indusKinds.size() &gt; 0">
             AND sub_info.indus_kind IN
             <foreach collection="indusKinds" item="item" separator="," open="(" close=")">
@@ -687,6 +711,12 @@
         <if test="subjectId != null and subjectId != ''">
             AND sub_info.subject_id = #{subjectId}
         </if>
+        <if test="subjectIds != null and subjectIds.size() &gt; 0">
+            AND sub_info.subject_id IN
+            <foreach collection="subjectIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="indusKinds != null and indusKinds.size() &gt; 0">
             AND sub_info.indus_kind IN
             <foreach collection="indusKinds" item="item" separator="," open="(" close=")">
@@ -723,6 +753,12 @@
         <if test="queryVO.subjectId != null and queryVO.subjectId != ''">
             AND sub_info.subject_id = #{queryVO.subjectId}
         </if>
+        <if test="subjectIds != null and subjectIds.size() &gt; 0">
+            AND sub_info.subject_id IN
+            <foreach collection="subjectIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="indusKinds != null and indusKinds.size() &gt; 0">
             AND sub_info.indus_kind IN
             <foreach collection="indusKinds" item="item" separator="," open="(" close=")">
@@ -765,6 +801,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="subjectIds != null and subjectIds.size() &gt; 0">
+            AND b.subject_id IN
+            <foreach collection="subjectIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="queryVO.sbdw != null and queryVO.sbdw != ''">
             AND b.unit_desc LIKE CONCAT('%', #{queryVO.sbdw}, '%')
         </if>

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/SecUserAuthService.java

@@ -0,0 +1,8 @@
+package com.rtrh.projects.modules.projects.service;
+
+import java.util.List;
+
+public interface SecUserAuthService {
+
+	List<String> findSubjectAuthIdsByUserId(String userId);
+}

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/SubInfoQueryService.java

@@ -342,7 +342,7 @@ public interface SubInfoQueryService {
 	 * @param
 	 * @return
 	 */
-    List<SubFixGetBeginRateVo> subFixGetBeginRate(SubInfoQueryTzVO queryVO,List<String> indusKinds);
+    List<SubFixGetBeginRateVo> subFixGetBeginRate(SubInfoQueryTzVO queryVO,List<String> indusKinds,List<String> subjectIds);
 
 	/**
 	 * 查询重点库项目列表
@@ -350,5 +350,5 @@ public interface SubInfoQueryService {
 	 * @param queryVO
 	 * @return
 	 */
-	Page subFixGetAll(Page page, SubInfoQueryTzVO queryVO,List<String> indusKinds);
+	Page subFixGetAll(Page page, SubInfoQueryTzVO queryVO,List<String> indusKinds, List<String> subjectIds);
 }

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/SubInfoService.java

@@ -408,17 +408,17 @@ public interface SubInfoService {
 
 	boolean rg(MoveDbParamVo vo);
 
-	List<SubInfoTotalExcel> getFixTotalExcel(SubInfoQueryTzVO vo);
+	List<SubInfoTotalExcel> getFixTotalExcel(SubInfoQueryTzVO vo,List<String> subjectIds);
 
-    List<SubInfoFixDetail> exportFixDetailExcel(SubInfoQueryTzVO vo);
+    List<SubInfoFixDetail> exportFixDetailExcel(SubInfoQueryTzVO vo,List<String> subjectIds);
 
-	List<SubInfoFixCbDetail> exportFixCbDetailExcel(SubInfoQueryTzVO vo);
+	List<SubInfoFixCbDetail> exportFixCbDetailExcel(SubInfoQueryTzVO vo,List<String> subjectIds);
 
 	List<SubInfoTotalExcel> exportTotalExcelByStatus(SubInfoQueryTzVO vo);
 
-	List<SubInfoFixZjDetail> exportFixZjDetailExcel(SubInfoQueryTzVO vo);
+	List<SubInfoFixZjDetail> exportFixZjDetailExcel(SubInfoQueryTzVO vo,List<String> subjectIds);
 
-	List<SubInfoFixTcDetail> exportFixTcDetailExcel(SubInfoQueryTzVO vo);
+	List<SubInfoFixTcDetail> exportFixTcDetailExcel(SubInfoQueryTzVO vo,List<String> subjectIds);
 
 	Map<String, Object> queryExceedCbToXj(LoginUserVO loginUser, PreWarnDataQueryVO queryVO);
 

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/SecUserAuthServiceImpl.java

@@ -0,0 +1,22 @@
+package com.rtrh.projects.modules.projects.service.impl;
+
+import com.rtrh.projects.modules.projects.service.SecUserAuthService;
+import com.rtrh.projects.modules.rolemeun.mapper.SecUserAuthMapper;
+import com.rtrh.projects.util.TargetDataSource;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class SecUserAuthServiceImpl implements SecUserAuthService {
+    @Resource
+    private SecUserAuthMapper secUserAuthMapper;
+
+    @Override
+    @TargetDataSource("secondary")
+    public List<String> findSubjectAuthIdsByUserId(String userId) {
+        return secUserAuthMapper.findSubjectAuthIdsByUserId(userId);
+    }
+
+}

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/SubInfoQueryServiceImpl.java

@@ -366,14 +366,14 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
     }
 
     @Override
-    public List<SubFixGetBeginRateVo> subFixGetBeginRate(SubInfoQueryTzVO queryVO, List<String> indusKinds) {
-        return subInfoMapper.subFixGetBeginRate(queryVO, indusKinds);
+    public List<SubFixGetBeginRateVo> subFixGetBeginRate(SubInfoQueryTzVO queryVO, List<String> indusKinds, List<String> subjectIds) {
+        return subInfoMapper.subFixGetBeginRate(queryVO, indusKinds, subjectIds);
     }
 
     @Override
-    public Page subFixGetAll(Page page, SubInfoQueryTzVO queryVO,List<String> indusKinds) {
+    public Page subFixGetAll(Page page, SubInfoQueryTzVO queryVO,List<String> indusKinds, List<String> subjectIds) {
         PageHelper.startPage(page.getPageNo(), page.getPageSize());
-        List<SubFixListVo> list = subInfoMapper.subFixGetAll(queryVO, indusKinds);
+        List<SubFixListVo> list = subInfoMapper.subFixGetAll(queryVO, indusKinds, subjectIds);
 
         //获取项目地点
         List<TSystable> jsddDict = tSysTableService.getByKind(SysTableKind.JSDD);

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/SubInfoServiceImpl.java

@@ -4761,7 +4761,7 @@ public class SubInfoServiceImpl implements SubInfoService {
     }
 
     @Override
-    public List<SubInfoTotalExcel> getFixTotalExcel(SubInfoQueryTzVO vo) {
+    public List<SubInfoTotalExcel> getFixTotalExcel(SubInfoQueryTzVO vo,List<String> subjectIds) {
 
         //查询出行业分类
         List<SubIndu> subInduList = subInduService.selectAllSubIndu();
@@ -4785,13 +4785,13 @@ public class SubInfoServiceImpl implements SubInfoService {
         }
 
         // 查询具体的sql数据
-        List<SubInfoTotalExcel> dataList =  subInfoMapper.getFixTotalExcel(vo.getStateFix(),vo.getYear(),vo.getSubName(),indusKinds,vo.getSbdw(),vo.getSubjectId(),vo.getStartAmt(),vo.getEndAmt());
+        List<SubInfoTotalExcel> dataList =  subInfoMapper.getFixTotalExcel(vo.getStateFix(),vo.getYear(),vo.getSubName(),indusKinds,vo.getSbdw(),vo.getSubjectId(),vo.getStartAmt(),vo.getEndAmt(),subjectIds);
 
         return dataList;
     }
 
     @Override
-    public List<SubInfoFixDetail> exportFixDetailExcel(SubInfoQueryTzVO vo) {
+    public List<SubInfoFixDetail> exportFixDetailExcel(SubInfoQueryTzVO vo,List<String> subjectIds) {
 
         // 获取行业
         List<SubIndu> subInduList = Optional.ofNullable(
@@ -4818,7 +4818,7 @@ public class SubInfoServiceImpl implements SubInfoService {
 
         // 查询所有的重点项目信息，若结果为空则初始化为一个空列表
         List<SubInfoFixDetail> dataList = Optional.ofNullable(
-                subInfoMapper.exportFixDetailExcel(vo.getStateFix(), vo.getYear(),vo.getSubName(),indusKinds,vo.getSbdw(),vo.getSubjectId(),vo.getStartAmt(),vo.getEndAmt())
+                subInfoMapper.exportFixDetailExcel(vo.getStateFix(), vo.getYear(),vo.getSubName(),indusKinds,vo.getSbdw(),vo.getSubjectId(),vo.getStartAmt(),vo.getEndAmt(),subjectIds)
         ).orElse(Collections.emptyList());
 
         // 收集所有重点项目信息的ID
@@ -4904,7 +4904,7 @@ public class SubInfoServiceImpl implements SubInfoService {
     }
 
     @Override
-    public List<SubInfoFixCbDetail> exportFixCbDetailExcel(SubInfoQueryTzVO vo) {
+    public List<SubInfoFixCbDetail> exportFixCbDetailExcel(SubInfoQueryTzVO vo, List<String> subjectIds) {
 
         // 获取行业
         List<SubIndu> subInduList = Optional.ofNullable(
@@ -4932,7 +4932,7 @@ public class SubInfoServiceImpl implements SubInfoService {
 
         // 查询所有的重点项目信息，若结果为空则初始化为一个空列表
         List<SubInfoFixCbDetail> dataList = Optional.ofNullable(
-                subInfoMapper.exportFixCbDetailExcel(vo.getStateFix(), vo.getYear(),vo.getSubName(),indusKinds,vo.getSbdw(),vo.getSubjectId(),vo.getStartAmt(),vo.getEndAmt())
+                subInfoMapper.exportFixCbDetailExcel(vo.getStateFix(), vo.getYear(),vo.getSubName(),indusKinds,vo.getSbdw(),vo.getSubjectId(),vo.getStartAmt(),vo.getEndAmt(),subjectIds)
         ).orElse(Collections.emptyList());
 
         // 获取项目建设地点
@@ -4974,7 +4974,7 @@ public class SubInfoServiceImpl implements SubInfoService {
     }
 
     @Override
-    public List<SubInfoFixZjDetail> exportFixZjDetailExcel(SubInfoQueryTzVO vo) {
+    public List<SubInfoFixZjDetail> exportFixZjDetailExcel(SubInfoQueryTzVO vo,List<String> subjectIds) {
 
         // 获取行业
         List<SubIndu> subInduList = Optional.ofNullable(
@@ -5001,7 +5001,7 @@ public class SubInfoServiceImpl implements SubInfoService {
 
         // 查询所有的重点项目信息，若结果为空则初始化为一个空列表
         List<SubInfoFixZjDetail> dataList = Optional.ofNullable(
-                subInfoMapper.exportFixZjDetailExcel(vo.getStateFix(), vo.getYear(),vo.getSubName(),indusKinds,vo.getSbdw(),vo.getSubjectId(),vo.getStartAmt(),vo.getEndAmt())
+                subInfoMapper.exportFixZjDetailExcel(vo.getStateFix(), vo.getYear(),vo.getSubName(),indusKinds,vo.getSbdw(),vo.getSubjectId(),vo.getStartAmt(),vo.getEndAmt(),subjectIds)
         ).orElse(Collections.emptyList());
 
         //获取所有SubInfoFixZjDetail的id
@@ -5067,7 +5067,7 @@ public class SubInfoServiceImpl implements SubInfoService {
     }
 
     @Override
-    public List<SubInfoFixTcDetail> exportFixTcDetailExcel(SubInfoQueryTzVO vo) {
+    public List<SubInfoFixTcDetail> exportFixTcDetailExcel(SubInfoQueryTzVO vo,List<String> subjectIds) {
 
         // 获取行业
         List<SubIndu> subInduList = Optional.ofNullable(
@@ -5094,7 +5094,7 @@ public class SubInfoServiceImpl implements SubInfoService {
 
         // 查询所有的重点项目信息，若结果为空则初始化为一个空列表
         List<SubInfoFixTcDetail> dataList = Optional.ofNullable(
-                subInfoMapper.exportFixTcDetailExcel(vo.getStateFix(), vo.getYear(),vo.getSubName(),indusKinds,vo.getSbdw(),vo.getSubjectId(),vo.getStartAmt(),vo.getEndAmt())
+                subInfoMapper.exportFixTcDetailExcel(vo.getStateFix(), vo.getYear(),vo.getSubName(),indusKinds,vo.getSbdw(),vo.getSubjectId(),vo.getStartAmt(),vo.getEndAmt(),subjectIds)
         ).orElse(Collections.emptyList());
 
         // 获取项目建设地点

projects/src/main/java/com/rtrh/projects/web/controller/BaseController.java

@@ -1,32 +1,22 @@
 package com.rtrh.projects.web.controller;
 
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import cn.hutool.core.collection.CollUtil;
-import com.rtrh.projects.modules.rolemeun.dao.SecUserAuthDao;
-import com.rtrh.projects.modules.rolemeun.mapper.SecUserAuthMapper;
-import com.rtrh.projects.modules.rolemeun.po.SecUserAuth;
+import com.rtrh.projects.modules.projects.service.SecUserAuthService;
+import com.team.security.TeamShiroUser;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.session.Session;
 import org.springframework.web.bind.annotation.ModelAttribute;
 
-import com.team.security.TeamShiroUser;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.PrintWriter;
+import java.util.List;
 
 public abstract class BaseController {
 	@Resource
-	private SecUserAuthDao userAuthDao;
-
-	@Resource
-	private SecUserAuthMapper userAuthMapper;
+	private SecUserAuthService secUserAuthService;
 
 	/**
 	 * 当前用户的session
@@ -58,13 +48,7 @@ public abstract class BaseController {
 	// 区域数据权限
 	public List<String> getSubjectIds() {
 		TeamShiroUser principal = (TeamShiroUser)SecurityUtils.getSubject().getPrincipal();
-		if ("1".equals(principal.getStatusSubject())){
-			// List<SecUserAuth> list = userAuthDao.findListByUserId(principal.getId());
-			// return CollUtil.isEmpty(list)? new ArrayList<>():list.stream().map(SecUserAuth::getSubjectId).collect(Collectors.toList());
-			return userAuthMapper.findSubjectAuthIdsByUserId(principal.getId());
-		}else {
-			return new ArrayList<>();
-		}
+		return "1".equals(principal.getStatusSubject()) ? secUserAuthService.findSubjectAuthIdsByUserId(principal.getId()) : null;
 	}
 	
 	@ModelAttribute

projects/src/main/java/com/rtrh/projects/web/controller/projects/TjFxController.java

@@ -7,9 +7,11 @@ import java.io.InputStream;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import cn.afterturn.easypoi.word.WordExportUtil;
 import cn.afterturn.easypoi.word.entity.MyXWPFDocument;
+import cn.hutool.core.collection.CollectionUtil;
 import com.rtrh.common.util.StringUtil;
 import com.rtrh.projects.modules.projects.mapper.ReportMapper;
 import com.rtrh.projects.modules.projects.po.SubIndu;
@@ -51,8 +53,13 @@ public class TjFxController extends BaseController {
 
 	@GetMapping("index")
 	public ModelAndView index(ModelMap model) {
-		List<TSystable> JSDD = tSysTableService.getByKind(SysTableKind.JSDD);
-		model.put("JSDD", JSDD);
+		List<TSystable> byKind = tSysTableService.getByKind(SysTableKind.JSDD);
+		List<String> subjectIds = getSubjectIds();
+		if (CollectionUtil.isNotEmpty(subjectIds)){
+			byKind = byKind.stream().filter(item -> subjectIds.contains(item.getCode())).collect(Collectors.toList());
+		}
+		model.put("JSDD",byKind);   //项目属地
+
 		List<SubIndu> subInduList = subInduService.queryParentAll();
 		model.put("HYFL", subInduList);
 		List<TSystable> JSXZ = tSysTableService.getByKind(SysTableKind.JSXZ);

projects/src/main/java/com/rtrh/projects/web/controller/subject/SubInfoController.java

@@ -227,7 +227,13 @@ public class SubInfoController extends BaseController {
         model.put("ZJLY", tSysTableService.getByKind(SysTableKind.ZJLY));
         model.put("XMLX", tSysTableService.getByKind(SysTableKind.XMLX));   //项目类型
         model.put("JSXZ", tSysTableService.getByKind(SysTableKind.JSXZ));
-        model.put("JSDD", tSysTableService.getByKind(SysTableKind.JSDD));   //项目属地
+        List<TSystable> byKind = tSysTableService.getByKind(SysTableKind.JSDD);
+        List<String> subjectIds = getSubjectIds();
+        if (CollectionUtil.isNotEmpty(subjectIds)){
+            byKind = byKind.stream().filter(item -> subjectIds.contains(item.getCode())).collect(Collectors.toList());
+        }
+        model.put("JSDD",byKind);   //项目属地
+
         model.put("TZXZ", tSysTableService.getByKind(SysTableKind.TZXZ));
         model.put("HYDW", jUnitService.getUnitByKind(JUnitKind.ZFDW));
         model.put("BQ", tSysTableService.getByKind(SysTableKind.BQ));

projects/src/main/java/com/rtrh/projects/web/controller/subject/SubInfoExportController.java

@@ -643,7 +643,8 @@ public class SubInfoExportController extends BaseController {
     public void exportFixTotalExcel(HttpServletResponse response, @RequestBody SubInfoQueryTzVO vo) {
 
         try {
-            List<SubInfoTotalExcel> subInfoTotalExcel = subInfoService.getFixTotalExcel(vo);
+            List<String> subjectIds = getSubjectIds();
+            List<SubInfoTotalExcel> subInfoTotalExcel = subInfoService.getFixTotalExcel(vo,subjectIds);
             if (subInfoTotalExcel == null) {
                 subInfoTotalExcel = new ArrayList<>();
             }
@@ -873,10 +874,7 @@ public class SubInfoExportController extends BaseController {
      */
     @PostMapping("/exportDetailExcel")
     public void exportDetailExcel(HttpServletResponse response, @RequestBody SubInfoQueryTzVO queryVO) {
-        if ("1".equals(getCurUser().getStatusSubject())){
-            List<String> subjectIds = getSubjectIds();
-            queryVO.setSubjectAuthIds(subjectIds);
-        }
+        queryVO.setSubjectAuthIds(getSubjectIds());
         List<SubInfoGxj> list = subInfoQueryService.queryAll(getCurUser().getLoginUser(), queryVO);
         // 行业字典
         Map<String, String> hyDictMap = subInduService.queryParentAll().stream().collect(Collectors.toMap(SubIndu::getCode, SubIndu::getTitle));
@@ -1114,10 +1112,7 @@ public class SubInfoExportController extends BaseController {
      */
     @PostMapping("/exportTotalExcelByStatus")
     public void exportTotalExcelByStatus(HttpServletResponse response, @RequestBody SubInfoQueryTzVO vo) {
-        if ("1".equals(getCurUser().getStatusSubject())){
-            List<String> subjectIds = getSubjectIds();
-            vo.setSubjectAuthIds(subjectIds);
-        }
+        vo.setSubjectAuthIds(getSubjectIds());
         // 查询数据以及字典
         List<SubInfoTotalExcel> list = subInfoService.exportTotalExcelByStatus(vo);
         List<TSystable> jsddDict = tSysTableService.getByKind(SysTableKind.JSDD);
@@ -1327,7 +1322,8 @@ public class SubInfoExportController extends BaseController {
              ServletOutputStream out = response.getOutputStream()) {
 
             // 获取数据
-            List<SubInfoFixDetail> subInfoTotalExcel = subInfoService.exportFixDetailExcel(vo);
+            List<String> subjectIds = getSubjectIds();
+            List<SubInfoFixDetail> subInfoTotalExcel = subInfoService.exportFixDetailExcel(vo,subjectIds);
             if (CollUtil.isEmpty(subInfoTotalExcel)){
                 subInfoTotalExcel = CollUtil.newArrayList();
             }
@@ -1445,7 +1441,8 @@ public class SubInfoExportController extends BaseController {
              ServletOutputStream out = response.getOutputStream()) {
 
             // 获取数据
-            List<SubInfoFixCbDetail> subInfoTotalExcel = subInfoService.exportFixCbDetailExcel(vo);
+            List<String> subjectIds = getSubjectIds();
+            List<SubInfoFixCbDetail> subInfoTotalExcel = subInfoService.exportFixCbDetailExcel(vo,subjectIds);
 
             // 写入标题行
             writer.writeHeadRow(CollUtil.newArrayList("四个一批工业项目表"));
@@ -1543,7 +1540,8 @@ public class SubInfoExportController extends BaseController {
              ServletOutputStream out = response.getOutputStream()) {
 
             // 获取数据
-            List<SubInfoFixZjDetail> subInfoTotalExcel = subInfoService.exportFixZjDetailExcel(vo);
+            List<String> subjectIds = getSubjectIds();
+            List<SubInfoFixZjDetail> subInfoTotalExcel = subInfoService.exportFixZjDetailExcel(vo,subjectIds);
 
             // 写入标题行
             writer.writeHeadRow(CollUtil.newArrayList("四个一批工业项目表"));
@@ -1657,7 +1655,8 @@ public class SubInfoExportController extends BaseController {
              ServletOutputStream out = response.getOutputStream()) {
 
             // 获取数据
-            List<SubInfoFixTcDetail> subInfoTotalExcel = subInfoService.exportFixTcDetailExcel(vo);
+            List<String> subjectIds = getSubjectIds();
+            List<SubInfoFixTcDetail> subInfoTotalExcel = subInfoService.exportFixTcDetailExcel(vo,subjectIds);
 
             // 写入标题行
             writer.writeHeadRow(CollUtil.newArrayList("四个一批工业项目表"));

projects/src/main/java/com/rtrh/projects/web/controller/subject/api/SubInfoQueryApiController.java

@@ -118,7 +118,8 @@ public class SubInfoQueryApiController extends BaseController {
                 }
             }
 
-            Page pageData = subInfoQueryService.subFixGetAll(page, queryVO, indusKinds);
+            List<String> subjectIds = getSubjectIds();
+            Page pageData = subInfoQueryService.subFixGetAll(page, queryVO, indusKinds, subjectIds);
             message.add(pageData.getList(), pageData.getTotalCount());
 
         } catch (Exception e) {
@@ -133,10 +134,7 @@ public class SubInfoQueryApiController extends BaseController {
     // 查询项目
     @PostMapping("queryPage")
     public ListMessage queryPage(@RequestBody Page page, @RequestBody SubInfoQueryTzVO queryVO) {
-        if ("1".equals(getCurUser().getStatusSubject())){
-            List<String> subjectIds = getSubjectIds();
-            queryVO.setSubjectAuthIds(subjectIds);
-        }
+        queryVO.setSubjectAuthIds(getSubjectIds());
         ListMessage message = new ListMessage();
         try {
             Page pageData = subInfoQueryService.queryPage(page, getCurUser().getLoginUser(), queryVO);
@@ -596,11 +594,9 @@ public class SubInfoQueryApiController extends BaseController {
     }
     @PostMapping("statistics")
     public Message statistics(@RequestBody SubInfoQueryTzVO queryVO) {
+        queryVO.setSubjectAuthIds(getSubjectIds());
         Message message = new Message();
-        if ("1".equals(getCurUser().getStatusSubject())){
-            List<String> subjectIds = getSubjectIds();
-            queryVO.setSubjectAuthIds(subjectIds);
-        }
+        queryVO.setSubjectAuthIds(getSubjectIds());
         StatisticsVO vo = subInfoQueryService.queryStatistics(queryVO, getCurUser().getLoginUser());
         message.setData(vo);
         return message;
@@ -685,7 +681,8 @@ public class SubInfoQueryApiController extends BaseController {
         Map<String, String> jsddMap = jsddList.stream().collect(Collectors.toMap(TSystable::getCode, TSystable::getTitle));
 
         //查询出该库符合条件的数据
-        List<SubFixGetBeginRateVo>  subFixGetBeginRateVoList  = subInfoQueryService.subFixGetBeginRate(queryVO,indusKinds);
+        List<String> subjectIds = getSubjectIds();
+        List<SubFixGetBeginRateVo>  subFixGetBeginRateVoList  = subInfoQueryService.subFixGetBeginRate(queryVO,indusKinds,subjectIds);
 
         //最终需要返回的数据
         SubFixBeginVo subFixBeginVo = new SubFixBeginVo();

projects/src/main/resources/rtrh-crypto.xml

@@ -18,6 +18,7 @@
 				<value>/outApi/projects/statics/yearReport</value>
 				<value>/outApi/subInfoExport/**</value>
 				<value>/outApi/auth/gxjLogin</value>
+				<value>/api/app/switch/toFgw</value>
 				<value>/pdfHtml/**</value>
 			</list>
 		</property>