联调

src/main/java/com/huiju/estateagents/controller/TaRaiseRecordController.java

@@ -15,6 +15,7 @@ import com.huiju.estateagents.service.ITaHousingResourcesService;
 import com.huiju.estateagents.service.ITaOrderService;
 import com.huiju.estateagents.service.ITaRaiseHouseService;
 import com.huiju.estateagents.service.ITaRaiseRecordService;
+import jodd.util.StringUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -490,7 +491,10 @@ public class TaRaiseRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/wx/taRaiseRecord/list", method = RequestMethod.GET)
-    public ResponseBean wxGetRaiseRecordList( @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+    public ResponseBean wxGetRaiseRecordList( @RequestParam(value = "buildingId", required = false) String buildingId,
+                                              @RequestParam(value = "salesBtchId", required = false) Integer salesBtchId,
+                                              @RequestParam(value = "houseLockingStatus", required = false) String houseLockingStatus,
+                                              @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                               @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -499,6 +503,9 @@ public class TaRaiseRecordController extends BaseController {
             QueryWrapper<TaRaiseRecord> taRaiseRecordQueryWrapper = new QueryWrapper<>();
             taRaiseRecordQueryWrapper.eq("org_id",getOrgId(request));
             taRaiseRecordQueryWrapper.eq("person_id",getPersonId(request));
+            taRaiseRecordQueryWrapper.eq(StringUtils.isNotEmpty(buildingId),"building_id",buildingId);
+            taRaiseRecordQueryWrapper.eq(null != salesBtchId,"sales_batch_id",salesBtchId);
+            taRaiseRecordQueryWrapper.eq(StringUtils.isNotEmpty(houseLockingStatus),"house_locking_status",houseLockingStatus);
             IPage<TaRaiseRecord> page = iTaRaiseRecordService.page(pg, taRaiseRecordQueryWrapper);
             List<TaRaiseRecord> list = page.getRecords();
             list.forEach(e -> {

src/main/java/com/huiju/estateagents/controller/TaSalesBatchController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.service.*;
 import com.huiju.estateagents.service.impl.TaPreselectionServiceImpl;
@@ -331,4 +332,26 @@ public class TaSalesBatchController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 查询销售批次列表--小程序
+     *
+     */
+    @RequestMapping(value = "/wx/taSalesBatch/choice", method = RequestMethod.GET)
+    public ResponseBean taSalesBatchGetForMiniApp(@RequestParam(value = "buildingId", required = false) String buildingId,HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            QueryWrapper<TaSalesBatch> taSalesBatchQueryWrapper = new QueryWrapper<>();
+            taSalesBatchQueryWrapper.eq("org_id",getOrgId(request));
+            taSalesBatchQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id",buildingId);
+            taSalesBatchQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+            List<TaSalesBatch> list = iTaSalesBatchService.list(taSalesBatchQueryWrapper);
+            responseBean.addSuccess(list);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taSalesBatchGetForMiniApp -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
 }