1.3 lrj

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

@@ -143,7 +143,6 @@ public class TaskController {
 //    public String reTaskPatents(@RequestBody PatentVO patentVO) throws ParseException, IOException {
 //        return taskService.reTaskPatents1(patentVO);
 //    }
-
         @RequestMapping(value = "/addSyneryTask", method = RequestMethod.POST)
     @Operation(summary = "添加协同任务")
     public String addSyneryTask(@RequestBody SyneryVO syneryVO) throws ParseException, IOException {

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

@@ -39,8 +39,6 @@ public class CompareMessageService extends ServiceImpl<CompareMessageMapper, Com
     private final CacheUtils cacheUtils;
     private final OutInterfaceService outInterfaceService;
     private final AssoTaskPatentSplitService assoTaskPatentSplitService;
-    private final AssoTaskPersonelService assoTaskPersonelService;
-    private final CompareFilesService compareFilesService;
 
     /**
      * @author 李仁杰

RMS/target/classes/mapper/ProductMapper.xml

@@ -4,7 +4,7 @@
 
 <mapper namespace="cn.cslg.report.mapper.ProductMapper">
 
-    <!--插入产品数据-->
+    <!--插入产品表数据-->
     <!--int insert(Product product);-->
     <insert id="insert" useGeneratedKeys="true" keyProperty="id">
         insert into PRODUCT (PRODUCT_NAME, PRODUCT_IDENTIFY, PRODUCT_DESCRIPTION, SURVEY_AREA, PRODUCT_IMAGE,
@@ -15,7 +15,7 @@
                 #{createPersonId})
     </insert>
 
-    <!--根据id修改产品数据-->
+    <!--根据id修改产品表数据-->
     <!--int update(Product product);-->
     <update id="update">
         update PRODUCT
@@ -57,7 +57,7 @@
         where ID = #{id}
     </update>
 
-    <!--根据reportId关联查询产品数据-->
+    <!--根据报告reportId关联查询产品和产品附件数据(产品表、产品文件关联表、报告系统文件表)-->
     <!--ProductIncludeFilesVO getWholeByReportId(Integer reportId);-->
     <select id="getWholeByReportId" resultMap="WholeResultMap">
         select p.ID p_ID,
@@ -118,41 +118,7 @@
         </collection>
     </resultMap>
 
-    <!--根据reportId查询产品数据-->
-    <!--ProductStandardVO getStandardByReportId(Integer reportId);-->
-    <select id="getStandardByReportId" resultMap="StandardResultMap">
-        select id,
-               product_name,
-               product_identify,
-               product_description,
-               survey_area,
-               product_image,
-               search_policy,
-               deadline,
-               focus_information,
-               report_id,
-               create_person_name,
-               create_person_id
-        from PRODUCT
-        where REPORT_ID = #{reportId}
-    </select>
-
-    <resultMap id="StandardResultMap" type="cn.cslg.report.common.model.vo.ProductStandardVO">
-        <id column="id" property="id"/>
-        <result column="PRODUCT_NAME" property="productName"/>
-        <result column="PRODUCT_IDENTIFY" property="productIdentify"/>
-        <result column="PRODUCT_DESCRIPTION" property="productDescription"/>
-        <result column="SURVEY_AREA" property="surveyArea"/>
-        <result column="PRODUCT_IMAGE" property="productImage"/>
-        <result column="SEARCH_POLICY" property="searchPolicy"/>
-        <result column="DEADLINE" property="deadLine"/>
-        <result column="FOCUS_INFORMATION" property="focusInformation"/>
-        <result column="REPORT_ID" property="reportId"/>
-        <result column="CREATE_PERSON_NAME" property="createPersonName"/>
-        <result column="CREATE_PERSON_ID" property="createPersonId"/>
-    </resultMap>
-
-    <!--根据报告id删除产品表数据-->
+    <!--根据报告reportId删除产品表数据-->
     <!--int deleteByReportId(Integer reportId);-->
     <delete id="deleteByReportId">
         delete