11/28 upat

RMS/src/main/java/cn/cslg/report/common/model/vo/CompareScenariosVO.java

@@ -1,4 +1,5 @@
 package cn.cslg.report.common.model.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -6,12 +7,14 @@ import java.util.List;
 @Data
 @Accessors(chain = true)
 public class CompareScenariosVO {
-    private String rightId;
+
+    private Integer rightId;
 
 
     private String right;
 
-    private String reportId;
+
+    private Integer reportId;
 
 
     private String signPatentNo;

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

@@ -19,19 +19,19 @@ public class CompareScenarios extends BaseEntity<CompareResults> {
      * 权要ID
      */
     @TableField(value = "RIGHT_ID")
-    private String rightId;
+    private Integer rightId;
 
     /**
-     * 权要
+     * 权要ming
      */
-    @TableField(value = "RIGHT")
+    @TableField(value = "RIGHTNAME")
     private String right;
 
     /**
      * 报告ID
      */
     @TableField(value = "REPORT_ID")
-    private String reportId;
+    private Integer reportId;
 
     /**
      * 对比方案/产品号
@@ -42,7 +42,7 @@ public class CompareScenarios extends BaseEntity<CompareResults> {
     /**
      * 对比结果
      */
-    @TableField(value = "CONTRAST_RESULT")
+    @TableField(value = "CONTRAST")
     private String contrastResult;
 
     /**

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

@@ -33,15 +33,6 @@ public class CompareScenariosService extends ServiceImpl<CompareScenariosMapper,
         compareScenarios.setRightId(compareScenariosVO.getRightId());
         compareScenarios.setSignPatentNo(compareScenariosVO.getSignPatentNo());
         compareScenarios.insert();
-//        LambdaQueryWrapper<CompareScenarios> wrapper = new LambdaQueryWrapper<>();
-//        wrapper.eq(CompareScenarios::getContrastResult,compareScenariosVO.getContrastResult())
-//                .eq(CompareScenarios::getReportId,compareScenariosVO.getReportId())
-//                .eq(CompareScenarios::getRight,compareScenariosVO.getRight())
-//                .eq(CompareScenarios::getPersonId,loginUtils.getId())
-//                .eq(CompareScenarios::getRightId,compareScenariosVO.getRightId())
-//                .eq(CompareScenarios::getSignPatentNo,compareScenariosVO.getSignPatentNo());
-//        List<CompareScenarios> scenarios =this.list(wrapper);
-//        CompareScenarios compareScenarios1 = scenarios.get(0);
         Integer id = compareScenarios.getId();
         List<Integer> FeaturesId = compareScenariosVO.getFeaturesIDList();
         for(Integer integer:FeaturesId){
@@ -49,8 +40,6 @@ public class CompareScenariosService extends ServiceImpl<CompareScenariosMapper,
             compareScenariosAndRecords.setScenariosID(id);
             compareScenariosAndRecords.setFeaturesID(integer);
             compareScenariosAndRecordsService.add(compareScenariosAndRecords);
-
-
         }
         List<Integer> recordIDList = compareScenariosVO.getRecordIDList();
         for(Integer integer:recordIDList) {
@@ -59,9 +48,7 @@ public class CompareScenariosService extends ServiceImpl<CompareScenariosMapper,
             compareScenariosAndRecords.setRecordID(integer);
             compareScenariosAndRecordsService.add(compareScenariosAndRecords);
         }
-
        return Response.success();
-
     }
 
 }