Merge remote-tracking branch 'origin/master'

RMS/src/main/java/cn/cslg/report/mapper/AssoTaskPersonelMapper.java

@@ -10,6 +10,6 @@ import java.util.List;
 @Mapper
 public interface AssoTaskPersonelMapper extends BaseMapper<AssoTaskPersonel> {
 
-    public List<String> getPatentNumber(@Param("personelId")int personelId ,@Param("state")int  state,@Param("taskId")int taskId);
+//    public List<String> getPatentNumber(@Param("personelId")int personelId ,@Param("state")int  state,@Param("taskId")int taskId);
 
 }

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

@@ -36,7 +36,7 @@ import java.util.Objects;
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class AssoTaskPersonelService extends ServiceImpl<AssoTaskPersonelMapper, AssoTaskPersonel> {
-   public final  AssoTaskPersonelMapper assoTaskPersonelMapper ;
+//   public final  AssoTaskPersonelMapper assoTaskPersonelMapper ;
     public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
     @Value("${PCSUrl}")
     private String PCSUrl;
@@ -51,18 +51,19 @@ public class AssoTaskPersonelService extends ServiceImpl<AssoTaskPersonelMapper,
         return Response.success();
     }
     public String pagination(int personelId , int  state, int taskId,int location)throws IOException{
-        List<String> patentNumber = assoTaskPersonelMapper.getPatentNumber(personelId, state, taskId);
-   Map<String,Object> map =new HashMap<>();
-//   map.put("patentNos",patentNumber);
-   map.put("startNumber",location);
-        JSONObject json = new JSONObject(map);
-           RequestBody requestBody =RequestBody.create(JSON,String.valueOf(json));
-        OkHttpClient okHttpClient = new OkHttpClient();
-        Request request = new Request.Builder()
-                .url(PASUrl + "/api/v2/patent/getPagination")
-                .post(requestBody)
-                .build();
-        return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
+        return null;
+//        List<String> patentNumber = assoTaskPersonelMapper.getPatentNumber(personelId, state, taskId);
+//   Map<String,Object> map =new HashMap<>();
+////   map.put("patentNos",patentNumber);
+//   map.put("startNumber",location);
+//        JSONObject json = new JSONObject(map);
+//           RequestBody requestBody =RequestBody.create(JSON,String.valueOf(json));
+//        OkHttpClient okHttpClient = new OkHttpClient();
+//        Request request = new Request.Builder()
+//                .url(PASUrl + "/api/v2/patent/getPagination")
+//                .post(requestBody)
+//                .build();
+//        return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
 
     }
 

RMS/src/main/resources/mapper/CompareRecordsMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="cn.cslg.report.mapper.CompareRecordsMapper">
-    <insert id="add">
+    <insert id="add" parameterType="cn.cslg.report.entity.CompareRecords" keyProperty="ID">
         insert into COMPARE_RECORDS (PATENT_NO,POSITION,CONTENT,FEATURES_ID,FEATURES,PERSON_ID,REPORT_ID)
          values(#{patentNo},#{position},#{content},#{featuresId},#{features},#{personId},#{reportId})