fixed

src/main/java/cn/cslg/pas/common/dto/QueryCompareFileDTO.java

@@ -0,0 +1,13 @@
+package cn.cslg.pas.common.dto;
+
+import lombok.Data;
+
+@Data
+public class QueryCompareFileDTO {
+
+    private Integer projectId;
+
+    private Long current;
+
+    private Long size;
+}

src/main/java/cn/cslg/pas/common/vo/QueryCompareFileVO.java

@@ -0,0 +1,83 @@
+package cn.cslg.pas.common.vo;
+
+import lombok.Data;
+import org.joda.time.DateTime;
+
+import java.util.Date;
+
+@Data
+public class QueryCompareFileVO {
+
+    private Integer compareLitertureId;
+
+    private Integer compareFileId;
+
+    /**
+     * 对比记录id
+     */
+    private Integer retrieveRecordId;
+
+    private Integer projectId;
+
+    private String literatureNo;
+
+    private String literatureRemark;
+
+    private Integer state;
+
+    private String name;
+
+    private Integer type;
+
+    private Integer sysOrder;
+
+    private String description;
+
+    private Boolean ifApproval;
+
+    private String createId;
+
+    private DateTime createTime;
+
+    private String authorName;
+
+    private Date publicDate;
+
+    private Date appDate;
+
+    /**
+     * 相关度
+     */
+    private String relevance;
+
+    /**
+     * 影响新创新
+     */
+    private Integer ifEffectinv;
+
+    /**
+     *  备注
+     */
+    private String fileRemark;
+
+    /**
+     * 总说明
+     */
+    private String generalRemark;
+
+    /**
+     * 现有技术要点
+     */
+    private String technicalPoints;
+
+    /**
+     * 实施方案
+     */
+    private String excuteCase;
+
+    /**
+     * 有益效果
+     */
+    private String beneficialEffect;
+}
+

src/main/java/cn/cslg/pas/controller/NoveltyProjectController.java

@@ -6,6 +6,7 @@ import cn.cslg.pas.common.dto.NoveltyProjectDTO.QueryTemplateDTO;
 import cn.cslg.pas.common.model.cronModel.Records;
 import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.common.vo.NoveltyProjectVO.QueryTemplateVO;
+import cn.cslg.pas.common.vo.QueryCompareFileVO;
 import cn.cslg.pas.common.vo.QueryInventionPointVO;
 import cn.cslg.pas.common.vo.QueryNoveltyProjectVO;
 import cn.cslg.pas.common.vo.TechnicalCaseVO;
@@ -132,7 +133,7 @@ public class NoveltyProjectController {
         return Response.success(inventionPointVOS);
     }
 
-    @Operation(summary = "添加或更新技术方案信息")
+    @Operation(summary = "添加对比文件")
     @PostMapping("/addCompareFile")
     public Response addCompareFile(@RequestBody AddCompareFileDTO fileDTO) throws Exception {
         Integer compareFileId = null;
@@ -145,7 +146,7 @@ public class NoveltyProjectController {
         return Response.success(compareFileId);
     }
 
-    @Operation(summary = "添加或更新技术方案信息")
+    @Operation(summary = "更新对比文件")
     @PostMapping("/editCompareFile")
     public Response editCompareFile(@RequestBody AddCompareFileDTO fileDTO) throws Exception {
         Integer compareFileId = null;
@@ -157,20 +158,20 @@ public class NoveltyProjectController {
         return Response.success(compareFileId);
     }
 
-    @Operation(summary = "查询技术方案信息")
+    @Operation(summary = "查询查新报告对比专利")
     @PostMapping("/queryCompareFile")
-    public Response queryCompareFile(@RequestBody TechnicalCaseIdDTO caseIdDTO) throws Exception {
-        TechnicalCaseVO caseVO = new TechnicalCaseVO();
+    public Response queryCompareFile(@RequestBody QueryCompareFileDTO fileDTO) throws Exception {
+        List<QueryCompareFileVO> queryCompareFileVOS = new ArrayList<>();
         try {
-            caseVO = technicalCaseService.queryTechnicalCase(caseIdDTO);
+            queryCompareFileVOS = noveltyCompareLiteratureService.queryCompareFile(fileDTO);
         } catch (Exception e) {
             return Response.error(e.getMessage());
         }
-        return Response.success(caseVO);
+        return Response.success(queryCompareFileVOS);
     }
 
-    @Operation(summary = "删除技术方案信息")
-    @PostMapping("/queryCompareFile")
+    @Operation(summary = "删除对比文件")
+    @PostMapping("/delCompareFile")
     public Response delCompareFile(@RequestBody CompareFileIdDTO vo) throws Exception {
         try {
 //            technicalCaseService.deleteTechnicalCase(vo);

src/main/java/cn/cslg/pas/mapper/novelty/NoveltyCompareLiteratureMapper.java

@@ -1,9 +1,14 @@
 package cn.cslg.pas.mapper.novelty;
 
+import cn.cslg.pas.common.dto.QueryCompareFileDTO;
+import cn.cslg.pas.common.vo.QueryCompareFileVO;
 import cn.cslg.pas.domain.business.novelty.NoveltyCompareLiterature;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
 * @author admin
 * @description 针对表【novelty_compare_literature(查新报告对比文件)】的数据库操作Mapper
@@ -13,6 +18,8 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface NoveltyCompareLiteratureMapper extends BaseMapper<NoveltyCompareLiterature> {
 
+    List<QueryCompareFileVO> queryCompareFile(@Param("vo") QueryCompareFileDTO vo);
+
 }
 
 

src/main/java/cn/cslg/pas/service/novelty/NoveltyCompareLiteratureService.java

@@ -1,6 +1,9 @@
 package cn.cslg.pas.service.novelty;
 
 import cn.cslg.pas.common.dto.AddCompareFileDTO;
+import cn.cslg.pas.common.dto.CompareFileIdDTO;
+import cn.cslg.pas.common.dto.QueryCompareFileDTO;
+import cn.cslg.pas.common.vo.QueryCompareFileVO;
 import cn.cslg.pas.mapper.novelty.NoveltyCompareLiteratureMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.cslg.pas.domain.business.novelty.NoveltyCompareLiterature;
@@ -11,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
 * @author admin
 * @description 针对表【novelty_compare_literature(查新报告对比文件)】的数据库操作Service实现
@@ -25,6 +30,10 @@ public class NoveltyCompareLiteratureService extends ServiceImpl<NoveltyCompareL
     @Autowired
     private NoveltyCompareLiteratureMapper noveltyCompareLiteratureMapper;
 
+    public List<QueryCompareFileVO> queryCompareFile(QueryCompareFileDTO vo) {
+        return noveltyCompareLiteratureMapper.queryCompareFile(vo);
+    }
+
     public Integer addCompareFile(AddCompareFileDTO vo) {
         NoveltyCompareLiterature literature = new NoveltyCompareLiterature();
         BeanUtils.copyProperties(vo, literature);
@@ -39,6 +48,9 @@ public class NoveltyCompareLiteratureService extends ServiceImpl<NoveltyCompareL
         return literature.getId();
     }
 
+    public void delCompareFile(CompareFileIdDTO vo) {
+        final Integer compareLitertureId = vo.getCompareLitertureId();
+    }
 }
 
 

src/main/resources/mapper/NoveltyCompareLiteratureMapper.xml

@@ -0,0 +1,38 @@
+<?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.pas.mapper.novelty.NoveltyCompareLiteratureMapper">
+
+    <select id="queryCompareFile" resultType="cn.cslg.pas.common.vo.QueryCompareFileVO">
+        select cl.id as compareLitertureId,
+               cl.project_id,
+               cl.literature_no,
+               cl.remark as literatureRemark,
+               cl.state,
+               cl.sys_order,
+               cl.type,
+               cl.name,
+               cl.description,
+               cl.create_id,
+               cl.create_time,
+               cl.if_approval,
+               cl.public_date,
+               cl.app_date,
+               cl.author_name,
+               ncl.id as compareFileId,
+               ncl.retrieve_record_id,
+               ncl.relevance,
+               ncl.if_effectInv,
+               ncl.remark as fileRemark,
+               ncl.general_remark,
+               ncl.technical_points,
+               ncl.excute_case,
+               ncl.beneficial_effect
+        from  compare_literature cl
+        left join novelty_compare_literature ncl on ncl.compare_literture_id = cl.id
+        <where>
+            <if test="vo.projectId != null">
+                cl.project_id = #{vo.projectId}
+            </if>
+        </where>
+    </select>
+</mapper>