12.20 chenyi

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

@@ -119,6 +119,12 @@ public class ReportController {
         }
         return Response.error();
     }
-
+    @GetMapping(value = "updateStatus")
+    @Operation(summary = "修改报告状态")
+    @Transactional(rollbackFor = Exception.class)
+    public String updateStatus(Integer reportId,Integer status){
+        reportService.updateStatus(reportId,status);
+        return Response.success();
+    }
 
 }

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

@@ -3,10 +3,12 @@ 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;
 import java.util.List;
@@ -56,6 +58,8 @@ public class Report extends BaseEntity<Report> {
      * 报告生成时间
      */
     @Schema(description="报告生成时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(value = "CREATE_TIME")
     private Date createTime;
 

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

@@ -2,6 +2,7 @@ package cn.cslg.report.service.business;
 
 import cn.cslg.report.entity.AssoComapareFiel;
 import cn.cslg.report.entity.Features;
+import cn.cslg.report.entity.Report;
 import cn.cslg.report.entity.asso.AssoTaskPatentSplit;
 import cn.cslg.report.entity.asso.AssoTaskPersonel;
 import cn.cslg.report.mapper.AssoComapareFielMapper;
@@ -26,6 +27,7 @@ import java.util.Map;
 public class AssoTaskPatentSplitService extends ServiceImpl<AssoTaskPatentSplitMapper, AssoTaskPatentSplit> {
  private final AssoTaskPersonelService assoTaskPersonelService;
  private final FeatureService featureService;
+ private final ReportService reportService;
 
     /**
      *
@@ -50,12 +52,13 @@ public class AssoTaskPatentSplitService extends ServiceImpl<AssoTaskPatentSplitM
             return map;
         }else {
             Map<String, Object> map = new HashMap<>();
-            LambdaQueryWrapper<Features> queryWrapper=new LambdaQueryWrapper<>();
-            queryWrapper.eq(Features::getReportId,reportId).eq(Features::getSignPatentNo,patentNo);
-            Features features = featureService.list(queryWrapper).get(0);
-            if (features != null) {
-                map.put("splitBy", features.getSplitBy());
-                map.put("splitType", features.getSplitType());
+            LambdaQueryWrapper<Report> queryWrapper=new LambdaQueryWrapper<>();
+            queryWrapper.eq(Report::getId,reportId).eq(Report::getSignPatentNo,patentNo);
+            Report report = reportService.list(queryWrapper).get(0);
+            if (report != null) {
+                map.put("splitBy", report.getSplitBy());
+                map.put("splitType", report.getSplitType());
+
             } else {
                 map.put("splitBy", null);
                 map.put("splitType", null);

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

@@ -319,11 +319,8 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
             params.setReportId(task.getReportId());
             reportFieldPatentLinkService.updatePatentIndexSetting(params);
             LambdaQueryWrapper<AssoTaskPersonel> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper
-                    .eq(AssoTaskPersonel::getPatentNo, params.getPatentNo());
-            if(params.getTaskID()!=null){
-                queryWrapper.eq(AssoTaskPersonel::getTaskId,params.getTaskID());
-            }
+            queryWrapper.eq(AssoTaskPersonel::getPatentNo, params.getPatentNo());
+            queryWrapper.eq(AssoTaskPersonel::getTaskId,params.getTaskID());
             AssoTaskPersonel assoTaskPersonel = assoTaskPersonelService.list(queryWrapper).get(0);
             assoTaskPersonel.setState(1);
             assoTaskPersonel.updateById();

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

@@ -77,6 +77,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
             report.setCreatePersonId(personnelVO.getId());
             boolean addFlag = this.save(report);
 
+
             if (files != null && files.size() != 0) {
                 //将文档上传并返回文件入库的Id
                 List<Integer> fileIds = reportFileService.uploadFiles(files);
@@ -88,10 +89,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
             //如果报告生成成功，给报告添加默认自定义字段
             if (addFlag) {
                 reportFieldService.addDefaultField(report.getId(), report.getType());
-                CompareFiles compareFiles = new CompareFiles();
-                compareFiles.setReportId(report.getId());
-                compareFiles.setPatentNo(report.getSignPatentNo());
-                compareFilesService.add(compareFiles);
+
                 return report.getId();
             } else {
                 return 0;
@@ -305,5 +303,21 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
 
     }
 
+    /**
+     * 修改报告的状态
+     * @param reportId 报告id
+     * @param status 状态
+     */
+    @Transactional
+    public void updateStatus(Integer reportId,Integer status){
+        LambdaQueryWrapper<Report> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Report::getId, reportId);
+        Report report = this.list(wrapper).get(0);
+        report.setStatus(status);
+        report.updateById();
+
+    }
+
+
 
 }

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

@@ -686,10 +686,8 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
 
         if(taskID!=null) {
             LambdaQueryWrapper<AssoTaskPersonel> queryWrapper = new LambdaQueryWrapper<>();
-
             queryWrapper.eq(AssoTaskPersonel::getPatentNo, patentNo);
             queryWrapper.eq(AssoTaskPersonel::getTaskId, taskID);
-
             AssoTaskPersonel assoTaskPersonel = assoTaskPersonelService.list(queryWrapper).get(0);
             if (assoTaskPersonel.getState().equals(1)) {
                 assoTaskPersonel.setState(0);
@@ -703,9 +701,6 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
             CompareFiles compareFiles = compareFilesService.list(queryWrapper).get(0);
             compareFiles.setState(1);
             compareFiles.updateById();
-
-
-
         }
             return Response.success();