java110 лет назад: 5
Родитель
Сommit
94f494eef0

+ 1 - 1
java110-db/src/main/resources/mapper/community/MenuServiceDaoImplMapper.xml

@@ -304,7 +304,7 @@
             AND ppr.status_cd = '0'
             )
         </if>
-        order by t.create_time desc
+        order by t.seq desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>

+ 1 - 1
java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml

@@ -734,7 +734,7 @@
         building_room t
         INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
         INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` = '0'
-        WHERE and t.status_cd= '0'
+        WHERE t.status_cd= '0'
         <if test="floorId !=null and floorId != ''">
             and f.`floor_id`= #{floorId}
         </if>

+ 28 - 2
service-fee/src/main/java/com/java110/fee/api/ImportFeeDetailApi.java

@@ -1,7 +1,9 @@
 package com.java110.fee.api;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.importFee.ImportFeeDto;
 import com.java110.dto.importFeeDetail.ImportFeeDetailDto;
+import com.java110.fee.bmo.importFee.IGetImportFeeBMO;
 import com.java110.fee.bmo.importFeeDetail.IDeleteImportFeeDetailBMO;
 import com.java110.fee.bmo.importFeeDetail.IGetImportFeeDetailBMO;
 import com.java110.fee.bmo.importFeeDetail.ISaveImportFeeDetailBMO;
@@ -14,8 +16,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping(value = "/importFeeDetail")
-public class ImportFeeDetailApi {
+@RequestMapping(value = "/importFee")
+public class ImportFeeApi {
 
     @Autowired
     private ISaveImportFeeDetailBMO saveImportFeeDetailBMOImpl;
@@ -27,6 +29,10 @@ public class ImportFeeDetailApi {
     @Autowired
     private IGetImportFeeDetailBMO getImportFeeDetailBMOImpl;
 
+
+    @Autowired
+    private IGetImportFeeBMO getImportFeeBMOImpl;
+
     /**
      * 微信保存消息模板
      *
@@ -101,4 +107,24 @@ public class ImportFeeDetailApi {
         importFeeDetailDto.setCommunityId(communityId);
         return getImportFeeDetailBMOImpl.get(importFeeDetailDto);
     }
+
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param communityId 小区ID
+     * @return
+     * @serviceCode /importFeeDetail/queryImportFeeDetail
+     * @path /app/importFee/queryImportFee
+     */
+    @RequestMapping(value = "/queryImportFee", method = RequestMethod.GET)
+    public ResponseEntity<String> queryImportFee(@RequestParam(value = "communityId") String communityId,
+                                                       @RequestParam(value = "page") int page,
+                                                       @RequestParam(value = "row") int row) {
+        ImportFeeDto importFeeDto = new ImportFeeDto();
+        importFeeDto.setPage(page);
+        importFeeDto.setRow(row);
+        importFeeDto.setCommunityId(communityId);
+        return getImportFeeBMOImpl.get(importFeeDto);
+    }
 }