标准合规评估流程 项目评估结果后台查询bug~~~~

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

@@ -59,13 +59,16 @@ public class SarStandardComplianceAssessResultController {
         if (eo.getStandApplicationType() == 1) {
             QueryWrapper<SarStandardComplianceProductAssess> queryWrapper = new QueryWrapper<>();
             IPage<SarStandardComplianceProductAssess> iPage = new Page<>(eo.getCurrent(), eo.getSize());
-            queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME");
+            queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type");
             if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) {
                 queryWrapper.like("STAND_NAME",eo.getStandName().trim());
             }
             if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) {
                 queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim());
             }
+            if (eo.getType() != null && !eo.getType().trim().equals("")) {
+                queryWrapper.like("type",eo.getType().trim());
+            }
             IPage<SarStandardComplianceProductAssess> page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper);
 
             while(page.getRecords().remove(null));
@@ -75,13 +78,16 @@ public class SarStandardComplianceAssessResultController {
             if(eo.getPosition()==1){
                 QueryWrapper<SarInterpretationNationalStandard> queryWrapper = new QueryWrapper<>();
                 IPage<SarInterpretationNationalStandard> iPage = new Page<>(eo.getCurrent(), eo.getSize());
-                queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME");
+                queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type");
                 if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) {
                     queryWrapper.like("STAND_NAME",eo.getStandName().trim());
                 }
                 if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) {
                     queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim());
                 }
+                if (eo.getType() != null && !eo.getType().trim().equals("")) {
+                    queryWrapper.like("type",eo.getType().trim());
+                }
                 IPage<SarInterpretationNationalStandard> page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper);
 
                 while(page.getRecords().remove(null));
@@ -90,13 +96,16 @@ public class SarStandardComplianceAssessResultController {
             }else{
                 QueryWrapper<SarInterpretationForeignStandard> queryWrapper = new QueryWrapper<>();
                 IPage<SarInterpretationForeignStandard> iPage = new Page<>(eo.getCurrent(), eo.getSize());
-                queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME");
+                queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type");
                 if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) {
                     queryWrapper.like("STAND_NAME",eo.getStandName().trim());
                 }
                 if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) {
                     queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim());
                 }
+                if (eo.getType() != null && !eo.getType().trim().equals("")) {
+                    queryWrapper.like("type",eo.getType().trim());
+                }
 
                 IPage<SarInterpretationForeignStandard> page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper);
                 while(page.getRecords().remove(null));
@@ -158,9 +167,13 @@ 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<>();
+//        queryWrapper.select("*");
+
+        if (eo.getType() !=null) queryWrapper.like("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());
+//        queryWrapper.last("WHERE type = " + eo.getType());
 
         IPage<SarStandardComplianceProductAssess> page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper);
 

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

@@ -117,6 +117,10 @@ 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,6 +18,10 @@ 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,6 +25,9 @@ public class SarStandardsInfoEO {
     @ApiModelProperty(value = "国内1，国外2")
     private Integer position=1;
 
+    @ApiModelProperty(value = "流程UUID")
+    @TableField("type")
+    private String type;
 
     @ApiModelProperty("页数")
     private Integer current=1;