Pārlūkot izejas kodu

修改防疫检测、产业产值、出栏规模排序bug

Newspaper 2 gadi atpakaļ
vecāks
revīzija
e80ced6339

+ 1 - 2
huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/IndustryOutputMapper.xml

@@ -19,7 +19,6 @@
         delete from industry_output where farm_code = #{farmCode}
         delete from industry_output where farm_code = #{farmCode}
     </delete>
     </delete>
     <select id="getIndustryOutputScreen" resultType="com.huimv.cattle.pojo.IndustryOutput">
     <select id="getIndustryOutputScreen" resultType="com.huimv.cattle.pojo.IndustryOutput">
-
-        SELECT SUM(sales_money)  salesMoney, `year`, farm_code FROM  `industry_output`  WHERE farm_code !=0  GROUP BY `year`
+        SELECT SUM(sales_money)  salesMoney, `year`, farm_code FROM  `industry_output`  WHERE farm_code !=0  GROUP BY `year` order by `year` DESC
     </select>
     </select>
 </mapper>
 </mapper>

+ 1 - 1
huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/PreventDetectionMapper.xml

@@ -18,7 +18,7 @@
     </sql>
     </sql>
     <select id="getPreventDetectionScreen" resultType="com.huimv.cattle.pojo.PreventDetection">
     <select id="getPreventDetectionScreen" resultType="com.huimv.cattle.pojo.PreventDetection">
         SELECT SUM(detection_num) detectionNum ,SUM(acceptance_num) acceptanceNum,`year`,month_name ,`month` , farm_code FROM `prevent_detection`
         SELECT SUM(detection_num) detectionNum ,SUM(acceptance_num) acceptanceNum,`year`,month_name ,`month` , farm_code FROM `prevent_detection`
-        WHERE farm_code != 0 GROUP BY `year` ,`month` order  by `year` ,`month` DESC
+        WHERE farm_code != 0 GROUP BY `year` ,`month` order  by `year` DESC,`month` DESC
     </select>
     </select>
 
 
 </mapper>
 </mapper>

+ 1 - 1
huimv-cattle/src/main/java/com/huimv/cattle/service/impl/OutStockServiceImpl.java

@@ -45,7 +45,7 @@ public class OutStockServiceImpl extends ServiceImpl<OutStockMapper, OutStock> i
         if (month == null || month == "") {
         if (month == null || month == "") {
             QueryWrapper<OutStock> queryWrapper = new QueryWrapper<>();
             QueryWrapper<OutStock> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_code", farmCode);
             queryWrapper.eq("farm_code", farmCode);
-            List<OutStock> list = outStockMapper.selectList(queryWrapper.orderByDesc("month"));
+            List<OutStock> list = outStockMapper.selectList(queryWrapper.orderByDesc("year").orderByDesc("month"));
             return new Result(ResultCode.SUCCESS, list);
             return new Result(ResultCode.SUCCESS, list);
         } else {
         } else {
             Integer months = Integer.parseInt(month);
             Integer months = Integer.parseInt(month);