修改贸易合同排序

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/res/QueryListResVo.java

@@ -180,6 +180,10 @@ public class QueryListResVo implements Serializable {
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Schema(description = "创建时间")
     private Date createTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Schema(description = "更新时间")
+    private Date updateTime;
     /**
      * 起始日期
      */

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractTradeService.java

@@ -1729,7 +1729,10 @@ public class KwcContractTradeService {
                     .filter(x -> org.apache.commons.lang3.StringUtils.equals(x.getProvideEntId(), req.getSupplyEntId()))
                     .collect(Collectors.toList());
         }
-        return queryListResVos;
+        return queryListResVos.stream()
+                .sorted(Comparator.comparing(QueryListResVo::getUpdateTime).reversed()
+                        .thenComparing(Comparator.comparing(QueryListResVo::getId).reversed()))
+                .collect(Collectors.toList());
     }
 
     @NotNull
@@ -1809,7 +1812,8 @@ public class KwcContractTradeService {
         }
         queryListResVo.setCreateTime(t.getCreateTime());
         queryListResVo.setStartTime(t.getStartTime());
-        if (Objects.nonNull(t.getStartTime())) {
+        queryListResVo.setUpdateTime(t.getUpdateTime());
+        if (Objects.nonNull(t.getEndTime())) {
             queryListResVo.setEndTime(t.getEndTime());
             String endDate = DateUtils.format(t.getEndTime(), DateUtils.DATE_PATTERN);
             if (org.apache.commons.lang3.StringUtils.equals(endDate, "9999-12-30")) {