优化试验汇总-生成顺序调整

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/SelectedTabVO.java

@@ -1,5 +1,6 @@
 package org.springblade.manager.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,9 +10,11 @@ import java.io.Serializable;
 public class SelectedTabVO implements Serializable {
 
     @ApiModelProperty(value = "主键id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long pKeyId;
 
     @ApiModelProperty(value = "id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long initTabId;
 
     @ApiModelProperty(value = "表单名称")

blade-service/blade-business/src/main/java/org/springblade/business/controller/TrialSummaryController.java

@@ -199,7 +199,7 @@ public class TrialSummaryController {
                     .eq(TrialSelfInspectionRecord::getType, dto.getUnitType())
                     .eq(TrialSelfInspectionRecord::getTaskStatus, "已审批")
                     .between(TrialSelfInspectionRecord::getReportDate, startDate, endDate)
-                    .last(" order by report_date, report_no, record_no asc")
+                    .last(" order by sort asc, create_time desc")
             );
             if (records.size() <= 0) {
                 throw new ServiceException("未获取到该报告时间段范围内的试验自检记录信息，操作失败");