数字农业增加可视化

src/main/java/com/sooka/sponest/data/digitalforest/controller/CenterdataTForestTreesController.java

@@ -166,8 +166,7 @@ public class CenterdataTForestTreesController extends BaseController {
 
     @ApiOperation(value = "查询数量按类型分组远端调用", notes = "查询数量按类型分组远端调用")
     @GetMapping("/selectCenterdataTForestTreesGroupByType")
-    public R<List<CenterdataTForestTreesTJ>> selectCenterdataTForestTreesGroupByType() {
-        CenterdataTForestTrees centerdataTForestTree = new CenterdataTForestTrees();
+    public R<List<CenterdataTForestTreesTJ>> selectCenterdataTForestTreesGroupByType(CenterdataTForestTrees centerdataTForestTree) {
         return R.ok(centerdataTForestTreesService.selectCenterdataTForestTreesGroupByType(centerdataTForestTree));
     }
 }

src/main/resources/mapper/digitalforest/CenterdataTForestAnimalMapper.xml

@@ -198,6 +198,9 @@
         <if test="type != null  and type != ''">
             and a.type = #{type}
         </if>
+        <if test="year != null">
+            and DATE_FORMAT(a.appear_time,'%Y') = #{year}
+        </if>
         ${params.dataScope}
         order by a.appear_time desc, a.create_time desc
     </select>
@@ -290,7 +293,11 @@
             FROM
                 centerdata_t_forest_animal a
                 LEFT JOIN ${database_system}.sys_dept d ON d.dept_id = a.dept_id
-            where 1=1 ${params.dataScope}
+            where 1=1
+        <if test="year != null">
+            and DATE_FORMAT(a.appear_time,'%Y') = #{year}
+        </if>
+            ${params.dataScope}
             GROUP BY
             type
             ) b ON a.dict_value = b.type