Procházet zdrojové kódy

日期格式化,修改排序

xiao547607 před 5 roky
rodič
revize
1a0145174e

+ 3 - 1
picc-admin-server/src/main/java/com/jpsoft/picc/modules/business/controller/InsurancePolicyController.java

@@ -1027,7 +1027,9 @@ public class InsurancePolicyController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("a.create_time","desc"));
+
+        sortList.add(new Sort("a.commission_time","desc"));
+        sortList.add(new Sort("a.create_time","asc"));
 
         searchParams.put("status0",PolicyStatus.Expired.getValue());
 

+ 2 - 2
picc-common/src/main/java/com/jpsoft/picc/modules/business/entity/InsurancePolicy.java

@@ -108,8 +108,8 @@ public class InsurancePolicy {
     @ApiModelProperty(value = "佣金金额")
     private BigDecimal commission;
 
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone ="GMT+8")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
     @ApiModelProperty(value = "佣金打款时间")
     private Date commissionTime;