加字段并修改技术评估查询

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

@@ -76,14 +76,14 @@ 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,risk_degree");
+                queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, min(INTERPRETATION_TIME) as INTERPRETATION_TIME,risk_degree,prc_num");
                 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());
                 }
-
+                queryWrapper.groupBy("STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE,risk_degree,prc_num");
                 IPage<SarInterpretationNationalStandard> page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper);
 
                 while (page.getRecords().remove(null)) ;

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

@@ -39,6 +39,9 @@ public class InterpretationEO {
     @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date interpretationTime;
 
+    @ApiModelProperty(value = "流程编号")
+    private String prcNum;
+
     @ApiModelProperty(value = "国内(1)/外(2)")
     private Integer position=1;
 

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

@@ -98,6 +98,9 @@ public class SarInterpretationNationalStandard extends BaseEntity {
     @TableField("risk_degree")
     private String riskDegree;
 
+    @ApiModelProperty(value = "流程编号")
+    private String prcNum;
+
 
     @TableField(exist = false)
     private String applyArctic;