调整

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

@@ -465,33 +465,18 @@
             subject_id AS subjectId,
             begin_date AS beginDate,
             end_date AS endDate,
-            rt_date AS rtDate,
             content AS content,
-            progress AS progress,
-            cb_status AS cbStatus,
-            qy_date AS qyDate,
-            xj_date AS xjDate,
-            zj_date AS zjDate,
-            tc_date AS tcDate,
-            cb_num AS cbNum,
-            xj_num AS xjNum,
-            zj_num AS zjNum,
-            indus_name AS indusName,
             remark,
             name_zrr AS nameZrr,
             tel AS tel,
             name_lead AS nameLead,
             tel_lead AS telLead,
             status AS status,
-            rg_date AS rgDate,
             create_user_id AS createUserId,
-            create_user_name AS createUserName,
             create_time AS createTime,
             last_update_user_id AS lastUpdateUserId,
-            last_update_user_name AS lastUpdateUserName,
             last_update_time AS lastUpdateTime,
             logic_delete_flag AS logicDeleteFlag,
-            status_lamp AS statusLamp,
             kind_nature AS kindNature
         from sub_info
         where id = #{id}

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

@@ -9,12 +9,14 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.base.CaseFormat;
 import com.rtrh.projects.modules.projects.enums.ProjectStatusEnum;
 import com.rtrh.projects.modules.projects.enums.SubIsHideStatusEnum;
 import com.rtrh.projects.modules.projects.mapper.*;
+import com.rtrh.projects.modules.projects.po.SubAerialImage;
 import com.rtrh.projects.modules.projects.po.SubInfoGxj;
 import com.rtrh.projects.modules.projects.service.WorkBenchService;
 import com.rtrh.projects.modules.projects.vo.*;
@@ -23,7 +25,9 @@ import com.rtrh.projects.modules.system.service.SecUserService;
 import com.rtrh.projects.modules.utils.DateUtils;
 import com.rtrh.projects.outapi.vo.SubMonthReportVO;
 import com.rtrh.projects.outapi.vo.report.ListQueryVO;
+import com.rtrh.projects.util.HttpClientUtil;
 import com.rtrh.projects.util.TargetDataSource;
+import com.rtrh.projects.vo.RemoteRequestDto;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.ibatis.annotations.Param;
 import org.apache.commons.lang.StringUtils;
@@ -123,8 +127,12 @@ public class SubRptContServiceImpl implements SubRptContService {
 	@Override
 	// @TargetDataSource("secondary")
 	public Page listQuery(Page page, RptContQueryVO queryVO) {
-		List<Map<String, Object>> list =workbenchMapper.geYbFgwtList(queryVO, page.getPageNo(), page.getPageSize());
-		page.setList(list);
+		RemoteRequestDto requestDto = new RemoteRequestDto();
+		requestDto.setRptVO(queryVO);
+		requestDto.setPage(page);
+		Object o = HttpClientUtil.fgwPostRequest("/outApi/remote/findListQuery", requestDto);
+		List<Map> data = JSONObject.parseArray(o.toString()).toJavaList(Map.class);
+		page.setList(data);
 		page.setTotalCount(queryVO.getOuttotal());
 		return page;
 	}
@@ -2102,7 +2110,7 @@ public class SubRptContServiceImpl implements SubRptContService {
 	}
 
 	@Override
-	@TargetDataSource("secondary")
+	//@TargetDataSource("secondary")
 	public RptCont getBySubIdAndMonthFgw(String subId, String year, String week, RptContKindEnum contKindEnum) {
 		return rptContMapper.getBySubIdAndMonth(subId, year, week, contKindEnum.getCode());
 	}

projects-service/src/main/java/com/rtrh/projects/vo/RemoteRequestDto.java

@@ -1,6 +1,7 @@
 package com.rtrh.projects.vo;
 
 import com.rtrh.core.repository.Page;
+import com.rtrh.projects.modules.projects.vo.RptContQueryVO;
 import com.rtrh.projects.modules.system.vo.LoginUserVO;
 import com.rtrh.projects.vo.subject.SubinfoPreQueryVo;
 import lombok.Getter;
@@ -21,5 +22,6 @@ public class RemoteRequestDto implements Serializable {
     private LoginUserVO userVO;
     private List<String> ids;
     private String month;
+    private RptContQueryVO rptVO;
 
 }