1.0.0 小程序日历查询接口参数修改

air/src/main/java/com/air/applets/controller/LandListedController.java

@@ -131,8 +131,8 @@ public class LandListedController {
      **/
     @ApiOperation(value = "按日期统计地块数量(日历)", notes = "按日期统计地块数量(日历)")
     @GetMapping("/calendar")
-    public R<List<LandListedStatisticsDto>> appletsCalendar(@RequestParam String date , String city) {
-        return landListedService.appletsCalendar(date,city);
+    public R<List<LandListedStatisticsDto>> appletsCalendar(@RequestParam String date , String city,String canton) {
+        return landListedService.appletsCalendar(date,city,canton);
     }
 
 }

air/src/main/java/com/air/land/mapper/LandListedMapper.java

@@ -47,18 +47,20 @@ public interface LandListedMapper extends BaseMapper<LandListed> {
      * @author peihao
      * @param annoDate 挂牌日期(yyyy-MM）
      * @param city 城市
+     * @param canton 区县
      * @date 2021/7/9
      * @return
      **/
-    List<LandListedStatisticsDto> appletsCalendarToAnnoDate(@Param("annoDate") String annoDate , @Param("city") String city);
+    List<LandListedStatisticsDto> appletsCalendarToAnnoDate(@Param("annoDate") String annoDate , @Param("city") String city,@Param("canton") String canton);
 
     /**
      * 按拍卖日期统计地块数量(日历)
      * @author peihao
      * @param auctionDate 拍卖日期(yyyy-MM）
      * @param city 城市
+     * @param canton 区县
      * @date 2021/7/9
      * @return
      **/
-    List<LandListedStatisticsDto> appletsCalendarToAuctionDate(@Param("auctionDate") String auctionDate , @Param("city") String city);
+    List<LandListedStatisticsDto> appletsCalendarToAuctionDate(@Param("auctionDate") String auctionDate , @Param("city") String city,@Param("canton") String canton);
 }

air/src/main/java/com/air/land/service/LandListedService.java

@@ -38,10 +38,11 @@ public interface LandListedService extends IService<LandListed> {
      * @author peihao
      * @param date 日期(yyyy-MM）
      * @param city 城市
+     * @param canton 区县
      * @date 2021/7/9
      * @return
      **/
-    R<List<LandListedStatisticsDto>> appletsCalendar(String date , String city);
+    R<List<LandListedStatisticsDto>> appletsCalendar(String date , String city,String canton);
 
     /**
      * 导入已挂牌地块信息

air/src/main/java/com/air/land/service/impl/LandListedServiceImpl.java

@@ -63,9 +63,9 @@ public class LandListedServiceImpl extends ServiceImpl<LandListedMapper, LandLis
     }
 
     @Override
-    public R<List<LandListedStatisticsDto>> appletsCalendar(String date, String city) {
-        List<LandListedStatisticsDto> annoDateList = baseMapper.appletsCalendarToAnnoDate(date, city);
-        List<LandListedStatisticsDto> auctionDateList = baseMapper.appletsCalendarToAuctionDate(date, city);
+    public R<List<LandListedStatisticsDto>> appletsCalendar(String date, String city,String canton) {
+        List<LandListedStatisticsDto> annoDateList = baseMapper.appletsCalendarToAnnoDate(date, city,canton);
+        List<LandListedStatisticsDto> auctionDateList = baseMapper.appletsCalendarToAuctionDate(date, city,canton);
         if (CollectionUtil.isEmpty(annoDateList)){
             return R.ok(auctionDateList);
         }

air/src/main/resources/mapper/LandListedMapper.xml

@@ -137,6 +137,9 @@
             <if test="city != null and city != ''">
                 and city = #{city}
             </if>
+            <if test="canton != null and canton != ''">
+                and canton = #{canton}
+            </if>
         GROUP BY DATE_FORMAT(ll.anno_date,'%Y-%m-%d')
     </select>
 
@@ -151,6 +154,9 @@
             <if test="city != null and city != ''">
                 and city = #{city}
             </if>
+            <if test="canton != null and canton != ''">
+                and canton = #{canton}
+            </if>
         GROUP BY DATE_FORMAT(ll.auction_date,'%Y-%m-%d')
     </select>