1

pro-base/src/main/java/com/idea/customerManagement/dto/CustomerManagementDto.java

@@ -45,4 +45,8 @@ public class CustomerManagementDto extends CustomerManagement {
      */
     private BigDecimal intentionalDepositMoney;
 
+    private String roomSelectionDateFrom;
+
+    private String roomSelectionDateTo;
+
 }

pro-base/src/main/java/com/idea/invoice/service/InvoiceManageService.java

@@ -499,6 +499,21 @@ public class InvoiceManageService implements BaseService<InvoiceManage, InvoiceM
         def26 = def26 + parkInfo.getGroupName() + roomResponse.getDiscName() + roomResponse.getBuildName()
                 + "号" + roomResponse.getRoomNo() + "室";
 
+        ContractManage contractManage = contractManageService.selectByPrimaryKey(newRecord.getContractId());
+        // 是否完全收款 默认不完全收款
+        String def27 = "N";
+        // 正常房款
+        if(newRecord.getPaymentType().equals("1")){
+            if(contractManage.getCollectionStatus() == 2){
+                def27 = "Y";
+            }
+        }
+        // 专项维修资金
+        if(newRecord.getPaymentType().equals("2")){
+            if(contractManage.getFundCollectionStatus() == 2){
+                def27 = "Y";
+            }
+        }
 
         Double invoiceTax = Double.parseDouble(model.getInvoiceTax()) * 100;
         JSONObject json = new JSONObject();
@@ -515,6 +530,7 @@ public class InvoiceManageService implements BaseService<InvoiceManage, InvoiceM
         ar_recbill.put("def24", "0"); //征税方式，必填，默认0
         ar_recbill.put("def26", def26); //不动产地址 必填
         ar_recbill.put("def25", "N"); // 跨地市标志，必填，Y--是；N---否
+        ar_recbill.put("def27", "Y"); // 是否完全收款，非必填，Y--是；N---否
         json.put("ar_recbill", ar_recbill);
 
         JSONArray ar_recitem = new JSONArray();

pro-base/src/main/java/com/idea/invoice/service/ReceiptManageService.java

@@ -254,6 +254,10 @@ public class ReceiptManageService implements BaseService<ReceiptManage, ReceiptM
         // 已换票 已红冲
         if (receiptManage.getReceiptStatus() == 2 || receiptManage.getReceiptStatus() == 3) {
             filePath = "/home/project/settleDown/tem/receipt_huanpiao.docx";
+            // 意向金收据 已换票的 用另一个模板
+            if(receiptManage.getReceiptType().equals("1")){
+                filePath = "/home/project/settleDown/tem/receipt_huanpiao_yxj.docx";
+            }
             sealData.put("${huanpiao}", sealPath2);
 
             settingInfoData = new HashMap<>();

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

@@ -46,6 +46,12 @@
           #{groupId}
         </foreach>
       </if>
+      <if test="roomSelectionDateFrom != null and roomSelectionDateFrom != ''">
+        and date_format(customer_management.room_selection_date,'%Y-%m-%d') >= #{roomSelectionDateFrom}
+      </if>
+      <if test="roomSelectionDateTo != null and roomSelectionDateTo != ''">
+        and date_format(customer_management.room_selection_date,'%Y-%m-%d') &lt;= #{roomSelectionDateTo}
+      </if>
     </where>
     order by batch_number + 0 desc,room_selection_number + 0
   </select>