Merge remote-tracking branch 'origin/dev2' into dev2

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

RMS/pom.xml

@@ -47,11 +47,6 @@
             <version>${poi-tl.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-            <version>3.5.2</version>
-        </dependency>
-        <dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-spring-boot-starter</artifactId>
             <version>${sa-token.version}</version>

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

@@ -33,14 +33,14 @@ public class AssoReportPersonController {
     @Operation(summary = "添加分享人")
     @PostMapping("/add")
     public String add(@RequestBody ShareReportDTO shareReportDTO) {
-     Integer flag =   assoReportPersonService.shareReport(shareReportDTO);
+        Integer flag = assoReportPersonService.shareReport(shareReportDTO);
         return Response.success(flag);
     }
 
     @Operation(summary = "删除分享人")
     @PostMapping("/remove")
     public String remove(@RequestBody ShareReportDTO shareReportDTO) {
-assoReportPersonService.removeShare(shareReportDTO);
+        assoReportPersonService.removeShare(shareReportDTO);
         return Response.success();
     }
 

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

@@ -21,13 +21,13 @@ import java.io.IOException;
 public class AssoTaskPersonelController {
     public final AssoTaskPersonelService assoTaskPersonelService;
     private final LoginUtils loginUtils;
+
     @PostMapping("/getPartClient")
     @Operation(summary = "分页获取对比专利")
-    public String getPagination(@RequestBody PatentVO patentVO)throws IOException{
-        String res =assoTaskPersonelService.pagination(patentVO);
+    public String getPagination(@RequestBody PatentVO patentVO) throws IOException {
+        String res = assoTaskPersonelService.pagination(patentVO);
         return res;
     }
 
 
-
 }

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

@@ -100,9 +100,9 @@
     <select id="query" resultMap="queryMap">
         SELECT a.ID, a.REPORT_ID, a.PARENT_ID, a.FOLLOW_UP_NAME,a.REMARK,a.TIME_LIMIT,a.AGENT,a.ASSIST_PERSON,a.FINISH_TIME,a.STATUS, a.CONCLUSION,
                a.CREATE_PERSON_ID, a.CREATE_PERSON_NAME, a.CREATE_TIME, d.FILE_ID, d.NAME, d.ADDRESS, d.ZID,d.FILEREMARK, d.UPDATE_TIME, d.UID,d.TYPE, d.SIZE, d.SUFFIX, d.FILE_NAME
-        FROM FOLLOW_UP a LEFT JOIN (SELECT b.follow_up_id, b.FILE_ID, c.ID, c.NAME, c.ADDRESS, c.ZID, c.REMARK AS FILEREMARK, c.UPDATE_TIME, c.UID, c.TYPE, c.SIZE, c.SUFFIX, c.FILE_NAME
+        FROM FOLLOW_UP a LEFT JOIN (SELECT b.FOLLOW_UP_ID, b.FILE_ID, c.ID, c.NAME, c.ADDRESS, c.ZID, c.REMARK AS FILEREMARK, c.UPDATE_TIME, c.UID, c.TYPE, c.SIZE, c.SUFFIX, c.FILE_NAME
                                     FROM ASSO_FOLLOW_UP_FILE b LEFT JOIN REPORT_FILE c ON b.FILE_ID = c.ID) d
-                                   ON a.ID = d.FOLLOW_UP_ID
+                                    ON a.ID = d.FOLLOW_UP_ID
         WHERE a.REPORT_ID = #{reportId} ORDER BY CREATE_TIME DESC
     </select>