diff --git a/src/main/java/com/example/demo/mapper/DetailYMapper.java b/src/main/java/com/example/demo/mapper/DetailYMapper.java index 8e1f642..cc207bd 100644 --- a/src/main/java/com/example/demo/mapper/DetailYMapper.java +++ b/src/main/java/com/example/demo/mapper/DetailYMapper.java @@ -45,6 +45,7 @@ public interface DetailYMapper { "`user` ON detail_y.jwcode = `user`.jwcode", "", "and detail_y.jwcode=#{jwcode}", + "AND `user`.area=#{area}", "", "GROUP BY", "user_gold.jwcode", @@ -68,7 +69,9 @@ public interface DetailYMapper { "and detail_y.jwcode=#{jwcode}", "and update_type=#{updateType}", "AND detail_y.create_time BETWEEN #{startDate} AND #{endDate}", + "", + "ORDER BY detaily_id desc", "" }) @@ -84,9 +87,9 @@ public interface DetailYMapper { "`detail_y`", "", "AND jwcode=#{jwcode}", -// "AND update_type=#{updateType}", -// "AND create_time BETWEEN #{startDate} AND #{endDate}", - "AND area=#{area}", + "AND update_type=#{updateType}", + "AND create_time BETWEEN #{startDate} AND #{endDate}", + "", "" })