土地供应数据统计年份优化

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/YdbpData.java

@@ -20,7 +20,7 @@ public class YdbpData extends BaseId {
     private String pfwh;
     private String pfDate;
     private String creatorId;
-
+    private Boolean hasOnchain;    // 是否上链
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createdAt;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

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

@@ -445,6 +445,10 @@ public class SupplyServiceImpl implements ISupplyService {
 //        GongdiJihuaFilterVo filterVo = new GongdiJihuaFilterVo();
 //        filterVo.setPageSize(100000);
 //        List<GongdiJihua> completeList = gongdiJihuaMapper.getList(filterVo);
+        if(StringUtils.isNotBlank(startYear) && StringUtils.isNotBlank(endYear)){
+            startYear+="+-01-01";
+            endYear+="+-12-31";
+        }
 
         //这里合并两部分数据
         List<TdgyStatisticsRes> completeList = new ArrayList<>();

siwei-modules/siwei-apply/src/main/resources/mapper/TdgyMapper.xml

@@ -167,7 +167,6 @@
         <if test="endTime != null and endTime != ''">
             AND t_node.hbcrht_date &lt;= #{endTime}
         </if>
-        LIMIT 41
     </select>
 
     <!-- 查询当前存量土地实际供应情况！ -->
@@ -203,7 +202,6 @@
         <if test="endTime != null and endTime != ''">
             AND CAST(gj_gd_data.qdrq AS VARCHAR) &lt;= #{endTime}
         </if>
-        LIMIT 41
     </select>
 
     <!-- 根据年份查询当前存量土地实际供应情况！ -->

siwei-modules/siwei-apply/src/main/resources/mapper/YdbpDataMapper.xml

@@ -14,6 +14,7 @@
         <result property="bpDate" column="bp_date"/>
         <result property="pfwh" column="pfwh"/>
         <result property="pfDate" column="pf_date"/>
+        <result property="hasOnchain" column="has_onchain"/>
         <result property="creatorId" column="creator_id"/>
         <result property="createdAt" column="created_at"/>
         <result property="updatedAt" column="updated_at"/>
@@ -26,7 +27,7 @@
         )
     </insert>
     <select id="getById" parameterType="string" resultMap="YdbpDataResultMap">
-        SELECT id, name, yd_area, yd_unit, zs_area, zs_unit, has_zz, bp_date, pfwh, pf_date, creator_id, created_at, updated_at
+        SELECT id, name, yd_area, yd_unit, zs_area, zs_unit, has_zz, bp_date, pfwh, pf_date, creator_id, created_at, updated_at,has_onchain
         FROM t_ydbp_data
         WHERE id = #{id}
     </select>