房源档案

pro-base/src/main/java/com/idea/buildManage/controller/ParkRoomController.java

@@ -183,4 +183,19 @@ public class ParkRoomController extends BaseController {
         modelService.errorListExport(list, response);
     }
 
+    /**
+     * 房源档案列表
+     * @param tablepar
+     * @param model
+     * @param dt
+     * @return
+     */
+    @PostMapping(value = "reportList", produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object reportList(Tablepar tablepar, ParkRoomResponse model, DateTrans dt) {
+        PageInfo<ParkRoomResponse> page = modelService.reportList(tablepar, model, dt);
+        TableSplitResult<ParkRoomResponse> result = new TableSplitResult<>(page.getPageNum(), page.getTotal(), page.getList());
+        return result;
+    }
+
 }

pro-base/src/main/java/com/idea/buildManage/mapper/ParkRoomExtendMapper.java

@@ -24,4 +24,6 @@ public interface ParkRoomExtendMapper {
 
     ParkRoomResponse getById(String id);
 
+    List<ParkRoomResponse> reportList(ParkRoomResponse record);
+
 }

pro-base/src/main/java/com/idea/buildManage/service/ParkRoomService.java

@@ -356,4 +356,22 @@ public class ParkRoomService implements BaseService<ParkRoom, ParkRoomExample> {
         return extendMapper.getById(id);
     }
 
+    /**
+     * 房源档案列表
+     * @param tablepar
+     * @param record
+     * @param dt
+     * @return
+     */
+    public PageInfo<ParkRoomResponse> reportList(Tablepar tablepar, ParkRoomResponse record, DateTrans dt) {
+
+        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+        List<ParkRoomResponse> list = extendMapper.reportList(record);
+        PageInfo<ParkRoomResponse> pageInfo = new PageInfo<>(list);
+        return pageInfo;
+    }
+
+
+
+
 }

pro-base/src/main/java/com/idea/customerManagement/controller/ContractManageController.java

@@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.List;
+
 @Controller
 @RequestMapping(value = "ContractManageController")
 @Api(tags = "合同管理")
@@ -26,38 +28,44 @@ public class ContractManageController extends BaseController {
     private ContractManageService modelService;
 
 
-
-
-
-
     /**
      * 分页
+     *
      * @param tablepar
      * @param model
      * @param dt
      * @return
      */
-    @PostMapping(value = "list",produces = {"application/json;charset=UTF-8"})
+    @PostMapping(value = "list", produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public Object list(Tablepar tablepar, ContractManageDto model, DateTrans dt){
-        PageInfo<ContractManageDto> page= modelService.listByModel(tablepar,model,dt);
+    public Object list(Tablepar tablepar, ContractManageDto model, DateTrans dt) {
+        PageInfo<ContractManageDto> page = modelService.listByModel(tablepar, model, dt);
         TableSplitResult<ContractManageDto> result = new TableSplitResult<ContractManageDto>(page.getPageNum(), page.getTotal(), page.getList());
-        return  result;
+        return result;
     }
 
+    @PostMapping(value = "listAll", produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object listAll(ContractManageDto model) {
+        List<ContractManageDto> result = modelService.listAll(model);
+        return result;
+    }
+
+
     /**
      * 编辑合同
+     *
      * @param record
      * @return
      */
-    @PostMapping(value = "edit",produces = {"application/json;charset=UTF-8"})
+    @PostMapping(value = "edit", produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public AjaxResult edit(ContractManage record){
+    public AjaxResult edit(ContractManage record) {
         int result = modelService.edit(record);
         return result(result);
     }
 
-    @PostMapping(value = "getById",produces = {"application/json;charset=UTF-8"})
+    @PostMapping(value = "getById", produces = {"application/json;charset=UTF-8"})
     @ResponseBody
     public Object getById(String id) {
         return modelService.getById(id);
@@ -66,12 +74,13 @@ public class ContractManageController extends BaseController {
 
     /**
      * 获取合同对应的银行账号
+     *
      * @param contractId
      * @return
      */
-    @PostMapping(value = "getBankList",produces = {"application/json;charset=UTF-8"})
+    @PostMapping(value = "getBankList", produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public Object getBankList(String contractId){
+    public Object getBankList(String contractId) {
         return modelService.getBankList(contractId);
     }
 

pro-base/src/main/java/com/idea/customerManagement/controller/RoomSelectionInfoController.java

@@ -3,6 +3,7 @@ package com.idea.customerManagement.controller;
 import com.github.pagehelper.PageInfo;
 import com.idea.customerManagement.dto.ContractManageDto;
 import com.idea.customerManagement.dto.RoomSelectionInfoDto;
+import com.idea.customerManagement.model.RoomSelectionInfo;
 import com.idea.customerManagement.service.RoomSelectionInfoService;
 import com.rockstar.common.base.BaseController;
 import com.rockstar.common.domain.AjaxResult;
@@ -126,5 +127,18 @@ public class RoomSelectionInfoController extends BaseController {
         return  result;
     }
 
+    /**
+     * 选房列表
+     * @param roomSelectionInfo
+     * @return
+     */
+    @PostMapping(value = "roomSelectionListAll",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object roomSelectionListAll(RoomSelectionInfoDto roomSelectionInfo){
+        List<RoomSelectionInfoDto> result = modelService.listAll(roomSelectionInfo);
+        return result;
+    }
+
+
 
 }

pro-base/src/main/java/com/idea/customerManagement/service/ContractManageService.java

@@ -112,6 +112,15 @@ public class ContractManageService implements BaseService<ContractManage, Contra
         return pageInfo;
     }
 
+    public List<ContractManageDto> listAll(ContractManageDto model){
+        List<ContractManageDto> list = extendMapper.listByModel(model);
+        return list;
+    }
+
+
+
+
+
     /**
      * 认购收取后 新增合同
      * @param roomSelectionInfo

pro-base/src/main/java/com/idea/customerManagement/service/RoomSelectionInfoService.java

@@ -406,6 +406,23 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
         return pageInfo;
     }
 
+
+    /**
+     * 定金列表
+     *
+     * @param model
+     * @return
+     */
+    public List<RoomSelectionInfoDto> listAll(RoomSelectionInfoDto model) {
+        if(StringUtils.isNotEmpty(model.getDiscIds())){
+            List<String> ids = Arrays.asList(model.getDiscIds().split(","));
+            model.setDiscIdList(ids);
+        }
+        List<RoomSelectionInfoDto> list = extendMapper.listByModel(model);
+        return list;
+    }
+
+
     /**
      * 定金收据
      *
@@ -540,4 +557,6 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
     }
 
 
+
+
 }

pro-base/src/main/java/com/idea/invoice/task/InvoiceTask.java

@@ -1,192 +1,192 @@
-//package com.idea.invoice.task;
-//
-//import com.alibaba.fastjson.JSONArray;
-//import com.alibaba.fastjson.JSONObject;
-//import com.idea.buildManage.model.MnpBuilding;
-//import com.idea.buildManage.model.ParkFloorDisc;
-//import com.idea.buildManage.model.ParkInfo;
-//import com.idea.buildManage.model.ParkRoom;
-//import com.idea.buildManage.service.MnpBuildingService;
-//import com.idea.buildManage.service.ParkFloorDiscService;
-//import com.idea.buildManage.service.ParkInfoService;
-//import com.idea.buildManage.service.ParkRoomService;
-//import com.idea.customerManagement.dto.CustomerManagementDto;
-//import com.idea.customerManagement.model.Buyer;
-//import com.idea.customerManagement.service.CustomerManagementService;
-//import com.idea.invoice.model.InvoiceManage;
-//import com.idea.invoice.service.InvoiceManageService;
-//import com.idea.invoice.util.InvoiceConstant;
-//import com.idea.invoice.util.InvoiceUtil;
-//import com.idea.util.DateUtils;
-//import com.rockstar.util.StringUtils;
-//import lombok.extern.slf4j.Slf4j;
-//import org.apache.commons.collections.CollectionUtils;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.scheduling.annotation.Scheduled;
-//import org.springframework.stereotype.Component;
-//
-//import java.util.Date;
-//import java.util.List;
-//import java.util.stream.Collectors;
-//
-//@Slf4j
-//@Component
-//public class InvoiceTask {
-//
-//    @Autowired
-//    private InvoiceManageService invoiceManageService;
-//    @Autowired
-//    private ParkInfoService parkInfoService;
-//    @Autowired
-//    private ParkFloorDiscService floorDiscService;
-//    @Autowired
-//    private MnpBuildingService buildingService;
-//    @Autowired
-//    private ParkRoomService roomService;
-//    @Autowired
-//    private CustomerManagementService customerManagementService;
-//
-//
-//
-//    /**
-//     * 每十分钟刷新一次发票状态
-//     */
+package com.idea.invoice.task;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.idea.buildManage.model.MnpBuilding;
+import com.idea.buildManage.model.ParkFloorDisc;
+import com.idea.buildManage.model.ParkInfo;
+import com.idea.buildManage.model.ParkRoom;
+import com.idea.buildManage.service.MnpBuildingService;
+import com.idea.buildManage.service.ParkFloorDiscService;
+import com.idea.buildManage.service.ParkInfoService;
+import com.idea.buildManage.service.ParkRoomService;
+import com.idea.customerManagement.dto.CustomerManagementDto;
+import com.idea.customerManagement.model.Buyer;
+import com.idea.customerManagement.service.CustomerManagementService;
+import com.idea.invoice.model.InvoiceManage;
+import com.idea.invoice.service.InvoiceManageService;
+import com.idea.invoice.util.InvoiceConstant;
+import com.idea.invoice.util.InvoiceUtil;
+import com.idea.util.DateUtils;
+import com.rockstar.util.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class InvoiceTask {
+
+    @Autowired
+    private InvoiceManageService invoiceManageService;
+    @Autowired
+    private ParkInfoService parkInfoService;
+    @Autowired
+    private ParkFloorDiscService floorDiscService;
+    @Autowired
+    private MnpBuildingService buildingService;
+    @Autowired
+    private ParkRoomService roomService;
+    @Autowired
+    private CustomerManagementService customerManagementService;
+
+
+
+    /**
+     * 每十分钟刷新一次发票状态
+     */
 //    @Scheduled(cron = "0 0/10 * * * ?")
-//    public void refreshStatus() {
-//
-//        List<InvoiceManage> invoiceManages = invoiceManageService.selectNeedRefreshStatusList();
-//        String ncCodes = invoiceManages.stream().map(InvoiceManage::getNcCode).collect(Collectors.joining());
-//        JSONObject json = new JSONObject();
-//        json.put("billno",ncCodes);
-//        json.put("pk_org", InvoiceUtil.pk_org);
-//        try {
-//            String result = InvoiceUtil.invoiceQuery(json);
-//            JSONObject jsonObject = JSONObject.parseObject(result);
-//            if(jsonObject.getString("success").equals("true")){
-//                JSONArray data = jsonObject.getJSONArray("data");
-//                for (int i = 0; i < data.size(); i++) {
-//                    JSONObject object = data.getJSONObject(i);
-//                    String srcsystemid = object.getString("srcsystemid");
-//                    String invoiceno = object.getString("invoiceno");
-//                    String settledate = object.getString("settledate");
-//                    if(StringUtils.isNotEmpty(invoiceno)){
-//
-//                        Date date = DateUtils.parseDate(settledate, DateUtils.YYYY_MM_DD_HH_MM_SS);
-//                        InvoiceManage invoiceManage = invoiceManageService.selectByPrimaryKey(srcsystemid);
-//                        invoiceManage.setInvoiceNo(invoiceno);
-//                        invoiceManage.setInvoiceStatus("1");
-//                        invoiceManage.setInvoiceDate(date);
-//                        invoiceManageService.updateByPrimaryKeySelective(invoiceManage);
-//                    }
-//                }
-//            }
-//        }catch (Exception e){
-//            log.error("查询发票状态异常",e);
-//        }
-//
-//    }
-//
-//    /**
-//     * 每天凌晨执行 推送载体数据
-//     */
-////    @Scheduled(cron = "0 0 0 1/1 * ?")
-//    public void sendBuild() {
-//        List<MnpBuilding> mnpBuildings = buildingService.selectNeedSendList();
-//        for(MnpBuilding building: mnpBuildings){
-//            try {
-//                JSONObject json = new JSONObject();
-//                json.put("srcsystemid", building.getId());
-//                json.put("code", building.getId());
-//                json.put("name", building.getBuildNum());
-//                json.put("pk_org", InvoiceUtil.pk_org);
-//                json.put("pk_defdoclist", InvoiceUtil.pk_defdoclist_build);
-//                // 给nc推送载体数据
-//                String resultJson = InvoiceUtil.defdocAdd(json);
-//                JSONObject jsonObject = JSONObject.parseObject(resultJson);
-//                String success = jsonObject.getString("success");
-//                if (success.equals("true")) {
-//                    JSONObject data = jsonObject.getJSONObject("data");
-//                    String code = data.getString("code");
-//                    String ncid = data.getString("ncid");
-//                    building.setNcid(ncid);
-//                    building.setNcCode(code);
-//                    buildingService.updateByPrimaryKeySelective(building);
-//                }
-//            } catch (Exception e) {
-//                log.error("推送载体失败", e);
-//            }
-//        }
-//    }
-//
-//    /**
-//     * 每天凌晨执行 推送房间数据
-//     */
-////    @Scheduled(cron = "0 0 0 1/1 * ?")
-//    public void sendHouse(){
-//        List<ParkRoom> parkRooms = roomService.selectNeedSendList();
-//        for(ParkRoom record: parkRooms){
-//            try {
-//                ParkInfo parkInfo = parkInfoService.selectByPrimaryKey(record.getGroupId());
-//                ParkFloorDisc parkFloorDisc = floorDiscService.selectByPrimaryKey(record.getDiscId());
-//                MnpBuilding mnpBuilding = buildingService.selectByPrimaryKey(record.getBuildId());
-//                String name = parkInfo.getGroupName() + "-" + parkFloorDisc.getName() + "-" + mnpBuilding.getBuildNum()
-//                        + "-" + record.getRoomNo();
-//                JSONObject json = new JSONObject();
-//                json.put("srcsystemid", record.getId());
-//                json.put("code", record.getId());
-//                json.put("name", name);
-//                json.put("pk_org", InvoiceUtil.pk_org);
-//                json.put("pk_defdoclist", InvoiceUtil.pk_defdoclist_room);
-//                // 给nc推送房间数据
-//                String resultJson = InvoiceUtil.defdocAdd(json);
-//                JSONObject jsonObject = JSONObject.parseObject(resultJson);
-//                String success = jsonObject.getString("success");
-//                if (success.equals("true")) {
-//                    JSONObject data = jsonObject.getJSONObject("data");
-//                    String code = data.getString("code");
-//                    String ncid = data.getString("ncid");
-//                    record.setNcid(ncid);
-//                    record.setNcCode(code);
-//                    roomService.updateByPrimaryKeySelective(record);
-//                }
-//            } catch (Exception e) {
-//                log.error("推送房间失败", e);
-//            }
-//        }
-//    }
-//
-//    /**
-//     * 每天凌晨执行 推送客户数据
-//     */
-////    @Scheduled(cron = "0 0 0 1/1 * ?")
-//    public void sendCustomer(){
-//
-//        List<CustomerManagementDto> customerManagementDtos = customerManagementService.selectNeedSendList();
-//        for(CustomerManagementDto record: customerManagementDtos){
-//            try {
-//                // 给nc推送客户数据
-//                JSONObject json = new JSONObject();
-//                json.put("srcsystemid", record.getId());
-//                json.put("name", record.getBuyerName());
-//                json.put("pk_custclass", "02"); //客户基本分类 ，，（默认是02），必选，01内部客户，02外部客户
-//                json.put("custprop", "0");//财务组织客户类型，必选，默认0
-//                json.put("taxpayerid", record.getIdentityCard()); //统一社会信用代码，必选
-//                String result = InvoiceUtil.customerAdd(json);
-//                JSONObject jsonObject = JSONObject.parseObject(result);
-//                String success = jsonObject.getString("success");
-//                if (success.equals("true")) {
-//                    JSONObject data = jsonObject.getJSONObject("data");
-//                    String code = data.getString("code");
-//                    String ncid = data.getString("ncid");
-//                    record.setNcid(ncid);
-//                    record.setNcCode(code);
-//                    customerManagementService.updateByPrimaryKeySelective(record);
-//                }
-//            }catch (Exception e){
-//                log.error("推送客户失败",e);
-//            }
-//        }
-//    }
-//
-//
-//}
+    public void refreshStatus() {
+
+        List<InvoiceManage> invoiceManages = invoiceManageService.selectNeedRefreshStatusList();
+        String ncCodes = invoiceManages.stream().map(InvoiceManage::getNcCode).collect(Collectors.joining());
+        JSONObject json = new JSONObject();
+        json.put("billno",ncCodes);
+        json.put("pk_org", InvoiceUtil.pk_org);
+        try {
+            String result = InvoiceUtil.invoiceQuery(json);
+            JSONObject jsonObject = JSONObject.parseObject(result);
+            if(jsonObject.getString("success").equals("true")){
+                JSONArray data = jsonObject.getJSONArray("data");
+                for (int i = 0; i < data.size(); i++) {
+                    JSONObject object = data.getJSONObject(i);
+                    String srcsystemid = object.getString("srcsystemid");
+                    String invoiceno = object.getString("invoiceno");
+                    String settledate = object.getString("settledate");
+                    if(StringUtils.isNotEmpty(invoiceno)){
+
+                        Date date = DateUtils.parseDate(settledate, DateUtils.YYYY_MM_DD_HH_MM_SS);
+                        InvoiceManage invoiceManage = invoiceManageService.selectByPrimaryKey(srcsystemid);
+                        invoiceManage.setInvoiceNo(invoiceno);
+                        invoiceManage.setInvoiceStatus("1");
+                        invoiceManage.setInvoiceDate(date);
+                        invoiceManageService.updateByPrimaryKeySelective(invoiceManage);
+                    }
+                }
+            }
+        }catch (Exception e){
+            log.error("查询发票状态异常",e);
+        }
+
+    }
+
+    /**
+     * 每天凌晨执行 推送载体数据
+     */
+//    @Scheduled(cron = "0 0 0 1/1 * ?")
+    public void sendBuild() {
+        List<MnpBuilding> mnpBuildings = buildingService.selectNeedSendList();
+        for(MnpBuilding building: mnpBuildings){
+            try {
+                JSONObject json = new JSONObject();
+                json.put("srcsystemid", building.getId());
+                json.put("code", building.getId());
+                json.put("name", building.getBuildNum());
+                json.put("pk_org", InvoiceUtil.pk_org);
+                json.put("pk_defdoclist", InvoiceUtil.pk_defdoclist_build);
+                // 给nc推送载体数据
+                String resultJson = InvoiceUtil.defdocAdd(json);
+                JSONObject jsonObject = JSONObject.parseObject(resultJson);
+                String success = jsonObject.getString("success");
+                if (success.equals("true")) {
+                    JSONObject data = jsonObject.getJSONObject("data");
+                    String code = data.getString("code");
+                    String ncid = data.getString("ncid");
+                    building.setNcid(ncid);
+                    building.setNcCode(code);
+                    buildingService.updateByPrimaryKeySelective(building);
+                }
+            } catch (Exception e) {
+                log.error("推送载体失败", e);
+            }
+        }
+    }
+
+    /**
+     * 每天凌晨执行 推送房间数据
+     */
+//    @Scheduled(cron = "0 0 0 1/1 * ?")
+    public void sendHouse(){
+        List<ParkRoom> parkRooms = roomService.selectNeedSendList();
+        for(ParkRoom record: parkRooms){
+            try {
+                ParkInfo parkInfo = parkInfoService.selectByPrimaryKey(record.getGroupId());
+                ParkFloorDisc parkFloorDisc = floorDiscService.selectByPrimaryKey(record.getDiscId());
+                MnpBuilding mnpBuilding = buildingService.selectByPrimaryKey(record.getBuildId());
+                String name = parkInfo.getGroupName() + "-" + parkFloorDisc.getName() + "-" + mnpBuilding.getBuildNum()
+                        + "-" + record.getRoomNo();
+                JSONObject json = new JSONObject();
+                json.put("srcsystemid", record.getId());
+                json.put("code", record.getId());
+                json.put("name", name);
+                json.put("pk_org", InvoiceUtil.pk_org);
+                json.put("pk_defdoclist", InvoiceUtil.pk_defdoclist_room);
+                // 给nc推送房间数据
+                String resultJson = InvoiceUtil.defdocAdd(json);
+                JSONObject jsonObject = JSONObject.parseObject(resultJson);
+                String success = jsonObject.getString("success");
+                if (success.equals("true")) {
+                    JSONObject data = jsonObject.getJSONObject("data");
+                    String code = data.getString("code");
+                    String ncid = data.getString("ncid");
+                    record.setNcid(ncid);
+                    record.setNcCode(code);
+                    roomService.updateByPrimaryKeySelective(record);
+                }
+            } catch (Exception e) {
+                log.error("推送房间失败", e);
+            }
+        }
+    }
+
+    /**
+     * 每天凌晨执行 推送客户数据
+     */
+//    @Scheduled(cron = "0 0 0 1/1 * ?")
+    public void sendCustomer(){
+
+        List<CustomerManagementDto> customerManagementDtos = customerManagementService.selectNeedSendList();
+        for(CustomerManagementDto record: customerManagementDtos){
+            try {
+                // 给nc推送客户数据
+                JSONObject json = new JSONObject();
+                json.put("srcsystemid", record.getId());
+                json.put("name", record.getBuyerName());
+                json.put("pk_custclass", "02"); //客户基本分类 ，，（默认是02），必选，01内部客户，02外部客户
+                json.put("custprop", "0");//财务组织客户类型，必选，默认0
+                json.put("taxpayerid", record.getIdentityCard()); //统一社会信用代码，必选
+                String result = InvoiceUtil.customerAdd(json);
+                JSONObject jsonObject = JSONObject.parseObject(result);
+                String success = jsonObject.getString("success");
+                if (success.equals("true")) {
+                    JSONObject data = jsonObject.getJSONObject("data");
+                    String code = data.getString("code");
+                    String ncid = data.getString("ncid");
+                    record.setNcid(ncid);
+                    record.setNcCode(code);
+                    customerManagementService.updateByPrimaryKeySelective(record);
+                }
+            }catch (Exception e){
+                log.error("推送客户失败",e);
+            }
+        }
+    }
+
+
+}

pro-base/src/main/java/com/idea/transactionRecordManage/service/TransactionRecordService.java

@@ -384,7 +384,6 @@ public class TransactionRecordService {
 
                     String billdate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
 
-                    // TODO: 2024/11/27 项目档案编码 项目中暂无次字段
                     String def10 = "";
                     if (parkInfoMap.containsKey(customerManagement.getGroupId())) {
                         def10 = parkInfoMap.get(customerManagement.getGroupId()).getArchiveCode();
@@ -449,7 +448,7 @@ public class TransactionRecordService {
                     ap_payitemJson.put("pk_recpaytype", "001"); //付款业务类型传默认值“001”
                     ap_payitemJson.put("prepay", "0"); //默认值0
                     // TODO: 2024/11/22 安居的退款账号 待定
-                    ap_payitemJson.put("payaccount", ""); //付款银行账号，必选
+                    ap_payitemJson.put("payaccount", refundManage.getBankNumber()); //付款银行账号，必选
                     ap_payitemJson.put("checktype", checktype); //票据类型，必选，看云文档票据类型
                     // TODO: 2024/11/22 退款的记录 是汇合的多笔的 票据号待定
                     ap_payitemJson.put("checkno", IdUtil.simpleUUID()); //票据号，必选

pro-base/src/main/resources/mybatis/buildManage/ParkRoomExtendMapper.xml

@@ -145,5 +145,27 @@
     where r.id = #{id}
   </select>
 
+  <select id="reportList" resultType="com.idea.buildManage.response.ParkRoomResponse">
+    select r.*, p.group_name,d.name discName,b.build_num buildName from park_room r
+    left join park_info p on p.id = r.group_id
+    left join park_floor_disc d on d.id = r.disc_id
+    left join mnp_building b on b.id = r.build_id
+    <where>
+      <if test="groupId != null and groupId != ''">
+        and r.group_id = #{groupId}
+      </if>
+      <if test="discId != null and discId != ''">
+        and r.disc_id = #{discId}
+      </if>
+      <if test="buildId != null and buildId != ''">
+        and r.build_id = #{buildId}
+      </if>
+      <if test="roomNo != null and roomNo != ''">
+        and room_no like concat('%',#{roomNo},'%')
+      </if>
+    </where>
+    order by p.created_at desc,d.name,b.build_num + 0,r.room_no + 0
+  </select>
+
 
 </mapper>

pro-base/src/main/resources/mybatis/customerManagement/RoomSelectionInfoExtendMapper.xml

@@ -65,6 +65,9 @@
             <if test="status !=null and status != ''">
                 and room_selection_info.status = #{status}
             </if>
+            <if test="houseId !=null and houseId != ''">
+                and room_selection_info.house_id = #{houseId}
+            </if>
         </where>
         order by created_at desc
     </select>

pro-wx/src/main/java/com/idea/pro/wx/controller/buildManage/WxParkRoomController.java

@@ -12,6 +12,7 @@ import com.idea.buildManage.service.ParkFloorDiscService;
 import com.idea.buildManage.service.ParkInfoService;
 import com.idea.buildManage.service.ParkRoomService;
 import com.idea.customerManagement.service.IntentionalDepositService;
+import com.idea.invoice.task.InvoiceTask;
 import com.idea.paymentManagement.service.PayLogService;
 import com.idea.util.ExcelUtils;
 import com.rockstar.common.base.BaseController;
@@ -59,6 +60,9 @@ public class WxParkRoomController extends BaseController {
     @Autowired
     private IntentionalDepositService intentionalDepositService;
 
+    @Autowired
+    private InvoiceTask invoiceTask;
+
 
     @PostMapping(value = "list", produces = {"application/json;charset=UTF-8"})
     @ResponseBody
@@ -189,9 +193,10 @@ public class WxParkRoomController extends BaseController {
     public AjaxResult test(String id){
 //        payLogService.sendVoucher(id);
 //        intentionalDepositService.sendToDepositVoucher(id);
-        List<Map<String, String>> dictList = sysDictService.selectDictList("CONTENT_TYPE");
-
-        return success(dictList);
+//        List<Map<String, String>> dictList = sysDictService.selectDictList("CONTENT_TYPE");
+//        invoiceTask.sendBuild();
+//        invoiceTask.sendHouse();
+        return success();
     }
 
 }