增加时间

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/LandSupplyProjectVO.java

@@ -1,6 +1,9 @@
 package com.siwei.apply.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class LandSupplyProjectVO {
     private String projectPropertyId;
@@ -10,6 +13,8 @@ public class LandSupplyProjectVO {
     private String supplyMethod;
     private String supplyType;
     private String dateType;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date year;
     private String area;
     private String geom;
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/impl/SupplyServiceImpl.java

@@ -561,6 +561,7 @@ public class SupplyServiceImpl implements ISupplyService {
                 vo.setGeom(item.getGeom());
                 String area = String.format("%.2f", item.getMjMu() == null ? BigDecimal.ZERO : item.getMjMu());
                 vo.setArea(area);
+                vo.setYear(item.getGysj());
                 return vo;
             }).collect(Collectors.toList());
         }else if(supplyType == 2){
@@ -588,6 +589,7 @@ public class SupplyServiceImpl implements ISupplyService {
                  }
                  vo.setNodeId(item.getNodeId());
                  vo.setGeom(item.getGeom());
+                 vo.setYear(item.getGysj());
                  return vo;
              }).collect(Collectors.toList());
         } else if(supplyType == 0){