11/24 upat

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

@@ -28,7 +28,11 @@ public class CompareRecords extends BaseEntity<CompareRecords> {
      */
     @TableField(value = "POSITION")
     private String position;
-
+    /*
+    栏位
+     */
+    @TableField(value = "FIELDS")
+    private String fields;
     /**
      * 内容
      */
@@ -50,6 +54,17 @@ public class CompareRecords extends BaseEntity<CompareRecords> {
 //    private String features;
 //    @TableField(exist = false)
 //    private List<String> featuresList;
+    @TableField(exist = false)
+    private List<CY> CY;
+
+    @Data
+    public static class CY {
+        private int id;
+        private String rightName;
+        private String content;
+
+    }
+
 
 
 
@@ -57,12 +72,12 @@ public class CompareRecords extends BaseEntity<CompareRecords> {
      * 对比人ID
      */
     @TableField(value = "PERSON_ID")
-    private String personId;
+    private int personId;
 
     /**
      * 报告ID
      */
     @TableField(value = "REPORT_ID")
-    private String reportId;
+    private int reportId;
 
 }

RMS/src/main/java/cn/cslg/report/mapper/ReportFieldMapper.java

@@ -4,7 +4,11 @@ import cn.cslg.report.entity.CompareFiles;
 import cn.cslg.report.entity.ReportField;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface ReportFieldMapper extends BaseMapper<ReportField> {
+    List<ReportField> find(@Param("reportId") int reportId);
 }

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

@@ -35,7 +35,7 @@ import java.util.stream.Collectors;
 @Service
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class ReportFieldService extends ServiceImpl<ReportFieldMapper, ReportField> {
-
+ private final ReportFieldMapper reportFieldMapper;
  private  final LoginUtils loginUtils;
  private  final ReportFieldTextService reportFieldTextService;
  private  final ReportFieldOptionService reportFieldOptionService;
@@ -146,19 +146,9 @@ public class ReportFieldService extends ServiceImpl<ReportFieldMapper, ReportFie
         queryWrapper.eq(ReportField::getReportId, projectId);
         return this.getOne(queryWrapper);
     }
-
-  //给报告添加默认自定义字段
-    public void addDefaultField(Integer reportId, Integer reportType) {
-        LambdaQueryWrapper<ReportField> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(ReportField::getType, reportType);
-        queryWrapper.eq(ReportField::getReportId, null);
-        List<ReportField> reportFields =this.list(queryWrapper);
-        if(reportFields.size()!=0||reportFields!=null)
-        {
-         reportFields.forEach(p->p.setReportId(reportId));
-         this.saveBatch(reportFields);
-        }
-
+    public String getReportField(int id){
+        List<ReportField> reportFields = reportFieldMapper.find(id);
+        return Response.success(reportFields);
     }
 
 }

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

@@ -64,7 +64,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
             report.setPersonName(map.get("personName").toString());
             boolean addFlag = this.save(report);
             if (addFlag) {
-                reportFieldService.addDefaultField(report.getId(),report.getType());
+//                reportFieldService.addDefaultField(report.getId(),report.getType());
                 return report.getId();
             } else {
                 return 0;