档案调整

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

@@ -471,6 +471,7 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
         String filePath = "/home/project/settleDown/tem/receipt.docx";
         String fileName = "定金收据.docx";
         String sealPath = "/home/project/settleDown/tem/seal.png";
+        String sealPath2 = "/home/project/settleDown/tem/huanpiao.png";
         String customerManagementId = newRecord.getCustomerManagementId();
         BuyerExample buyerExample = new BuyerExample();
         buyerExample.setOrderByClause("order_num asc");
@@ -524,6 +525,17 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
         settingInfoData.put("topOffset", "0");
         settingData.put("${seal}", settingInfoData);
 
+        // 已签约转房款 已退款 用换票模板
+        if(newRecord.getStatus() == 4 || newRecord.getStatus() == 5){
+            filePath = "/home/project/settleDown/tem/receipt_huanpiao.docx";
+            sealData.put("${huanpiao}", sealPath2);
+
+            settingInfoData = new HashMap<>();
+            settingInfoData.put("leftOffset", "300");
+            settingInfoData.put("topOffset", "0");
+            settingData.put("${huanpiao}", settingInfoData);
+        }
+
 
         try {
             File tempWord = ReplaceWord.operateWord(response, filePath, fileName, data, picData, sealData, settingData);

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

@@ -29,6 +29,9 @@
             <if test="batchNumber != null and batchNumber != ''">
                 and customer_management_id in (select id from customer_management where batch_number like concat('%',#{batchNumber},'%'))
             </if>
+            <if test="houseId != null and houseId != ''">
+                and house_id = #{houseId}
+            </if>
 
         </where>
         order by created_at desc,updated_at desc

pro-base/src/main/resources/mybatis/paymentManagement/MaintenanceFundsManagementExtendMapper.xml

@@ -28,6 +28,9 @@
               and contract_manage.customer_management_id in (select id from customer_management where batch_number
               like concat('%',#{batchNumber},'%'))
           </if>
+          <if test="houseId != null and houseId != ''">
+              and contract_manage.house_id = #{houseId}
+          </if>
       </where>
       order by contract_manage.created_at desc
   </select>

pro-base/src/main/resources/mybatis/paymentManagement/PayLogExtendMapper.xml

@@ -64,6 +64,9 @@
                 and contract_manage.customer_management_id in (select id from customer_management where batch_number
                 like concat('%',#{batchNumber},'%'))
             </if>
+            <if test="houseId != null and houseId != ''">
+                and contract_manage.house_id = #{houseId}
+            </if>
         </where>
         group by contract_manage.id
         ORDER BY contract_manage.created_at DESC