代码部分恢复

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java

@@ -166,11 +166,14 @@ public class SarStandardComplianceAssessResultController {
     public ResponseMessage<IPage<SarStandardComplianceProductAssess>> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception {
         IPage<SarStandardComplianceProductAssess> iPage = new Page<>(eo.getCurrent(), eo.getSize());
         QueryWrapper<SarStandardComplianceProductAssess> queryWrapper = new QueryWrapper<>();
-        if (eo.getType() !=null) queryWrapper.eq("type",eo.getType());
         if (eo.getProductName() != null) queryWrapper.like("product_name", eo.getProductName());
-        if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId());
-        if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime());
+//        if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId());
+//        if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime());
+
         IPage<SarStandardComplianceProductAssess> page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper);
+
+//        while(page.getRecords().remove(null));
+
         return Result.success(page);
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java

@@ -91,10 +91,6 @@ public class SarStandardComplianceProductAssess extends BaseEntity {
     @ApiModelProperty(value = "在产产品合规信息")
     private String productionCompliance;
 
-    @ApiModelProperty(value = "在产产品不合规信息")
-    @TableField("production_non_compliance")
-    private String productionNonCompliance;
-
     @ApiModelProperty(value = "在产产品不合规应对措施")
     private String productionCountermeasures;
 
@@ -117,10 +113,6 @@ public class SarStandardComplianceProductAssess extends BaseEntity {
     @TableField("clause_name")
     private String clauseName;
 
-    @ApiModelProperty(value = "流程UUID")
-    @TableField("type")
-    private String type;
-
 
     private String id;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java

@@ -18,10 +18,6 @@ public class SarStandardComplianceProductAssessEO{
     @TableField("STAND_ID")
     private String standId;
 
-    @ApiModelProperty(value = "流程UUID")
-    @TableField("type")
-    private String type;
-
     @ApiModelProperty(value = "'项目名称'")
     private String productName;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java

@@ -25,9 +25,6 @@ public class SarStandardsInfoEO {
     @ApiModelProperty(value = "国内1，国外2")
     private Integer position=1;
 
-    @ApiModelProperty(value = "流程UUID")
-    @TableField("type")
-    private String type;
 
     @ApiModelProperty("页数")
     private Integer current=1;