fix (farm): 大屏-驾驶舱

- 修改package结构
- 修复bug
This commit is contained in:
达富斌
2025-09-23 20:46:04 +08:00
parent b6be889d5a
commit c894b04ebf
157 changed files with 1516 additions and 942 deletions

View File

@@ -31,4 +31,20 @@
</if>
</where>
</select>
<select id="getBaseStatisticsInfo"
resultType="cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo.BaseStatisticsInfoRespVO">
SELECT
COALESCE(SUM(fbi.area), 0) as totalArea,
COUNT(DISTINCT fbi.id) as totalBase,
COUNT(DISTINCT fpi.id) as totalPlot
FROM farm_base_info fbi
LEFT JOIN farm_plot_info fpi ON fbi.id = fpi.base_id
<where>
fbi.deleted = b'0'
<if test="baseId != null and baseId !=''">
AND fbi.id = #{baseId}
</if>
</where>
</select>
</mapper>

View File

@@ -25,7 +25,7 @@
<select id="getPlanOverview"
parameterType="String"
resultType="cn.iocoder.yudao.module.farm.controller.admin.cropFarmingCenter.vo.ProductionPlanRespVO$PlanOverview">
resultType="cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.ProductionPlanRespVO$PlanOverview">
SELECT
COUNT(*) AS planCount,
SUM(CASE WHEN plan_status = 3 THEN 1 ELSE 0 END) AS planCompletedCount,