4/9

PAS/src/main/java/cn/cslg/pas/service/IProductMarketDataService.java

@@ -3,6 +3,8 @@ package cn.cslg.pas.service;
 import cn.cslg.pas.common.JsonPage;
 import cn.cslg.pas.common.model.dto.*;
 import cn.cslg.pas.common.model.vo.ProductMarketDataTrendVO;
+import cn.cslg.pas.domain.ProductMarketData;
+import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
@@ -13,7 +15,7 @@ import java.util.List;
  * @Author chenyu
  * @Date 2023/3/9
  */
-public interface IProductMarketDataService {
+public interface IProductMarketDataService extends IService<ProductMarketData> {
     /**
      * 新增产品营销数据
      *

PAS/src/main/java/cn/cslg/pas/service/IStructureService.java

@@ -6,6 +6,8 @@ import cn.cslg.pas.common.model.dto.StructureQueryPageDTO;
 import cn.cslg.pas.common.model.dto.StructureUpdateDTO;
 import cn.cslg.pas.common.model.vo.PathStructureNameVO;
 import cn.cslg.pas.common.model.vo.StructureVO;
+import cn.cslg.pas.domain.Structure;
+import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -18,7 +20,7 @@ import java.util.Map;
  * @Author chenyu
  * @Date 2023/3/10
  */
-public interface IStructureService {
+public interface IStructureService extends IService<Structure> {
     /**
      * 新增架构
      *

PAS/src/main/java/cn/cslg/pas/service/PatentFieldService.java

@@ -21,7 +21,7 @@ import java.util.stream.Collectors;
 
 /**
  * <p>
- *  系统字段 服务类
+ * 系统字段 服务类
  * </p>
  *
  * @author 王岩
@@ -54,7 +54,6 @@ public class PatentFieldService {
     }
 
 
-
     public List<PatentField> getUserSetting(SystemFieldVO params) {
         if (params.getRefresh() != null && params.getRefresh()) {
             cacheUtils.deleteUserSystemFieldSetting(params.getProjectId(), params.getType(), params.getView(), 3);
@@ -82,7 +81,7 @@ public class PatentFieldService {
         dataList.forEach(item -> {
             PatentField setting = finalUserSetting.stream().filter(patentField -> patentField.getKey().equals(item.getKey())).findFirst().orElse(null);
             item.setHidden(setting == null);
-            item.setOrder(setting == null ? 0 :setting.getOrder());
+            item.setOrder(setting == null ? 0 : setting.getOrder());
         });
         return dataList.stream().sorted(Comparator.comparing(PatentField::getOrder)).collect(Collectors.toList());
     }
@@ -249,12 +248,12 @@ public class PatentFieldService {
 
     //获得专题库的所有自定义字段
     //获得自定义字段列表
-    public  List<ProjectField> getPageList(Integer projectId) {
+    public List<ProjectField> getPageList(Integer projectId) {
         LambdaQueryWrapper<ProjectField> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(ProjectField::getProjectId,projectId);
+        queryWrapper.eq(ProjectField::getProjectId, projectId);
         queryWrapper.orderByDesc(ProjectField::getId);
-            List<ProjectField> projectFields = projectFieldService.list(queryWrapper);
-            return projectFields;
+        List<ProjectField> projectFields = projectFieldService.list(queryWrapper);
+        return projectFields;
 
     }
 }

PAS/src/main/resources/mapper/PatentMapper.xml

@@ -171,7 +171,7 @@
                 and b.zid = #{params.projectId}
             </if>
             <if test="params.importTaskId != null and params.projectId == null">
-               and a.patentno in
+                and a.patentno in
                 ( select PATENT_NO from ASSO_IMPORTTASK_PATENT where IMPORTTASK_ID in
                 <foreach item="item" collection="params.importTaskId" index="index" open="(" separator=","
                          close=") ">
@@ -179,17 +179,17 @@
                 </foreach>
                 )
             </if>
-        <if test="params.importTaskId != null and params.projectId != null">
-            and (b.zid = #{params.projectId} or
-            a.patentno in
-            ( select PATENT_NO from ASSO_IMPORTTASK_PATENT where IMPORTTASK_ID in
-            <foreach item="item" collection="params.importTaskId" index="index" open="(" separator=","
-                     close=") ">
-                #{item}
-            </foreach>
-            )
-            )
-        </if>
+            <if test="params.importTaskId != null and params.projectId != null">
+                and (b.zid = #{params.projectId} or
+                a.patentno in
+                ( select PATENT_NO from ASSO_IMPORTTASK_PATENT where IMPORTTASK_ID in
+                <foreach item="item" collection="params.importTaskId" index="index" open="(" separator=","
+                         close=") ">
+                    #{item}
+                </foreach>
+                )
+                )
+            </if>
             <if test="params.projectId == null and params.projectId == null">
                 and 1 !=1
             </if>
@@ -1273,8 +1273,8 @@
         by
         `${orderBy}`
         desc,
-        `value`
-        asc
+            `value`
+            asc
     </sql>
 
     <select id="getListForRMS" resultType="java.lang.String">
@@ -1531,10 +1531,10 @@
                     </if>
 
                     <if test="params.applicationName !=null and params.applicationName !=''  ">
-                        and c.name  REGEXP #{params.applicationName}
+                        and c.name REGEXP #{params.applicationName}
                     </if>
                     <if test="params.obligeeName !=null and params.obligeeName!=''">
-                        and e.name  REGEXP #{params.obligeeName}
+                        and e.name REGEXP #{params.obligeeName}
                     </if>
                     <if test="params.numberIpc !=null and params.numberIpc!=''">
                         and f.code like concat("%", #{params.numberIpc}, "%")
@@ -1546,7 +1546,7 @@
                         and h.code like concat("%", #{params.numberUpc}, "%")
                     </if>
                     <if test="params.patentNo !=null and params.patentNo !=''">
-                        and a.patentNo REGEXP  #{params.patentNo}
+                        and a.patentNo REGEXP #{params.patentNo}
                     </if>
                     <if test="params.applicationNo !=null and params.applicationNo !=''">
                         and a.applicationNo like concat("%", #{params.applicationNo}, "%")
@@ -1561,9 +1561,9 @@
                         and (
                         <foreach item="item" collection="params.PasOptions" index="index" open="(" separator="or"
                                  close=")">
-                        <if test="item.key !=null">
-                             (j.cid=#{item.fieldId} and j.fid =#{item.key})
-                        </if>
+                            <if test="item.key !=null">
+                                (j.cid=#{item.fieldId} and j.fid =#{item.key})
+                            </if>
                             <if test="item.key ==null">
                                 (j.cid is null or j.cid !=#{item.fieldId})
                             </if>
@@ -1745,13 +1745,13 @@
         from os_patent a
         <where>
             <if test="patentNo != null and patentNo.size!=0">
-                 patentno in
+                patentno in
                 <foreach item="item" collection="patentNo" index="index" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
             <if test="patentNo == null or patentNo.size==0">
-              1!=1
+                1!=1
             </if>
             <if test="n!=-1 and p!=-1">
                 limit #{n},#{p}