12.12修改

RMS/src/main/java/cn/cslg/report/entity/asso/AssoInvalidRecordFile.java

@@ -10,6 +10,7 @@ import lombok.experimental.Accessors;
 
 /**
  * 对比方案与对比记录关联表
+ *
  */
 @Data
 @Accessors(chain = true)

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

@@ -37,7 +37,7 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
     private final ReportFieldOptionService reportFieldOptionService;
     private final AssoComapareFielService assoComapareFielService;
     private final ReportFieldPatentLinkService reportFieldPatentLinkService;
-    private final  SysDictItemService sysDictItemService;
+
     private final AssoTaskPersonelService assoTaskPersonelService;
 
     /**
@@ -218,7 +218,13 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
         return Response.success(patentNos);
     }
 
-    //删除单个对比专利
+    /**
+     * @function删除单个对比专利
+     * @param compareFilesVO
+     * @return 是否删除成功
+     * @throws IOException
+     */
+
     public String deletePatentNo(CompareFilesVO compareFilesVO) throws IOException {
         List<String> patentNos = new ArrayList<>();
         //是否根据范围删除
@@ -248,12 +254,25 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
         return Response.success();
     }
 
+    /**
+     * @function 根据id删除对比文件
+     * @param id
+     * @return
+     * @throws IOException
+     */
     public String dele(int id)throws IOException{
         CompareFiles compareFiles = new CompareFiles();
         compareFiles.deleteById(id);
         return Response.success();
     }
 
+    /**
+     *  @function 根据报告id 和专利号查询对比文件
+     * @param reportId 报告的id
+     * @param patentNos 专利号
+     * @return 专利号的集合
+     * @throws IOException
+     */
     public List<CustomFieldLabelDTO> setAll(Integer reportId, String patentNos) throws IOException{
         List<CustomFieldLabelDTO> dataList = new ArrayList<>();
         //根据报告id找到对比文件
@@ -279,6 +298,11 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
 
     }
 
+    /**
+     * @function 修改 reportFieldPatentLink
+     * @param params
+     * @throws IOException
+     */
     @Transactional(rollbackFor = Exception.class)
     public void getPatentIndexSetting(PatentIndexSettingVO params)throws IOException {
         //详情见reportFieldPatentLinkService updatePatentIndexSetting方法
@@ -286,6 +310,11 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
 
     }
 
+    /**
+     *  @function 根据报告id查询对比文件
+     * @param reportId 报告的id
+     * @return
+     */
 
 
     public Map<String, Object> reTaskStateCount(Integer reportId) {

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

@@ -55,8 +55,8 @@ public class CompareRecordsService extends ServiceImpl<CompareRecordsMapper, Com
     }
 
     /**
-     *
-     * @param id
+     * @function: 根据对比记录的id删除对比记录
+     * @param id CompareRecords实体类的id
      * @return
      * @throws IOException
      */

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

@@ -40,7 +40,12 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
     private final LoginUtils loginUtils;
     private final FeatureMapper featureMapper;
 
-    //对权要进行合并操作
+    /**
+     *@function 对权要进行合并操作
+     * @param patentRights(专利权利要求)
+     * @return  List<PatentRight>
+     */
+
     private List<PatentRight> FormatPatentRights(List<PatentRight> patentRights) {
         List<PatentRight> retList = new ArrayList<>();
         for (int i = 0; i < patentRights.size(); i++) {
@@ -63,7 +68,15 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
         return retList;
     }
 
-    //从PAS系统上获得权要并拆分
+    /**
+     *@function 从PAS系统上获得权要并拆分
+     * @param patentNo 专利号
+     * @param splitType 拆分类型
+     * @param splitBy  拆分依据
+     * @param reportId 报告id
+     * @return 是否拆分成功
+     * @throws IOException
+     */
     public String splitPatentRight(String patentNo, Integer splitType, Integer splitBy, Integer reportId) throws IOException {
         PersonnelVO personnelVO = cacheUtils.getLoginUser(StpUtil.getLoginIdAsInt());
         LambdaQueryWrapper<Report> queryWrapper = new LambdaQueryWrapper();
@@ -217,6 +230,13 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
 
     }
 
+    /**
+     * @function 根据报告id 和专利号查询专利特征表
+     * @param patentNos 专利号
+     * @param reportId  报告id
+     * @return map
+     * @throws IOException
+     */
 
     public String getFeatures(String patentNos, Integer reportId) throws IOException {
         LambdaQueryWrapper<Report> queryWrapper = new LambdaQueryWrapper();

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

@@ -24,6 +24,11 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 @SuppressWarnings({"all"})
 public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask> {
+    /**
+     * @function 根据导入任务报告id和类型查询：导入任务
+     * @param importTask
+     * @return importTask（导入任务）
+     */
     public String reImportTask(ImportTask importTask) {
         LambdaQueryWrapper<ImportTask> queryWrapper = new LambdaQueryWrapper<>();
         if (importTask.getReportId() != null) {
@@ -42,6 +47,11 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
 
     }
 
+    /**
+     *  @function 根据导入任务的id删除导入任务
+     * @param id
+     * @return
+     */
     public Boolean delImportTask(Integer id) {
         Boolean flag = this.removeById(id);
         return flag;

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

@@ -28,6 +28,12 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
     private final ReportFileService reportFileService;
     private final AssoInvalidRecordFileService assoInvalidRecordFileService;
 
+    /**
+     * @function 删除无效记录对比方案与对比记录也要删除
+     * @param id
+     * @return
+     * @throws IOException
+     */
     public String deleteInvalidRecord(int id) throws IOException {
         InvalidRecord invalidRecord =this.getById(id);
         this.removeById(id);
@@ -35,11 +41,19 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
         wrapper.eq(AssoInvalidRecordFile::getInvalidId,invalidRecord.getId());
         List<AssoInvalidRecordFile> assoes= assoInvalidRecordFileService.list(wrapper);
         List<Integer> fileIds =assoes.stream().map(AssoInvalidRecordFile::getFileId).collect(Collectors.toList());
+        //根据任务id 删除对比方案与对比记录
         reportFileService.removeByIds(fileIds);
         assoInvalidRecordFileService.remove(wrapper);
         return Response.success();
     }
 
+    /**
+     * @function： 修改无效记录
+     * @param invalidRecord 无效记录
+     * @param files 对比文件
+     * @return 是否修改成功
+     * @throws IOException
+     */
     public Boolean updateInvalidRecord(InvalidRecord invalidRecord, List<MultipartFile> files) throws IOException {
         // 根据无效Id查询对应的附件Id
         LambdaQueryWrapper<AssoInvalidRecordFile> wrapper =new LambdaQueryWrapper<>();
@@ -60,7 +74,7 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
             //根据文件Id删除文件表记录
             reportFileService.removeByIds(fileIds);
         }
-//添加附件
+         //添加附件
         if (files!=null&&files.size() != 0) {
             //将文档上传并返回文件入库的Id
             List<Integer> fileIdList = reportFileService.uploadFiles(files);
@@ -82,11 +96,17 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
         return Response.success();
     }
 
-    //查找无效记录
+    /**
+     *@function：查找无效记录
+     * @param invalidRecord
+     * @return 无效记录
+     */
+
     public String queryInvalidRecord(InvalidRecord invalidRecord) {
         LambdaQueryWrapper<InvalidRecord> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(InvalidRecord::getPatentNo, invalidRecord.getPatentNo());
-        if (invalidRecord.getSize() != null && invalidRecord.getSize() != null) {
+        //分页
+        if (invalidRecord.getSize() != null && invalidRecord.getCurrent()!= null) {
             IPage<InvalidRecord> pages = this.page(new Page<>(invalidRecord.getCurrent(), invalidRecord.getSize()), wrapper);
             pages.setRecords(this.thisInvaliRecord(pages.getRecords()));
             return Response.success(pages);
@@ -97,7 +117,12 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
         }
     }
 
-    //装载无效记录
+    /**
+     * @function 装载无效记录
+     * @param invalidRecords
+     * @return
+     */
+
     public List<InvalidRecord> thisInvaliRecord(List<InvalidRecord> invalidRecords) {
         //获得无效记录的Id
         List<Integer> ids = invalidRecords.stream().map(InvalidRecord::getId).collect(Collectors.toList());

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

@@ -28,6 +28,12 @@ import java.util.stream.Collectors;
 public class LitigationHistoryService extends ServiceImpl<LitigationHistoryMapper, LitigationHistory> {
     private final ReportFileService reportFileService;
     private final AssoLitigationHisFileService  assoLitigationHisFileService;
+
+    /**
+     * @function: 删除诉讼历史 （对比方案与对比记录表的内容也要删除，报告也要删除）
+     * @param id 诉讼历史id
+     * @return
+     */
     public String deleteLitigationHistory(int id){
         LitigationHistory litigationHistory =this.getById(id);
         this.removeById(id);
@@ -35,21 +41,36 @@ public class LitigationHistoryService extends ServiceImpl<LitigationHistoryMappe
         wrapper.eq(AssoLitigationHisFile::getLitiHisId,litigationHistory.getId());
         List<AssoLitigationHisFile> assoes= assoLitigationHisFileService.list(wrapper);
         List<Integer> fileIds =assoes.stream().map(AssoLitigationHisFile::getFileId).collect(Collectors.toList());
+        //根据对比文件id删除报告
         reportFileService.removeByIds(fileIds);
+        // 根据对比文件id对比方案与对比记录
         assoLitigationHisFileService.remove(wrapper);
        return Response.success();
     }
 
+    /**
+     * @function: 增加诉讼历史
+     * @param litigationHistory
+     * @param files 诉讼文件
+     * @return
+     */
     public String addLitigationHistory(LitigationHistory litigationHistory,List<MultipartFile> files){
+        // 插入诉讼历史
         litigationHistory.insert();
         if (files!=null&&files.size() != 0) {
             //将文档上传并返回文件入库的Id
             List<Integer> fileIds = reportFileService.uploadFiles(files);
+            // 对比方案与对比记录 插入
             assoLitigationHisFileService.addAsso(litigationHistory.getId(),fileIds);
         }
         return Response.success();
     }
-
+    /**
+     * @function: 修改诉讼历史
+     * @param litigationHistory
+     * @param files 诉讼文件
+     * @return
+     */
     public Boolean updateLitigationHistory(LitigationHistory litigationHistory,List<MultipartFile> files){
 
         // 根据无效Id查询对应的附件Id
@@ -71,7 +92,7 @@ public class LitigationHistoryService extends ServiceImpl<LitigationHistoryMappe
             //根据文件Id删除文件表记录
             reportFileService.removeByIds(fileIds);
         }
-//添加附件
+          //添加附件
         if (files!=null&&files.size() != 0) {
             //将文档上传并返回文件入库的Id
             List<Integer> fileIdList = reportFileService.uploadFiles(files);
@@ -82,9 +103,16 @@ public class LitigationHistoryService extends ServiceImpl<LitigationHistoryMappe
         return litigationHistory.updateById();
     }
 
+    /**
+     * @function: 根据专利号查询诉讼历史
+     * @param litigationHistory
+     * @return
+     */
+
     public String queryLitigationHistory(LitigationHistory litigationHistory){
         LambdaQueryWrapper<LitigationHistory> wrapper =new LambdaQueryWrapper<>();
                wrapper.eq(LitigationHistory::getPatentNo,litigationHistory.getPatentNo());
+               //分页
         if (litigationHistory.getSize() != null && litigationHistory.getCurrent() != null) {
             IPage<LitigationHistory> pages = this.page(new Page<>(litigationHistory.getCurrent(), litigationHistory.getSize()), wrapper);
             pages.setRecords(this.LitigationHistory(pages.getRecords()));
@@ -96,7 +124,11 @@ public class LitigationHistoryService extends ServiceImpl<LitigationHistoryMappe
         }
     }
 
-    //装载诉讼历史
+    /**
+     * @function:  装载诉讼历史
+     * @param litigationHistories
+     * @return
+     */
     public List<LitigationHistory> LitigationHistory(List<LitigationHistory> litigationHistories) {
         //获得诉讼历史的Id
         List<Integer> ids = litigationHistories.stream().map(LitigationHistory::getId).collect(Collectors.toList());

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

@@ -30,6 +30,13 @@ import java.util.stream.Collectors;
 public class ReferencesService extends ServiceImpl<ReferencesMapper, References> {
   private  final ReportFileService reportFileService;
   private final AssoReferenceFileService assoReferenceFileService;
+
+    /**
+     * @function: 根据无效记录的id 删除无效记录（关联的对比方案与对比记录 文件 也要删除）
+     * @param id
+     * @return
+     * @throws IOException
+     */
     public String deleteReferences(int id) throws IOException {
         References references =this.getById(id);
         this.removeById(id);
@@ -37,11 +44,21 @@ public class ReferencesService extends ServiceImpl<ReferencesMapper, References>
         wrapper.eq(AssoReferenceFile::getReferenceId,references.getId());
         List<AssoReferenceFile> assoes= assoReferenceFileService.list(wrapper);
         List<Integer> fileIds =assoes.stream().map(AssoReferenceFile::getFileId).collect(Collectors.toList());
+        //删除对应的对比文件
         reportFileService.removeByIds(fileIds);
+        //关联的对比方案与对比记录的删除
         assoReferenceFileService.remove(wrapper);
         return Response.success();
     }
 
+    /**
+     * @function: 修改无效记录 （关联的对比方案与对比记录 文件 也要修改）
+     * @param references 无效记录
+     * @param files 对比文件
+     * @return
+     * @throws IOException
+     */
+
     public Boolean updateReferences(References references, List<MultipartFile> files) throws IOException {
 
         // 根据无效Id查询对应的附件Id
@@ -63,7 +80,7 @@ public class ReferencesService extends ServiceImpl<ReferencesMapper, References>
             //根据文件Id删除文件表记录
             reportFileService.removeByIds(fileIds);
         }
-//添加附件
+            //添加附件
         if (files!=null&&files.size() != 0) {
             //将文档上传并返回文件入库的Id
             List<Integer> fileIdList = reportFileService.uploadFiles(files);
@@ -72,6 +89,13 @@ public class ReferencesService extends ServiceImpl<ReferencesMapper, References>
         }
         return references.updateById();
     }
+    /**
+     * @function: 增加无效记录（关联的对比方案与对比记录 文件 也要增加）
+     * @param references 无效记录
+     * @param files 对比文件
+     * @return
+     * @throws IOException
+     */
 
     public String addReferences(References references,List<MultipartFile> files) throws IOException {
         references.insert();
@@ -83,10 +107,16 @@ public class ReferencesService extends ServiceImpl<ReferencesMapper, References>
         return Response.success();
     }
 
+    /**
+     * @function: 根据专利号查询无效分析（分页）
+     * @param references
+     * @return
+     */
     public String queryReferences(References references){
         LambdaQueryWrapper<References> wrapper =new LambdaQueryWrapper<>();
         wrapper.eq(References::getPatentNo,references.getPatentNo());
-        if (references.getSize() != null && references.getSize() != null) {
+        //分页
+        if (references.getSize() != null && references.getCurrent() != null) {
             IPage<References> pages = this.page(new Page<>(references.getCurrent(), references.getSize()), wrapper);
             pages.setRecords(this.thisReference(pages.getRecords()));
             return Response.success(pages);
@@ -97,7 +127,13 @@ public class ReferencesService extends ServiceImpl<ReferencesMapper, References>
         }
     }
 
-    //装载其他参考资料
+    /**
+     * @function: 装载其他参考资料
+     * @param references
+     * @return
+     */
+
+
     public List<References> thisReference(List<References> references) {
         //获得无效记录的Id
         List<Integer> ids = references.stream().map(References::getId).collect(Collectors.toList());

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

@@ -54,7 +54,11 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
 
      }
 
-     //根据报告Id获得报告的导出记录
+    /**
+     * @function: 根据报告Id获得报告的导出记录
+     * @param reportDocument
+     * @return
+     */
     public String getExportList(ReportDocument reportDocument){
          LambdaQueryWrapper<ReportDocument> wrapper =new LambdaQueryWrapper<>();
          wrapper.eq(ReportDocument::getReportId,reportDocument.getReportId());
@@ -66,7 +70,15 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
          this.removeById(id);
          return Response.success();
     }
-    //导出报告
+
+
+    /**
+     * @function: 导出报告
+     * @param reportId
+     * @param templeId
+     * @return
+     * @throws IOException
+     */
     public String exportReport(Integer reportId,Integer templeId) throws IOException {
           //根据模板ID获得模板
         Template reportTemplate=  templateService.getById(templeId);

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

@@ -33,6 +33,12 @@ public class ReportFieldOptionService extends ServiceImpl<ReportFieldOptionMappe
     private final ReportFieldPatentLinkService projectFieldPatentLinkService;
     private final ReportFieldTreeService reportFieldTreeService;
 
+    /**
+     * @function: 根据文件id查询自定义字段多选
+     * @param fieldId (文件id)
+     * @return
+     */
+
     public List<ReportFieldOption> getListByFieldId(Integer fieldId) {
         LambdaQueryWrapper<ReportFieldOption> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ReportFieldOption::getFieldId, fieldId);
@@ -57,6 +63,12 @@ public class ReportFieldOptionService extends ServiceImpl<ReportFieldOptionMappe
         return this.list(queryWrapper);
     }
 
+    /**
+     * @function: 根据文件id 自定义字段名称 查询自定义字段多选
+     * @param name 自定义字段名称
+     * @param fieldId 文件id
+     * @return
+     */
     public ReportFieldOption getReportFieldOptionByNameAndFieldId(String name, Integer fieldId) {
         LambdaQueryWrapper<ReportFieldOption> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ReportFieldOption::getFieldId, fieldId);

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

@@ -40,6 +40,12 @@ public class ReportFieldPatentLinkService extends ServiceImpl<ReportFieldPatentL
     private final ReportFieldOptionService reportFieldOptionService;
     private final ReportFieldTreeService reportFieldTreeService;
 
+    /**
+     * @function 根据专利号和报告id插叙标引内容关联专利
+     * @param patentNo 专利号
+     * @param projectId 报告id
+     * @return
+     */
     public List<ReportFieldPatentLink> getProjectPatentLinkByPatentAndProId(String patentNo, Integer projectId) {
         LambdaQueryWrapper<ReportFieldPatentLink> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ReportFieldPatentLink::getPatentNo, patentNo);
@@ -47,17 +53,34 @@ public class ReportFieldPatentLinkService extends ServiceImpl<ReportFieldPatentL
         return this.list(queryWrapper);
     }
 
+    /**
+     * @function 根据专利号，报告id，自定义字段id 插叙标引内容关联专利
+     * @param patentNo 专利号
+     * @param projectId 报告id
+     * @param fieldId 自定义字段id
+     * @return
+     */
+
     public List<ReportFieldPatentLink> getProjectPatentLinkByPatentAndProjectIdAndFieldId(String patentNo, Integer projectId, Integer fieldId) {
         LambdaQueryWrapper<ReportFieldPatentLink> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ReportFieldPatentLink::getPatentNo, patentNo);
         queryWrapper.eq(ReportFieldPatentLink::getReportId, projectId);
         queryWrapper.eq(ReportFieldPatentLink::getFieldId, fieldId);
         List<ReportFieldPatentLink> list = this.list(queryWrapper);
-        int i=list.size();
+
         return list;
     }
 
-    public ReportFieldPatentLink getProjectPatentLinkByPatentAndProjectIdAndFieldIdAndOptionId(Integer patentId, Integer projectId, Integer fieldId, Integer optionId) {
+    /**
+     * @function 根据专利号，报告id，自定义字段id 分类标引的id 插叙标引内容关联专利
+     * @param patentId 专利号
+     * @param projectId 报告id
+     * @param fieldId 自定义字段id
+     * @param optionId 分类标引的id
+     * @return
+     */
+
+    public ReportFieldPatentLink getProjectPatentLinkByPatentAndProjectIdAndFieldIdAndOptionId(String patentId, Integer projectId, Integer fieldId, Integer optionId) {
         LambdaQueryWrapper<ReportFieldPatentLink> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ReportFieldPatentLink::getPatentNo, patentId);
         queryWrapper.eq(ReportFieldPatentLink::getReportId, projectId);
@@ -66,6 +89,15 @@ public class ReportFieldPatentLinkService extends ServiceImpl<ReportFieldPatentL
         return this.getOne(queryWrapper);
     }
 
+    /**
+     * @function 修改插叙标引内容关联专利
+     * @param patentNo 专利号
+     * @param type 类型
+     * @param fieldId 文件id
+     * @param optionId 分类标引id
+     * @param userId 用户id（当前登录人id）
+     * @param projectId 报告id
+     */
     public void updateProjectPatentLink(String patentNo, Integer type, Integer fieldId, Integer optionId, Integer userId, Integer projectId) {
         ReportFieldPatentLink reportFieldPatentLink = new ReportFieldPatentLink();
         reportFieldPatentLink.setType(type);
@@ -77,6 +109,13 @@ public class ReportFieldPatentLinkService extends ServiceImpl<ReportFieldPatentL
         reportFieldPatentLink.insert();
     }
 
+    /**
+     * @function 查询插叙标引内容关联专利
+     * @param patentNos 专利号
+     * @param projectId 任务id
+     * @return
+     */
+
     public List<ReportFieldPatentLink> getProjectPatentLinkByPatentIdsAndProjectId(List<String> patentNos, Integer projectId) {
         if (patentNos == null || patentNos.size() == 0) {
             return new ArrayList<>();
@@ -87,33 +126,38 @@ public class ReportFieldPatentLinkService extends ServiceImpl<ReportFieldPatentL
         return this.list(queryWrapper);
     }
 
-    public List<ReportFieldPatentLink> getProjectPatentLinkByPatentIdsAndFieldId(List<String> patentNos, Integer fieldId) {
-        if (patentNos == null || patentNos.size() == 0) {
-            return new ArrayList<>();
-        }
-        LambdaQueryWrapper<ReportFieldPatentLink> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(ReportFieldPatentLink::getPatentNo, patentNos);
-        queryWrapper.eq(ReportFieldPatentLink::getFieldId, fieldId);
-        return this.list(queryWrapper);
-    }
-
-
-
+    /**
+     * @function 删除ReportFieldPatentLink
+     * @param fieldId 自定义字段id
+     */
     public void deleteByFieldId(Integer fieldId) {
         this.remove(Wrappers.<ReportFieldPatentLink>lambdaQuery().eq(ReportFieldPatentLink::getFieldId, fieldId));
     }
 
+    /**
+     * @function 删除ReportFieldPatentLink
+     * @param optionId 分类标引的id
+     */
     public void deleteByOptionId(Integer optionId) {
         this.remove(Wrappers.<ReportFieldPatentLink>lambdaQuery().eq(ReportFieldPatentLink::getOptionId, optionId));
     }
 
+    /**
+     * @function 批量删除
+     * @param optionIds
+     */
     public void deleteByOptionIds(List<Integer> optionIds) {
         if (optionIds != null && optionIds.size() != 0) {
             this.remove(Wrappers.<ReportFieldPatentLink>lambdaQuery().in(ReportFieldPatentLink::getOptionId, optionIds));
         }
     }
 
-
+    /**
+     * @function  删除
+     * @param patentNos 专利号
+     * @param projectId 报告id
+     * @param fieldId 自定义字段id
+     */
     public void deleteByPatentIdsAndProjectIdAndFieldId(List<Integer> patentNos, Integer projectId, Integer fieldId) {
         LambdaQueryWrapper<ReportFieldPatentLink> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.in(ReportFieldPatentLink::getPatentNo, patentNos);
@@ -121,6 +165,12 @@ public class ReportFieldPatentLinkService extends ServiceImpl<ReportFieldPatentL
         queryWrapper.eq(ReportFieldPatentLink::getFieldId, fieldId);
         this.remove(queryWrapper);
     }
+    /**
+     * @function  删除
+     * @param patentNos 专利号
+     * @param projectId 报告id
+     * @param fieldId 自定义字段id
+     */
     public void delete(Integer patentId, String patentNo, Integer fieldId) {
         LambdaQueryWrapper<ReportFieldPatentLink> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ReportFieldPatentLink::getPatentNo, patentNo)
@@ -133,8 +183,8 @@ public class ReportFieldPatentLinkService extends ServiceImpl<ReportFieldPatentL
     }
 
     /**
-     * 根据专利号报告id对比自定义字段id找自定义字段
      *
+     * @function 获取自定义字段
      * @param params
      * @return
      * @throws IOException
@@ -183,6 +233,11 @@ public class ReportFieldPatentLinkService extends ServiceImpl<ReportFieldPatentL
         }
         return mapList;
     }
+
+    /**
+     * @function 修改自定义字段
+     * @param params
+     */
     @Transactional(rollbackFor = Exception.class)
     public void updatePatentIndexSetting(PatentIndexSettingVO params) {
         this.delete(params.getReportId(), params.getPatentNo(), params.getFieldId());

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

@@ -46,7 +46,7 @@ public class ReportFieldService extends ServiceImpl<ReportFieldMapper, ReportFie
  private  final ReportFieldPatentLinkService reportFieldPatentLinkService;
 private  final  AssoTaskPersonelService assoTaskPersonelService;
     private final ReportFieldService reportFieldService;
-
+//增加自定义字段
     public String add(ReportField reportField) {
         ReportField temp = this.getProjectFieldByName(reportField.getName(), reportField.getReportId());
         if (temp != null) {
@@ -57,6 +57,7 @@ private  final  AssoTaskPersonelService assoTaskPersonelService;
         reportField.insert();
         return Response.success(reportField.getId());
     }
+    //修改自定义字段
     public String edit(ReportField reportField) {
         ReportField temp = this.getProjectFieldByName(reportField.getName(), reportField.getReportId());
         if (temp != null && !temp.getId().equals(reportField.getId())) {
@@ -110,7 +111,7 @@ private  final  AssoTaskPersonelService assoTaskPersonelService;
           queryWrapper.isNull((ReportField::getReportId));
       }
       queryWrapper.orderByDesc(ReportField::getId);
-      if (reportFieldVO.getSize() != null && reportFieldVO.getSize() != null) {
+      if (reportFieldVO.getSize() != null && reportFieldVO.getCurrent() != null) {
           List<ReportField> reportFields = this.page(new Page<>(reportFieldVO.getCurrent(), reportFieldVO.getSize()), queryWrapper).getRecords();
           long count = this.count(queryWrapper);
           return Response.success(reportFields, DataUtils.setPageColumn(reportFieldVO.getSize(), reportFieldVO.getCurrent(), Math.toIntExact(count)));
@@ -121,10 +122,17 @@ private  final  AssoTaskPersonelService assoTaskPersonelService;
 
   }
 
+    /**
+     * @function 查询自定义自定
+     * @param reportId 报告ID
+     * @param patentNo 专利号
+     * @return
+     */
     public List<PatentField> getPatentFieldByPatentIdAndProjectId(Integer reportId, String patentNo) {
         List<PatentField> dataList = new ArrayList<>();
         List<ReportFieldPatentLink> linkList = reportFieldPatentLinkService.getProjectPatentLinkByPatentAndProId(patentNo, reportId);
         List<Integer> fieldIds = linkList.stream().map(ReportFieldPatentLink::getFieldId).distinct().collect(Collectors.toList());
+        //分类
         List<Integer> optionIds = linkList.stream().map(ReportFieldPatentLink::getOptionId).distinct().collect(Collectors.toList());
         List<ReportField> fieldList = this.getFieldListByIds(fieldIds);
         List<ReportFieldText> textList = reportFieldTextService.getProjectFieldTextByFieldIds(fieldIds);
@@ -135,18 +143,22 @@ private  final  AssoTaskPersonelService assoTaskPersonelService;
             data.setId(field.getId());
             data.setName(field.getName());
             data.setType(field.getType());
+            //根据类型分类查询
             switch (field.getType()) {
                 case 0:
                 case 1:
+                    //文本类型
                 case 2:
                     data.setSelected(textList.stream().filter(item -> item.getFieldId().equals(field.getId()) && optionIds.contains(item.getId())).map(ReportFieldText::getText).distinct().collect(Collectors.toList()));
                     break;
                 case 3:
                 case 4:
                 case 5:
+                    //选项类型
                     data.setSelected(optionList.stream().filter(item -> item.getFieldId().equals(field.getId()) && optionIds.contains(item.getId())).map(ReportFieldOption::getName).distinct().collect(Collectors.toList()));
                     break;
                 case 6:
+                    //树类型
                     List<ReportFieldTree> trees = treeList.stream().filter(item -> item.getFieldId().equals(field.getId())).collect(Collectors.toList());
                     List<ReportFieldTree> optionTree = trees.stream().filter(item -> optionIds.contains(item.getId())).collect(Collectors.toList());
                     List<String> selected = new ArrayList<>();
@@ -158,7 +170,7 @@ private  final  AssoTaskPersonelService assoTaskPersonelService;
         });
         return dataList;
     }
-
+    //查询自定义字段
 
     public List<ReportField> getFieldListByIds(List<Integer> ids) {
         if (ids == null || ids.size() == 0) {
@@ -169,40 +181,76 @@ private  final  AssoTaskPersonelService assoTaskPersonelService;
         return this.list(queryWrapper);
     }
 
-    public ReportField getProjectFieldByName(String name, Integer projectId) {
+    /**
+     * @function 查询自定义字段
+     * @param name 自定义字段的名称
+     * @param reportId  报告id
+     * @return
+     */
+
+    public ReportField getProjectFieldByName(String name, Integer reportId) {
         LambdaQueryWrapper<ReportField> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ReportField::getName, name);
-        queryWrapper.eq(ReportField::getReportId, projectId);
+        queryWrapper.eq(ReportField::getReportId, reportId);
         return this.getOne(queryWrapper);
     }
 
   //给报告添加默认自定义字段
     public void addDefaultField(Integer reportId, Integer reportType) {
+        //根据报告类型添加默认自定义字段
         LambdaQueryWrapper<ReportField> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ReportField::getReportType, reportType);
         queryWrapper.isNull(ReportField::getReportId);
+        //默认自定义字段
         List<ReportField> reportFields =this.list(queryWrapper);
         if(reportFields!=null&&reportFields.size()!=0)
         {
-         reportFields.forEach(p->{p.setReportId(reportId);p.setId(null); p.setCreateName(null);});
-         reportFieldService.saveBatch(reportFields);
+         reportFields.forEach(p->{
+             p.setReportId(reportId);p.setId(null); p.setCreateName(null);});
+             reportFieldService.saveBatch(reportFields);
         }
-    }
+
+        reportFields.forEach(p->{
+            if(p.getPtype()==1||p.getPtype()==0||p.getPtype()==2){
+                reportFieldTextService.add(p.getId(),p.getName());
+
+            }
+            if(p.getPtype()==3||p.getPtype()==4||p.getPtype()==5){
+                ReportFieldOption reportFieldOption = new ReportFieldOption();
+                reportFieldOption.setName(p.getName());
+                reportFieldOption.setFieldId(p.getId());
+                reportFieldOptionService.add(reportFieldOption);
+            }
+
+            if(p.getPtype()==6){
+                ReportFieldTree reportFieldTree = new ReportFieldTree();
+                reportFieldTree.setName(p.getName());
+                reportFieldTree.setFieldId(p.getId());
+                reportFieldTreeService.add(reportFieldTree);
+
+
+            }
+        });
+        }
+
+
     public String getReportField(int reportId,int id){
         List<ReportField> reportFields = reportFieldMapper.find(reportId,id);
         return Response.success(reportFields);
     }
+    // 查询自定义字段
     public ReportField get(int id){
         LambdaQueryWrapper<ReportField> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ReportField::getId,id);
         return  this.list(queryWrapper).get(0);
     }
 
-
+    //修改自定义字段
     public String updateReportId(ReportField reportField){
         reportFieldMapper.updateReportId(reportField);
         return Response.success();
     }
+    //查询自定义字段
     public List<ReportField> selectAll(int id)throws IOException{
         LambdaQueryWrapper<ReportField> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ReportField::getReportId,id);
@@ -231,6 +279,12 @@ private  final  AssoTaskPersonelService assoTaskPersonelService;
 
     }
 
+    /**
+     * @function 查询自定义字段，统计与之相关的专利的shuliang
+     * @param params
+     * @return
+     */
+
     public List<PatentQueryFieldSourceVO> getPatentQuerySourcePageList(PatentQueryFieldSourceVO params) {
         List<PatentQueryFieldSourceVO> list =new ArrayList<>();
 
@@ -327,6 +381,12 @@ private  final  AssoTaskPersonelService assoTaskPersonelService;
 
     }
 
+    /**
+     * @funtion 查询标引内容关联专利
+     * @param params
+     * @return
+     * @throws IOException
+     */
     public List<String>  getString(SourceVO params)throws IOException{
         List<String> list =new ArrayList<>();
         LambdaQueryWrapper<ReportFieldPatentLink> lambdaQueryWrapper =new LambdaQueryWrapper<>();
@@ -350,6 +410,7 @@ private  final  AssoTaskPersonelService assoTaskPersonelService;
         LambdaQueryWrapper<ReportField> wrapper =new LambdaQueryWrapper<>();
         wrapper.eq(ReportField::getId,id);
         ReportField reportField =this.list(wrapper).get(0);
+        //获得类型
         Integer type1 =reportField.getType();
         if(type1==1){
             LambdaQueryWrapper<ReportFieldText> queryWrapper =new LambdaQueryWrapper<>();

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

@@ -26,14 +26,14 @@ import java.util.List;
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 @SuppressWarnings({"all"})
 public class ReportFieldTextService extends ServiceImpl<ReportFieldTextMapper, ReportFieldText> {
-
+// 查询自定义字段文本类型
     public ReportFieldText getProjectFieldTextByNameAndFieldId(String text, Integer fieldId) {
         LambdaQueryWrapper<ReportFieldText> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ReportFieldText::getFieldId, fieldId);
         queryWrapper.eq(ReportFieldText::getText, text);
         return this.getOne(queryWrapper);
     }
-
+    // 查询自定义字段文本类型
     public List<ReportFieldText> getProjectFieldTextByFieldIds(List<Integer> fieldIds) {
         if (fieldIds == null || fieldIds.size() == 0) {
             return new ArrayList<>();
@@ -42,7 +42,7 @@ public class ReportFieldTextService extends ServiceImpl<ReportFieldTextMapper, R
         queryWrapper.in(ReportFieldText::getFieldId, fieldIds);
         return this.list(queryWrapper);
     }
-
+    // 查询自定义字段文本类型
     public  List<ReportFieldText> getProjectFieldTextByIds(List<Integer> ids) {
         if (ids == null || ids.size() == 0) {
             return new ArrayList<>();
@@ -51,13 +51,13 @@ public class ReportFieldTextService extends ServiceImpl<ReportFieldTextMapper, R
         queryWrapper.in(ReportFieldText::getId, ids);
         return this.list(queryWrapper);
     }
-
+    // 查询自定义字段文本类型
     public List<ReportFieldText> getProjectFieldTextByFieldId(Integer fieldId) {
         LambdaQueryWrapper<ReportFieldText> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ReportFieldText::getFieldId, fieldId);
         return this.list(queryWrapper);
     }
-
+//删除
     public void deleteByFieldId(Integer fieldId) {
         this.remove(Wrappers.<ReportFieldText>lambdaQuery().eq(ReportFieldText::getFieldId, fieldId));
     }

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

@@ -317,10 +317,21 @@ public class ReportFieldTreeService extends ServiceImpl<ReportFieldTreeMapper, R
         return paths;
     }
 
+    /**
+     * 删除
+     * @param fieldId
+     */
     public void deleteByFieldId(Integer fieldId) {
         this.remove(Wrappers.<ReportFieldTree>lambdaQuery().eq(ReportFieldTree::getFieldId, fieldId));
     }
 
+    /**
+     * 查询
+     * @param id
+     * @param nodes
+     * @return
+     */
+
     private List<Integer> findTreeNodes(Integer id, List<Integer> nodes) {
         nodes.add(id);
         List<ReportFieldTree> treeList = this.list(Wrappers.<ReportFieldTree>lambdaQuery().eq(ReportFieldTree::getParentId, id));
@@ -333,12 +344,21 @@ public class ReportFieldTreeService extends ServiceImpl<ReportFieldTreeMapper, R
         return nodes;
     }
 
+    /**
+     * 删除（关联的reportFieldPatentLink也要删除）
+     * @param id
+     */
+
     @Transactional
     public void delete(Integer id) {
         List<Integer> nodes = this.findTreeNodes(id, new ArrayList<>());
         reportFieldPatentLinkService.deleteByOptionIds(nodes);
         this.removeByIds(nodes);
     }
+    /**
+     * 删除（关联的reportFieldPatentLink也要删除）
+     * @param id
+     */
 
     @Transactional
     public void deleteByIds(List<Integer> ids) {
@@ -348,6 +368,11 @@ public class ReportFieldTreeService extends ServiceImpl<ReportFieldTreeMapper, R
         }
     }
 
+    /**
+     * 修改
+     * @param projectFieldOption
+     * @return
+     */
     @Transactional
     public String updateByReportFieldTreeNode(ReportFieldOption projectFieldOption) {
         ReportFieldTree temp = this.getReportFieldTreeNodeByFieldIdAndParentIdAndName(projectFieldOption.getFieldId(), projectFieldOption.getParentId(), projectFieldOption.getName());

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

@@ -86,7 +86,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
                 assoReportFileService.addAsso(report.getId(), fileIds);
 
             }
-
+             //如果报告生成成功，给报告添加默认自定义字段
             if (addFlag) {
                 reportFieldService.addDefaultField(report.getId(), report.getType());
                 return report.getId();
@@ -117,6 +117,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
             queryWrapper.eq(Report::getId, reportVO.getReportId());
         }
         queryWrapper.orderByDesc(Report::getId);
+        //分页
         if (reportVO.getSize() != null && reportVO.getCurrent() != null) {
             List<Report> reports = this.page(new Page<>(reportVO.getCurrent(), reportVO.getSize()), queryWrapper).getRecords();
             reports = this.reportData(reports);
@@ -129,8 +130,15 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         }
     }
 
+    /**
+     * @function 查询报告
+     * @param reports
+     * @return
+     * @throws IOException
+     */
     public List<Report> reportData(List<Report> reports) throws IOException {
         List<Integer> reportIds = reports.stream().map(Report::getId).collect(Collectors.toList());
+        // 查询 对比方案与对比记录
         List<AssoReportFile> assoReportFiles = assoReportFileService.queryFileByReportId(reportIds);
         List<ReportFiles> reportFilesList = new ArrayList<>();
         if (assoReportFiles.size() != 0) {
@@ -142,6 +150,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         JSONObject jsonObject = JSONObject.parseObject(res);
         List<SystemDictVO> list = JSONArray.parseArray(jsonObject.getString("data"), SystemDictVO.class);
         List<ReportFiles> temList = reportFilesList;
+        //过滤报告
         reports.forEach(
                 item -> {
                     if (StringUtils.isNotEmpty(item.getScenarioId())) {
@@ -162,7 +171,12 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         return reports;
     }
 
-    //更新报告
+    /**
+     * @function 修改报告
+     * @param id(报告id)
+     * @return
+     * @throws IOException
+     */
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateReport(Report report, List<MultipartFile> files) {
         // 根据报告Id查询对应的附件Id
@@ -197,7 +211,12 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
 
     }
 
-    //删除报告
+    /**
+     * @function 删除报告
+     * @param id(报告id)
+     * @return
+     * @throws IOException
+     */
     @Transactional(rollbackFor = Exception.class)
     public String reportDele(int id) throws IOException {
         //删除所有和报告有关的任务
@@ -216,6 +235,13 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         return Response.error("没有数据");
     }
 
+    /**
+     * @function 查询报告
+     * @param id(报告id)
+     * @return
+     * @throws IOException
+     */
+
     public String getName(int id) throws IOException {
         LambdaQueryWrapper<Report> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(Report::getId, id);

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

@@ -30,7 +30,12 @@ public class ReviewHistoryService extends ServiceImpl<ReviewHistoryMapper, Revie
 private final   ReportFileService reportFileService;
 private final AssoReviewHisFileService assoReviewHisFileService;
 
-
+    /**
+     * @function 删除审查历史
+     * @param id
+     * @return
+     * @throws IOException
+     */
     public String deleteReviewHistory(int id) throws IOException {
         ReviewHistory ReviewHistory =this.getById(id);
         this.removeById(id);
@@ -38,12 +43,20 @@ private final AssoReviewHisFileService assoReviewHisFileService;
         wrapper.eq(AssoReviewHisFile::getReviewHistoryId,ReviewHistory.getId());
         List<AssoReviewHisFile> assoes= assoReviewHisFileService.list(wrapper);
         List<Integer> fileIds =assoes.stream().map(AssoReviewHisFile::getFileId).collect(Collectors.toList());
+        //对应的文件也要删除
         reportFileService.removeByIds(fileIds);
+        //对比方案与对比记录关联表 也要删除
         assoReviewHisFileService.remove(wrapper);
         this.removeById(id);
         return Response.success();
     }
 
+    /**
+     * @function 修改审查历史
+     * @param reviewHistory 审查历史
+     * @param files 文件
+     * @return
+     */
     public Boolean updateReviewHistory(ReviewHistory reviewHistory,List<MultipartFile> files)  {
         // 根据无效Id查询对应的附件Id
         LambdaQueryWrapper<AssoReviewHisFile> wrapper =new LambdaQueryWrapper<>();
@@ -64,7 +77,7 @@ private final AssoReviewHisFileService assoReviewHisFileService;
             //根据文件Id删除文件表记录
             reportFileService.removeByIds(fileIds);
         }
-//添加附件
+          //添加附件
         if (files!=null&&files.size() != 0) {
             //将文档上传并返回文件入库的Id
             List<Integer> fileIdList = reportFileService.uploadFiles(files);
@@ -73,21 +86,32 @@ private final AssoReviewHisFileService assoReviewHisFileService;
         }
         return reviewHistory.updateById();
     }
-
+    /**
+     * @function 增加审查历史
+     * @param reviewHistory 审查历史
+     * @param files 文件
+     * @return
+     */
     public String addReviewHistory(ReviewHistory reviewHistory,List<MultipartFile> files) throws IOException {
         reviewHistory.insert();
         if (files!=null&&files.size() != 0) {
             //将文档上传并返回文件入库的Id
             List<Integer> fileIds = reportFileService.uploadFiles(files);
+            //对比方案与对比记录关联表 增加
             assoReviewHisFileService.addAsso(reviewHistory.getId(),fileIds);
         }
         return Response.success();
     }
 
+    /**
+     * @function 根据专利号查询审查历史（分页）
+     * @param reviewHistory
+     * @return
+     */
     public String queryReviewHistory(ReviewHistory reviewHistory){
         LambdaQueryWrapper<ReviewHistory> wrapper =new LambdaQueryWrapper<>();
         wrapper.eq(ReviewHistory::getPatentNo,reviewHistory.getPatentNo());
-        if (reviewHistory.getSize() != null && reviewHistory.getSize() != null) {
+        if (reviewHistory.getSize() != null && reviewHistory.getCurrent() != null) {
             IPage<ReviewHistory> pages = this.page(new Page<>(reviewHistory.getCurrent(), reviewHistory.getSize()), wrapper);
             pages.setRecords(this.thisReviewHistory(pages.getRecords()));
             return Response.success(pages);
@@ -97,8 +121,13 @@ private final AssoReviewHisFileService assoReviewHisFileService;
             return Response.success(reviewHistories);
         }
     }
-    
-    //装载无效记录
+
+    /**
+     * @function:装载无效记录
+     * @param reviewHistories
+     * @return
+     */
+
     public List<ReviewHistory> thisReviewHistory(List<ReviewHistory> reviewHistories) {
         //获得无效记录的Id
         List<Integer> ids = reviewHistories.stream().map(ReviewHistory::getId).collect(Collectors.toList());

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

@@ -1,28 +0,0 @@
-package cn.cslg.report.service.business;
-
-import cn.cslg.report.entity.SysDictItem;
-import cn.cslg.report.mapper.SystemDictItemMapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-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.util.ArrayList;
-import java.util.List;
-
-@Service
-@Slf4j
-@RequiredArgsConstructor(onConstructor_ = {@Lazy})
-@SuppressWarnings({"all"})
-public class SysDictItemService extends ServiceImpl<SystemDictItemMapper, SysDictItem> {
-    public List<SysDictItem> getSystemDictListByType(List<String> type) {
-        if (type == null || type.size() == 0) {
-            return new ArrayList<>();
-        }
-        LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<>();
-        return this.list(queryWrapper);
-    }
-
-}

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

@@ -45,6 +45,11 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
     private final AssoTaskPersonelService assoTaskPersonelService;
     private final ReportFieldService reportFieldService;
 
+    /**
+     * @function: 根据任务id 删除任务id
+     * @param id(Task 任务id)
+     * @return
+     */
     @Transactional(rollbackFor = Exception.class)
     public String deleteTask(Integer id) {
         try {
@@ -59,6 +64,11 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         }
     }
 
+    /**
+     * @function: 根据任务id 删除任务id
+     * @param id(Task 任务id)
+     * @return
+     */
 
     @Transactional(rollbackFor = Exception.class)
     public Boolean deleteTaskByreportId(Integer id) {
@@ -74,6 +84,11 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
             return false;
         }
     }
+    /**
+     * @function: 修改导入任务
+     * @param Task
+     * @return
+     */
     @Transactional(rollbackFor = Exception.class)
     public String updateTask(Task task) {
         try {
@@ -88,6 +103,11 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         }
     }
 
+    /**
+     * @function 查询任务
+     * @param taskVO
+     * @return
+     */
     public String queryPageList(TaskVO taskVO) {
         //获得登录人的信息
         PersonnelVO personnelVO = cacheUtils.getLoginUser(StpUtil.getLoginIdAsInt());
@@ -111,6 +131,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         lambdaQueryWrapper.orderByDesc(Task::getId);
         List<Task> taskList;
         Long count = this.count(lambdaQueryWrapper);
+        //分页
         if (taskVO.getCurrent() != null && taskVO.getSize() != null) {
             taskList = this.page(new Page<>(taskVO.getCurrent(), taskVO.getSize()), lambdaQueryWrapper).getRecords();
             return Response.success(taskList, DataUtils.setPageColumn(taskVO.getSize(), taskVO.getCurrent(), Math.toIntExact(count)));
@@ -120,7 +141,9 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         }
 
     }
-
+    /**
+     *  @function 获取对比任务
+     */
     public String getAllTask() {
         List<Task> taskList = this.list();
         return Response.success(taskList);