手机端接口优化

.idea/misc.xml

@@ -13,7 +13,7 @@
       </set>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MAreaController.java

@@ -119,8 +119,8 @@ public class MAreaController extends BaseController {
      * @return
      */
     @GetMapping("/getArea")
-    public AjaxResult getArea(String name) {
-        return AjaxResult.success(iMAreaService.getArea(name));
+    public AjaxResult getArea(String name,String district) {
+        return AjaxResult.success(iMAreaService.getArea(name,district));
     }
 
     /**

ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/MOrder.java

@@ -87,4 +87,12 @@ public class MOrder extends BaseEntity {
     private Integer version;
     private String whether;
 
+    private Long areaId;
+    private String areaName;
+    private Long buildingId;
+    private String buildingName;
+    private Long unitId;
+    private String unitName;
+    private String houseName;
+
 }

ruoyi-mobile/src/main/java/com/ruoyi/mobile/mapper/MAreaMapper.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @date 2021-11-24
  */
 public interface MAreaMapper extends BaseMapperPlus<MArea> {
-    List<MAreaVo> getArea(@Param("name")String name);
+    List<MAreaVo> getArea(@Param("name")String name,@Param("district")String district);
     List<MUserForemanVo> getWorker();
     //小区合格率
     List<MCensusVo> getExamineArea(Long areaId);

ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/IMAreaService.java

@@ -60,7 +60,7 @@ public interface IMAreaService extends IServicePlus<MArea, MAreaVo> {
 	 * 小区下拉
 	 * @return
 	 */
-	List<MAreaVo> getArea(String name);
+	List<MAreaVo> getArea(String name,String district);
 
 	/**
 	 * 工人下拉

ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/impl/MAreaServiceImpl.java

@@ -109,8 +109,8 @@ public class MAreaServiceImpl extends ServicePlusImpl<MAreaMapper, MArea, MAreaV
     }
 
     @Override
-    public List<MAreaVo> getArea(String name) {
-        return mAreaMapper.getArea(name);
+    public List<MAreaVo> getArea(String name,String district) {
+        return mAreaMapper.getArea(name,district);
     }
 
     @Override

ruoyi-mobile/src/main/resources/mapper/mobile/MAreaMapper.xml

@@ -25,6 +25,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="name != null  and name != ''">
             and a.name like CONCAT('%',CONCAT(#{name}), '%')
         </if>
+        <if test="district != null  and district != ''">
+            and a.district = #{district}
+        </if>
     </select>
     <select id="getWorker" resultType="com.ruoyi.mobile.domain.vo.MUserForemanVo">
     select id   as id,