接口结构更改

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

@@ -39,7 +39,8 @@
             AND us.user_id = #{userId}
         <where>
             a.logic_delete_flag = 0
-            and b.indus_kind in('210','99','2')
+            /*and b.indus_kind in('210','99','2')*/
+            and b.status in('1','2','3','9')
             <if test="subjectName != null and subjectName != ''">
                 AND b.sub_name LIKE CONCAT('%', #{subjectName}, '%')
             </if>

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

@@ -693,7 +693,7 @@ public class SubquestioninfoserviceImpl implements Subquestioninfoservice {
 	}
 
 	@Override
-	@TargetDataSource("secondary")
+	//@TargetDataSource("secondary")
 	public Page pageQueryQuestionNewList(Page page, LoginUserVO vo, QuestionQueryVO queryVO) {
 		Map<String,Object> params = new HashMap<>();
 		params.put("userId",vo.getId());

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

@@ -172,7 +172,8 @@
                  LEFT JOIN sec_user su ON su.id = us.user_id AND su.logic_delete_flag = 0
                  LEFT JOIN sub_major mar ON mar.sub_id = a.id
         WHERE a.logic_delete_flag = 0
-          AND a.status IN ('1', '6', '7', '8', 'A')
+          /*AND a.status IN ('1', '6', '7', '8', 'A')*/
+              and a.status in('1','2','3','9')
                  <if test="subName!= null and subName!= ''">
                      AND a.sub_name = #{subName}
                  </if>

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

@@ -30,7 +30,8 @@
         <where>
             a.logic_delete_flag = 0
             AND a.`status` = '7'
-            and a.indus_kind in('210','99','2')
+            /*and a.indus_kind in('210','99','2')*/
+            and a.status in('1','2','3','9')
             <if test="null != subjectId and '' != subjectId">
                 AND a.subject_id = #{subjectId}
             </if>

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

@@ -1,9 +1,14 @@
 package com.rtrh.projects.modules.projects.service.impl;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.rtrh.projects.modules.projects.mapper.SubAerialImageMapper;
+import com.rtrh.projects.modules.projects.vo.SubPreFlowUnitVO;
+import com.rtrh.projects.util.HttpClientUtil;
 import com.rtrh.projects.util.TargetDataSource;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.DetachedCriteria;
@@ -39,9 +44,14 @@ public class SubAerialImageServiceImpl implements ISubAerialImageService {
 	}
 
 	@Override
-	@TargetDataSource("secondary")
+	//@TargetDataSource("secondary")
 	public List<SubAerialImage> listByFgwSubId(String subId, String type) {
-		return subAerialImageMapper.findBySubId(subId,type);
+		Object o = HttpClientUtil.fgwPostRequest("/outApi/remote/findListBySubId", new HashMap<String, String>() {{
+			put("subId", subId);
+			put("type", type);
+		}});
+		List<SubAerialImage> data = JSONObject.parseArray(o.toString(), SubAerialImage.class);
+		return data;
 	}
 
 	@Override

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

@@ -15,6 +15,7 @@ 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.SubInfoGxj;
 import com.rtrh.projects.modules.projects.service.WorkBenchService;
 import com.rtrh.projects.modules.projects.vo.*;
 import com.rtrh.projects.modules.system.po.SecUser;
@@ -1084,7 +1085,7 @@ public class SubRptContServiceImpl implements SubRptContService {
 	}
 
 	@Override
-	@TargetDataSource(value = "secondary")
+	//@TargetDataSource(value = "secondary")
 	public Page pageQueryMonthWarnData(Page page, LoginUserVO vo, PreWarnDataQueryVO queryVO) {
 		Map<String, Object> map = new HashMap<>();
 		map.put("subName", queryVO.getSubName());

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

@@ -2,10 +2,13 @@ package com.rtrh.projects.modules.system.service.impl;
 
 import java.util.*;
 
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.rtrh.common.modules.filesystem.FileSystemEnum;
+import com.rtrh.projects.modules.projects.po.SubAerialImage;
 import com.rtrh.projects.modules.system.mapper.WeekAndMonrhFileMapper;
+import com.rtrh.projects.util.HttpClientUtil;
 import com.rtrh.projects.util.TargetDataSource;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -34,9 +37,13 @@ public class WeekAndMonthFileImpl implements WeekAndMonthFileService {
     }
 
     @Override
-    @TargetDataSource("secondary")
+    //@TargetDataSource("secondary")
     public List<WeekAndMonthFile> listByMainIdFgw(String mainId) {
-        return weekAndMonrhFileMapper.listByMainId(mainId);
+        Object o = HttpClientUtil.fgwPostRequest("/outApi/remote/findListByMainId", new HashMap<String, String>() {{
+            put("mainId", mainId);
+        }});
+        List<WeekAndMonthFile> data = JSONObject.parseArray(o.toString(), WeekAndMonthFile.class);
+        return data;
     }
 
     @Override

projects/src/main/webapp/vmodules/project/monthReport.jsp

@@ -641,7 +641,7 @@
                     type: 2,
                     area: ['500px', '1000px'],
                     offset: 'auto',
-                    content: App.getUrl("/aerial/imgShow?subId=" + item.subId + "&imgId=" + item.imgId),
+                    content: App.getUrl("/aerial/imgShowFgw?subId=" + item.subId + "&imgId=" + item.imgId),
                 });
                 top.layer.full(index);
             },
@@ -708,7 +708,7 @@
             },
             getImgList: function () {
                 var self = this;
-                this.imgList = [];
+                self.imgList = [];
                 App.postJson("/api/aerial/listFgw", {subId: self.yuebaoInfo.subId, type: "0"}, function (res) {
                     if (res.success) {
                         self.imgList = res.data;