修复项目信息申报获取数据问题

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

@@ -47,8 +47,8 @@ public interface SubInfoService {
 	Page pageQueryReportList(Page page,LoginUserVO loginUserVO, String subName, String unitId,String kind, String status, String statusSp,
 							 String propKind, String indusKind, Date beginDate, Date endDate);
 
-	Page pageQueryReportListSql(Page page, LoginUserVO loginUserVO, String subName, String unitId, String kind, String status, String statusSp,
-									   String propKind, String indusKind, Date beginDate, Date endDate, List<String> subInfoIds);
+	Page pageQueryReportListSql(Page page,LoginUserVO loginUserVO, String subName, String unitId,String kind, String status, String statusSp,
+								String propKind, String indusKind, Date beginDate, Date endDate);
 
 
 

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

@@ -1027,7 +1027,7 @@ public class SubInfoServiceImpl implements SubInfoService {
 
     @Override
     public Page pageQueryReportListSql(Page page, LoginUserVO loginUserVO, String subName, String unitId, String kind, String status, String statusSp,
-                                       String propKind, String indusKind, Date beginDate, Date endDate, List<String> subInfoIds) {
+                                       String propKind, String indusKind, Date beginDate, Date endDate) {
 
         StringBuffer sql = new StringBuffer();
         sql.append(" select a.id,a.status ,a.sub_name subName,a.amt_total amtTotal,a.begin_date beginDate,a.end_date endDate,ju.title unitName,ts.title subjectName, ts1.title indusKindName   ");
@@ -1041,17 +1041,6 @@ public class SubInfoServiceImpl implements SubInfoService {
 
         sql.append(" where a.logic_delete_flag =0 ");
 
-        // 处理 subInfoIds 参数
-        if (subInfoIds != null && !subInfoIds.isEmpty()) {
-            String idListStr = subInfoIds.stream()
-                    .map(id -> "'" + id + "'") // 每个 ID 加单引号
-                    .collect(Collectors.joining(","));
-            sql.append(" and a.id in (").append(idListStr).append(") ");
-        }else {
-            sql.append(" and a.id in ( ) ");
-        }
-
-
 
         //2024-03-28客户提出admin用户需查询和储备台账一样的数据
         SecRole role = secRoleDao.findById(loginUserVO.getKind());

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

@@ -192,9 +192,9 @@ public class SubInfoApiController extends BaseController {
         try {
             String currUnitId = null;
             currUnitId = getCurUser().getUnitId();
-            // Page pageData = subInfoService.pageQueryReportListSql(page, getCurUser().getLoginUser(), queryVO.getSubName(), currUnitId,
-            //         null, queryVO.getStatus(), null, null, null, queryVO.getBeginDate(), queryVO.getEndDate());
-            // message.add(pageData.getList(), pageData.getTotalCount());
+             Page pageData = subInfoService.pageQueryReportListSql(page, getCurUser().getLoginUser(), queryVO.getSubName(), currUnitId,
+                     null, queryVO.getStatus(), null, null, null, queryVO.getBeginDate(), queryVO.getEndDate());
+             message.add(pageData.getList(), pageData.getTotalCount());
         } catch (Exception e) {
             logger.error("", e);
             message.add("获取失败");