Merge remote-tracking branch 'origin/master'

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

@@ -1,10 +1,8 @@
 package cn.cslg.report.controller;
 
 import cn.cslg.report.common.core.base.Constants;
-import cn.cslg.report.entity.InvalidRecord;
 import cn.cslg.report.entity.References;
-import cn.cslg.report.service.ReferencesService;
-import cn.cslg.report.service.business.InvalidRecordService;
+import cn.cslg.report.service.business.ReferencesService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;

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

@@ -22,13 +22,13 @@ public class ReviewHistoryController {
     public final ReviewHistoryService reviewHistoryService;
     @RequestMapping(value = "/addReviewHistory", method = RequestMethod.POST)
     @Operation(summary = "增加审查历史")
-    public  String addInvalidRecord(ReviewHistory reviewHistory) throws IOException{
+    public  String addInvalidRecord(@RequestBody ReviewHistory reviewHistory) throws IOException{
         return reviewHistoryService.addReviewHistory(reviewHistory);
     }
     @RequestMapping(value = "/updateReviewHistory", method = RequestMethod.POST)
     @Operation(summary = "修改审查历史")
     @Transactional(rollbackFor = Exception.class)
-    public String updateInvalidRecord(ReviewHistory reviewHistory)throws IOException{
+    public String updateInvalidRecord(@RequestBody ReviewHistory reviewHistory)throws IOException{
         return reviewHistoryService.updateReviewHistory(reviewHistory);
 
     }

RMS/src/main/java/cn/cslg/report/entity/InvalidRecord.java

@@ -22,8 +22,9 @@ public class InvalidRecord extends BaseEntity<InvalidRecord> {
      */
      @TableField(value = "PATENT_NO")
      private String patentNo;
-
-
+    //NEWPATENT_NO
+    @TableField(value = "NEWPATENT_NO")
+    private String newPatentNo;
 
 
     /**
@@ -76,4 +77,27 @@ public class InvalidRecord extends BaseEntity<InvalidRecord> {
     @Schema(description = "所属报告ID")
     @TableField(value = "REPORT_ID")
     private String reportId;
+
+    /**
+     * 每页条数
+     */
+    @Schema(description = "每页条数")
+    @TableField(exist = false)
+    private Integer size;
+
+    /**
+     * 当前页数
+     */
+    @Schema(description = "当前页数")
+    @TableField(exist = false)
+    private Integer current;
+
+    /**
+     * 数据总数
+     */
+    @Schema(description = "数据总数")
+    @TableField(exist = false)
+    private Integer total;
+
+
 }

RMS/src/main/java/cn/cslg/report/entity/LitigationHistory.java

@@ -1,6 +1,7 @@
 package cn.cslg.report.entity;
 
 import cn.cslg.report.common.model.BaseEntity;
+import cn.cslg.report.common.model.BaseVO;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -82,5 +83,25 @@ public class LitigationHistory extends BaseEntity<LitigationHistory> {
     @Schema(description = "专利号")
     @TableField(value = "PATENT_NO")
     private String patentNo;
+    /**
+     * 每页条数
+     */
+    @Schema(description = "每页条数")
+    @TableField(exist = false)
+    private Integer size;
+
+    /**
+     * 当前页数
+     */
+    @Schema(description = "当前页数")
+    @TableField(exist = false)
+    private Integer current;
+
+    /**
+     * 数据总数
+     */
+    @Schema(description = "数据总数")
+    @TableField(exist = false)
+    private Integer total;
 
 }

RMS/src/main/java/cn/cslg/report/entity/References.java

@@ -17,7 +17,7 @@ import java.util.Date;
 @Data
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
-@TableName(value = "REFERENCES")
+@TableName(value = "PATENT_REFERENCES")
 public class References extends BaseEntity<References> {
     /**
      * 专利号
@@ -44,7 +44,8 @@ public class References extends BaseEntity<References> {
 
     @Schema(description = "创建时间")
     @TableField(value = "CREATE_TIME")
-    private Date createTime;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private String createTime;
 
 
     @Schema(description = "解释说明")
@@ -59,4 +60,25 @@ public class References extends BaseEntity<References> {
     private String fileName;
 
 
+    /**
+     * 每页条数
+     */
+    @Schema(description = "每页条数")
+    @TableField(exist = false)
+    private Integer size;
+
+    /**
+     * 当前页数
+     */
+    @Schema(description = "当前页数")
+    @TableField(exist = false)
+    private Integer current;
+
+    /**
+     * 数据总数
+     */
+    @Schema(description = "数据总数")
+    @TableField(exist = false)
+    private Integer total;
+
 }

RMS/src/main/java/cn/cslg/report/entity/ReviewHistory.java

@@ -3,9 +3,15 @@ package cn.cslg.report.entity;
 import cn.cslg.report.common.model.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
 
 /**
  * 审查历史表
@@ -18,36 +24,65 @@ public class ReviewHistory extends BaseEntity<ReviewHistory> {
     /**
      * 时间
      */
-    @TableField(value = "TIME")
-    private String time;
+    @TableField(value = "REVIEW_TIME")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date time;
 
     /**
      * 事件
      */
-    @TableField(value = "EVENT")
+    @Schema(description = "事件")
+    @TableField(value = "REVIEW_EVENT")
     private String event;
 
     /**
      * 说明
      */
-    @TableField(value = "EXPLAIN")
-    private String explain;
+    @Schema(description = "说明")
+    @TableField(value = "REVIEW_EXPLAIN")
+    private String reviewExplain;
 
     /**
      * 文件ID
      */
+    @Schema(description = "文件ID")
     @TableField(value = "FILE_ID")
-    private String fileId;
+    private Integer fileId;
 
     /**
      * 所属报告ID
      */
+    @Schema(description = "所属报告ID")
     @TableField(value = "REPORT_ID")
-    private String reportId;
+    private Integer reportId;
     /**
      * 专利号
      */
+    @Schema(description = "专利号")
     @TableField(value = "PATENT_NO")
     private String patentNo;
 
+    /**
+     * 每页条数
+     */
+    @Schema(description = "每页条数")
+    @TableField(exist = false)
+    private Integer size;
+
+    /**
+     * 当前页数
+     */
+    @Schema(description = "当前页数")
+    @TableField(exist = false)
+    private Integer current;
+
+    /**
+     * 数据总数
+     */
+    @Schema(description = "数据总数")
+    @TableField(exist = false)
+    private Integer total;
+
+
 }

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

@@ -13,8 +13,5 @@ public interface InvalidRecordMapper extends BaseMapper<InvalidRecord> {
     int deleteInvalidRecord(@Param("id") int id);
     int updateInvalidRecord(InvalidRecord invalidRecord);
     int addInvalidRecord(InvalidRecord invalidRecord);
-    /*
-    分页查询有点问题页数和页码没有确定
-     */
-    List<InvalidRecord> select(InvalidRecord invalidRecord);
+
 }

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

@@ -0,0 +1,9 @@
+package cn.cslg.report.mapper;
+
+import cn.cslg.report.entity.Template;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TemplateMapper extends BaseMapper<Template> {
+}

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

@@ -20,6 +20,7 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
@@ -228,6 +229,7 @@ public class BaseService {
     }
 
     //获得
+    @Transactional(rollbackFor = Exception.class)
     public TaskParams getImportPatentTaskParamsBro(MultipartFile file,Integer reportId) throws IOException {
         //上传文档
         UploadFileDTO fileDTO = fileUtils.uploadFile(file);
@@ -268,7 +270,7 @@ public class BaseService {
                     taskParams.setTotal(total);
                     taskParams.setIndex((int) rowIndex);
                     try {
-                 String a=       outInterfaceService.importPatents(taskParams);
+                    outInterfaceService.importPatents(taskParams);
                         WebSocketServer.sendInfo(Response.websocket(new TaskWebSocketDTO()
                                 .setTaskId(taskParams.getTaskId())
                                 .setComplete(true)

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

@@ -3,9 +3,12 @@ package cn.cslg.report.service.business;
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.entity.ImportTask;
 import cn.cslg.report.entity.InvalidRecord;
+import cn.cslg.report.entity.LitigationHistory;
 import cn.cslg.report.mapper.ImportTaskMapper;
 import cn.cslg.report.mapper.InvalidRecordMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -13,11 +16,12 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
+import java.util.List;
 
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
-public class InvalidRecordService  extends ServiceImpl<InvalidRecordMapper,InvalidRecord> {
+public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, InvalidRecord> {
     public final InvalidRecordMapper invalidRecordMapper;
 
     public String deleteInvalidRecord(int id) throws IOException {
@@ -35,11 +39,18 @@ public class InvalidRecordService  extends ServiceImpl<InvalidRecordMapper,Inval
         return Response.success();
     }
 
-    public String queryInvalidRecord(InvalidRecord invalidRecord){
-        LambdaQueryWrapper<InvalidRecord> wrapper =new LambdaQueryWrapper<>();
-        wrapper.eq(InvalidRecord::getPatentNo,invalidRecord.getPatentNo());
-       return Response.success(this.list(wrapper));
+    public String queryInvalidRecord(InvalidRecord invalidRecord) {
+        LambdaQueryWrapper<InvalidRecord> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(InvalidRecord::getPatentNo, invalidRecord.getPatentNo());
+        if (invalidRecord.getSize() != null && invalidRecord.getSize() != null) {
+            IPage<InvalidRecord> pages = this.page(new Page<>(invalidRecord.getCurrent(), invalidRecord.getSize()), wrapper);
+            return Response.success(pages);
+        } else {
+            List<InvalidRecord> invalidRecords = this.list(wrapper);
+            return Response.success(invalidRecords);
+        }
     }
 
 
-}
+    }
+

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

@@ -1,48 +1,55 @@
 package cn.cslg.report.service.business;
 
+import cn.cslg.report.common.utils.DataUtils;
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.entity.ImportTask;
 import cn.cslg.report.entity.LitigationHistory;
+import cn.cslg.report.entity.Report;
 import cn.cslg.report.mapper.ImportTaskMapper;
 import cn.cslg.report.mapper.LitigationHistoryMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import java.io.IOException;
+import java.util.List;
 
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class LitigationHistoryService extends ServiceImpl<LitigationHistoryMapper, LitigationHistory> {
     public final LitigationHistoryMapper litigationHistoryMapper;
-    public String deleteLitigationHistory(int id)throws IOException{
+    public String deleteLitigationHistory(int id){
         this.removeById(id);
        return Response.success();
 
     }
-    public String addLitigationHistory(LitigationHistory litigationHistory)throws IOException{
+    public String addLitigationHistory(LitigationHistory litigationHistory){
         litigationHistory.insert();
         return Response.success();
 
 
 
     }
-    public String updateLitigationHistory(LitigationHistory litigationHistory)throws IOException{
+    public String updateLitigationHistory(LitigationHistory litigationHistory){
         litigationHistory.updateById();
         return Response.success();
 
     }
-    public String queryLitigationHistory(LitigationHistory litigationHistory)throws IOException{
+    public String queryLitigationHistory(LitigationHistory litigationHistory){
         LambdaQueryWrapper<LitigationHistory> wrapper =new LambdaQueryWrapper<>();
                wrapper.eq(LitigationHistory::getPatentNo,litigationHistory.getPatentNo());
-
-
-
-        return Response.success(this.list(wrapper));
-
+        if (litigationHistory.getSize() != null && litigationHistory.getSize() != null) {
+            IPage<LitigationHistory> pages = this.page(new Page<>(litigationHistory.getCurrent(), litigationHistory.getSize()), wrapper);
+            return Response.success(pages);
+        } else {
+            List<LitigationHistory>  histories= this.list(wrapper);
+            return Response.success(histories);
+        }
     }
 
 }

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

@@ -1,11 +1,14 @@
-package cn.cslg.report.service;
+package cn.cslg.report.service.business;
 
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.entity.InvalidRecord;
 import cn.cslg.report.entity.References;
+import cn.cslg.report.entity.ReviewHistory;
 import cn.cslg.report.mapper.InvalidRecordMapper;
 import cn.cslg.report.mapper.ReferencesMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -13,6 +16,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
+import java.util.List;
 
 @Service
 @Slf4j
@@ -38,7 +42,13 @@ public class ReferencesService extends ServiceImpl<ReferencesMapper, References>
     public String queryReferences(References references){
         LambdaQueryWrapper<References> wrapper =new LambdaQueryWrapper<>();
         wrapper.eq(References::getPatentNo,references.getPatentNo());
-       return Response.success(this.list(wrapper));
+        if (references.getSize() != null && references.getSize() != null) {
+            IPage<References> pages = this.page(new Page<>(references.getCurrent(), references.getSize()), wrapper);
+            return Response.success(pages);
+        } else {
+            List<References> referencesList= this.list(wrapper);
+            return Response.success(referencesList);
+        }
     }
 
 

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

@@ -6,6 +6,8 @@ import cn.cslg.report.entity.ReviewHistory;
 import cn.cslg.report.mapper.InvalidRecordMapper;
 import cn.cslg.report.mapper.ReviewHistoryMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -13,6 +15,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
+import java.util.List;
 
 @Service
 @Slf4j
@@ -37,7 +40,13 @@ public class ReviewHistoryService extends ServiceImpl<ReviewHistoryMapper, Revie
     public String queryReviewHistory(ReviewHistory reviewHistory){
         LambdaQueryWrapper<ReviewHistory> wrapper =new LambdaQueryWrapper<>();
         wrapper.eq(ReviewHistory::getPatentNo,reviewHistory.getPatentNo());
-       return Response.success(this.list(wrapper));
+        if (reviewHistory.getSize() != null && reviewHistory.getSize() != null) {
+            IPage<ReviewHistory> pages = this.page(new Page<>(reviewHistory.getCurrent(), reviewHistory.getSize()), wrapper);
+            return Response.success(pages);
+        } else {
+            List<ReviewHistory> reviewHistories= this.list(wrapper);
+            return Response.success(reviewHistories);
+        }
     }
 
 

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

@@ -0,0 +1,30 @@
+package cn.cslg.report.service.business;
+
+import cn.cslg.report.common.utils.Response;
+import cn.cslg.report.entity.InvalidRecord;
+import cn.cslg.report.entity.Template;
+import cn.cslg.report.mapper.InvalidRecordMapper;
+import cn.cslg.report.mapper.TemplateMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.util.List;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
+public class TemplateService extends ServiceImpl<TemplateMapper, Template> {
+     public String getTemplateByType() {
+       return  Response.success();
+
+     }
+
+
+}

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

@@ -1,48 +1,48 @@
 <?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.InvalidRecordMapper">
-<!--    int deleteInvalidRecord(@Param("id") int id);-->
-    <delete id="deleteInvalidRecord">
-        delete from INVALID_RECORD where ID=#{id}
-    </delete>
-    <update id="updateInvalidRecord">
-     update INVALID_RECORD set
-         PATENT_NO=#{patentNo},PERSON=#{person},PERSON_ID=#{personId},INVALID_TIME={invalidTime},JUDGMENT_TIME=#{judgmentTime},RESULT=#{resultS},FILE_ID=#{fileId},REPORT_ID=#{reportId}
-       where ID=#{id}
-    </update>
-<!--    int addInvalidRecord(InvalidRecord invalidRecord);-->
-    <insert id="addInvalidRecord" parameterType="cn.cslg.report.entity.InvalidRecord" keyProperty="ID">
-        insert into INVALID_RECORD (PATENT_NO,PERSON,PERSON_ID,INVALID_TIME,JUDGMENT_TIME,`RESULT`,FILE_ID,REPORT_ID)
-        values(#{patentNo},#{person},#{personId},#{invalidTime},#{judgmentTime},#{resultS},#{fileId},#{reportId})
-    </insert>
-    <select id="select" resultType="cn.cslg.report.entity.InvalidRecord">
-        <bind name="n" value="(pageNO-1)pageSize"/>
-          select * from INVALID_RECORD
-        <where>
-            <if test="patentNo !='' and patentNo !=null">
-                PATENT_NO like concat('%', #{patentNo}, '%')
-            </if>
-            <if test="person !='' and person !=null">
-                and PERSON like concat('%', #{person}, '%')
-            </if>
-            <if test="personId !='' and personId !=null">
-                and PERSON_ID like concat('%', #{personId}, '%')
-            </if>
-            <if test="invalidTime !='' and invalidTime !=null">
-                and INVALID_TIME like concat('%', #{invalidTime}, '%')
-            </if>
-            <if test="judgmentTime !='' and judgmentTime !=null">
-                and `JUDGMENT_TIME` like concat('%', #{judgmentTime}, '%')
-            </if>
-            <if test="resultS !='' and resultS !=null">
-                and `RESULT` like concat('%', #{resultS}, '%')
-            </if>
-            <if test="caseDetails !='' and caseDetails !=null">
-                and CASE_DETAILS like concat('%', #{caseDetails}, '%')
-            </if>
-            <if test="fileId !='' and fileId !=null">
-                and FILE_ID like concat('%', #{fileId}, '%')
-            </if>
-        </where>
-    </select>
+<delete id="deleteInvalidRecord">
+    delete from INVALID_RECORD where ID=#{id}
+</delete>
+
+<update id="updateInvalidRecord">
+update INVALID_RECORD set
+PATENT_NO=#{patentNo},PERSON=#{person},PERSON_ID=#{personId},INVALID_TIME={invalidTime},JUDGMENT_TIME=#{judgmentTime},`RESULT`=#{resultS},FILE_ID=#{fileId},REPORT_ID=#{reportId}
+where ID=#{id}
+</update>
+
+<insert id="addInvalidRecord" >
+insert into INVALID_RECORD (PATENT_NO,PERSON,PERSON_ID,INVALID_TIME,JUDGMENT_TIME,`RESULT`,FILE_ID,REPORT_ID)
+values(#{patentNo},#{person},#{personId},#{invalidTime},#{judgmentTime},#{resultS},#{fileId},#{reportId})
+</insert>
+<select id="select" resultType="cn.cslg.report.entity.InvalidRecord">
+<bind name="n" value="(pageNO-1)pageSize"/>
+select * from INVALID_RECORD
+<where>
+    <if test="patentNo !='' and patentNo !=null">
+        PATENT_NO like concat('%', #{patentNo}, '%')
+    </if>
+    <if test="person !='' and person !=null">
+        and PERSON like concat('%', #{person}, '%')
+    </if>
+    <if test="personId !='' and personId !=null">
+        and PERSON_ID like concat('%', #{personId}, '%')
+    </if>
+    <if test="invalidTime !='' and invalidTime !=null">
+        and INVALID_TIME like concat('%', #{invalidTime}, '%')
+    </if>
+    <if test="judgmentTime !='' and judgmentTime !=null">
+        and `JUDGMENT_TIME` like concat('%', #{judgmentTime}, '%')
+    </if>
+    <if test="resultS !='' and resultS !=null">
+        and `RESULT` like concat('%', #{resultS}, '%')
+    </if>
+    <if test="caseDetails !='' and caseDetails !=null">
+        and CASE_DETAILS like concat('%', #{caseDetails}, '%')
+    </if>
+    <if test="fileId !='' and fileId !=null">
+        and FILE_ID like concat('%', #{fileId}, '%')
+    </if>
+</where>
+</select>
 </mapper>

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

@@ -1,50 +0,0 @@
-<?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.LitigationHistoryMapper">
-<!--    int deleLitigationHistory(@Param("id") int id);-->
-    <delete id="deleLitigationHistory">
-        delete from LITIGATION_HISTORY where ID=#{id}
-    </delete>
-<!--    int addLitigationHistory(LitigationHistory litigationHistory);-->
-    <insert id="addLitigationHistory" parameterType="cn.cslg.report.entity.LitigationHistory" keyProperty="ID" >
-        insert into LITIGATION_HISTORY(PLAINTIFF,DEFENDANT,CAUSE_OF_ACTION,PROSECUTORIAL_TIME,`RESULT`,CASE_DETAILS,FILE_ID)
-            values (plaintiff,defendant,causeOfAction,prosecutorialTime,`result`,caseDetails,fileId)
-    </insert>
-<!--    int updateLitigationHistory(LitigationHistory litigationHistory);-->
-    <update id="updateLitigationHistory" parameterType="cn.cslg.report.entity.LitigationHistory">
-        update LITIGATION_HISTORY set PLAINTIFF=#{plaintiff},
-                                     DEFENDANT=#{defendant},
-                                     CAUSE_OF_ACTION=#{causeOfAction},
-                                     `RESULT`=#{result},
-                                     CASE_DETAILS=#{caseDetails}
-                                       FILE_IDFILE_ID=#{fileId}
-    </update>
-    <select id="select" resultType="cn.cslg.report.entity.LitigationHistory">
-        <bind name="n" value="(pageNO-1)pageSize"/>
-          select * from LITIGATION_HISTORY
-              <where>
-                  <if test="plaintiff !='' and plaintiff !=null">
-                      PLAINTIFF like concat('%', #{plaintiff}, '%')
-                  </if>
-                  <if test="defendant !='' and defendant !=null">
-                      and DEFENDANT like concat('%', #{defendant}, '%')
-                  </if>
-                  <if test="causeOfAction !='' and causeOfAction !=null">
-                      and CAUSE_OF_ACTION like concat('%', #{causeOfAction}, '%')
-                  </if>
-                  <if test="prosecutorialTime !='' and prosecutorialTime !=null">
-                      and PROSECUTORIAL_TIME like concat('%', #{prosecutorialTime}, '%')
-                  </if>
-                  <if test="result !='' and result !=null">
-                      and `RESULT` like concat('%', #{result}, '%')
-                  </if>
-                  <if test="caseDetails !='' and caseDetails !=null">
-                      and CASE_DETAILS like concat('%', #{caseDetails}, '%')
-                  </if>
-                  <if test="fileId !='' and fileId !=null">
-                      and FILE_ID like concat('%', #{fileId}, '%')
-                  </if>
-              </where>
-        limit #{n},#{pageSize}
-    </select>
-</mapper>