Merge remote-tracking branch 'origin/master'

RMS/src/main/java/cn/cslg/report/controller/AssoTaskPersonelController.java

@@ -7,6 +7,7 @@ import cn.cslg.report.service.business.AssoTaskPersonelService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
 
@@ -17,8 +18,9 @@ import java.io.IOException;
 @RequestMapping(Constants.REPORT_API + "/AssoTaskPersonel")
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class AssoTaskPersonelController {
-
+    @Autowired
     public final AssoTaskPersonelService assoTaskPersonelService;
+    @Autowired
     private  final LoginUtils loginUtils;
     @GetMapping("/getPartClient")
     @Operation(summary = "分页获取对比专利")

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

@@ -20,6 +20,7 @@ import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -36,7 +37,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;

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

@@ -1,9 +1,8 @@
 <?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.AssoTaskPersonelMapper">
-<!--     public List<String> getPatentNumber(@Param("personelId")int personelId ,@Param("state")int  state,@Param("taskId")int taskId);;-->
-    <select id="getPatentNumber" resultType="String">
-        select PATENT_NO as patentNo from ASSO_TASK_PERSONEL
+    <select id="getPatentNumber" resultType="java.lang.String">
+        select PATENT_NO  from ASSO_TASK_PERSONEL
        where PERSON_ID=#{personelId} and STATE=#{state} and TASK_ID=#{taskId}
     </select>