客户模块 2/27 lrj

RMS/src/main/java/cn/cslg/report/common/model/vo/ClientVO.java

@@ -0,0 +1,47 @@
+package cn.cslg.report.common.model.vo;
+
+
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+/**
+ * <p>
+ * 委托方表
+ * </p>
+ *
+ * @author 王岩
+ * @since 2022-02-17
+ */
+@Data
+
+public class ClientVO {
+
+    private Integer id;
+
+    /**
+     * 委托方名称
+     */
+
+    private String name;
+
+
+    /**
+     * 客户负责人
+     */
+    private Integer personnelId;
+
+
+
+    private Integer tenantId;
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+    @TableField(exist = false)
+    private String personnelName;
+
+}

RMS/src/main/java/cn/cslg/report/service/OutInterfaceService.java

@@ -308,12 +308,13 @@ public class OutInterfaceService {
         return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
     }
 
-    public String getClientNameFromPAS(List<Integer> ids) throws IOException {
+    public String getClientNameFromPCS(List<Integer> ids) throws IOException {
         OkHttpClient okHttpClient = new OkHttpClient();
         String param = new Gson().toJson(ids);
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
         Request request = new Request.Builder()
-                .url(PASUrl + "/api/v2/system/getClientsByIds")
+                .url(PCSUrl + "/permission/api/client/getByIds")
+                .addHeader("Cookie", LoginUtils.getToken())
                 .post(requestBody)
                 .build();
         return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
@@ -404,7 +405,11 @@ public class OutInterfaceService {
         map.put("numberUpc",patentVO.getNumberUpc());
         JSONObject json = new JSONObject(map);
         RequestBody requestBody = RequestBody.create(JSON, String.valueOf(json));
-        OkHttpClient okHttpClient = new OkHttpClient();
+        OkHttpClient okHttpClient = new OkHttpClient.Builder()
+                .connectTimeout(60, TimeUnit.SECONDS)
+                .writeTimeout(60, TimeUnit.SECONDS)
+                .readTimeout(60, TimeUnit.SECONDS)
+                .build();
         Request request = new Request.Builder()
                 .url(PASUrl + "/api/v2/system/getConPantentNos")
                 .post(requestBody)
@@ -417,7 +422,12 @@ public class OutInterfaceService {
       map.put("patentNos", patentVO.getPatentNos());
       JSONObject json = new JSONObject(map);
       RequestBody requestBody = RequestBody.create(JSON, String.valueOf(json));
-      OkHttpClient okHttpClient = new OkHttpClient();
+      OkHttpClient okHttpClient = new OkHttpClient
+              .Builder()
+              .connectTimeout(60, TimeUnit.SECONDS)
+              .writeTimeout(60, TimeUnit.SECONDS)
+              .readTimeout(60, TimeUnit.SECONDS)
+              .build();
       Request request = new Request.Builder()
               .url(PASUrl + "/api/v2/system/getPatentDTOListForRMS")
               .post(requestBody)

RMS/src/main/java/cn/cslg/report/service/business/ReportFieldService.java

@@ -641,7 +641,8 @@ public class ReportFieldService extends ServiceImpl<ReportFieldMapper, ReportFie
             LambdaQueryWrapper<ReportFieldPatentLink> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(ReportFieldPatentLink::getFieldId, params.getFieldId());
             if (valueIds != null && valueIds.size() > 0) {
-                lambdaQueryWrapper.in(ReportFieldPatentLink::getOptionId, valueIds);
+                lambdaQueryWrapper.in(ReportFieldPatentLink::getOptionId, valueIds)
+                                  .eq(ReportFieldPatentLink::getFieldId,params.getFieldId());
             }
             List<ReportFieldPatentLink> reportFieldPatentLinks = reportFieldPatentLinkService.list(lambdaQueryWrapper);
             if (reportFieldPatentLinks.size() == 0) {

RMS/src/main/java/cn/cslg/report/service/business/ReportService.java

@@ -1,6 +1,7 @@
 package cn.cslg.report.service.business;
 
 import cn.cslg.report.common.core.base.Constants;
+import cn.cslg.report.common.model.vo.ClientVO;
 import cn.cslg.report.common.model.vo.PersonnelVO;
 import cn.cslg.report.common.model.vo.ReportVO;
 import cn.cslg.report.common.model.vo.SystemDictVO;
@@ -192,10 +193,10 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
             mapDeparts = JSONObject.parseArray(res2);
         }
         //根据客户Id 获得客户信息
-        List<Map<String, Object>> mapClients = new ArrayList<>();
+        List<ClientVO> mapClients = new ArrayList<>();
         if (clientIds.size() != 0) {
-            String res3 = outInterfaceService.getClientNameFromPAS(clientIds);
-            mapClients = JSONObject.parseArray(res3);
+            String res3 = outInterfaceService.getClientNameFromPCS(clientIds);
+            mapClients = JSONObject.parseArray(res3,ClientVO.class);
         }
         //过滤报告
         for (Report item : reports) {
@@ -215,10 +216,11 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
                 item.setClientId(0);
             }
             //装载客户
-            List<Map<String, Object>> mapClient = mapClients.stream().filter(tem -> tem.get("clientId").toString().equals(item.getClientId().toString())).collect(Collectors.toList());
-            if (mapClient.size() != 0) {
-                item.setClientName(mapClient.get(0).get("clientName").toString());
-            }
+      for(ClientVO clientVO :mapClients){
+          if(clientVO.getId().equals(item.getClientId())) {
+              item.setClientName(clientVO.getName());
+          }
+      }
             //装载报告应用场景
             if (StringUtils.isNotEmpty(item.getScenarioId())) {
                 item.setScenarioList(StringUtils.changeStringToString(item.getScenarioId(), ","));