后端整合模块

src/main/java/com/example/demo/mapper/DetailYMapper.java

@@ -45,6 +45,7 @@ public interface DetailYMapper {
                     "`user` ON detail_y.jwcode = `user`.jwcode",
                     "<where>",
                     "<if test='jwcode!=null and jwcode.length>0'>and detail_y.jwcode=#{jwcode}</if>",
+                    "<if test='area!=null and area.length>0'>AND `user`.area=#{area}</if>",
                     "</where>",
                     "GROUP BY",
                     "user_gold.jwcode",
@@ -68,7 +69,9 @@ public interface DetailYMapper {
             "<if test='jwcode!=null and jwcode.length>0'>and detail_y.jwcode=#{jwcode}</if>",
             "<if test='updateType!=null'>and update_type=#{updateType}</if>",
             "<if test='startDate != null and endDate != null'>AND detail_y.create_time BETWEEN #{startDate} AND #{endDate}</if>",
+
             "</where>",
+            "ORDER BY detaily_id desc",
             "</script>"
 
     })
@@ -84,9 +87,9 @@ public interface DetailYMapper {
             "`detail_y`",
             "<where>",
             "<if test='jwcode!=null and jwcode.length>0'>AND jwcode=#{jwcode}</if>",
-//            "<if test='updateType!=null'>AND update_type=#{updateType}</if>",
-//            "<if test='startDate != null and endDate != null'>AND create_time BETWEEN #{startDate} AND #{endDate}</if>",
-            "<if test='area!=null and area.length>0'>AND area=#{area}</if>",
+            "<if test='updateType!=null'>AND update_type=#{updateType}</if>",
+            "<if test='startDate != null and endDate != null'>AND create_time BETWEEN #{startDate} AND #{endDate}</if>",
+
             "</where>",
             "</script>"
     })