1

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

@@ -342,9 +342,9 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
         // 票据类型 定金
         receiptManage.setReceiptType("2");
         receiptManage.setReceiptMoney(model.getReceivedAmount());
-        receiptManage.setReceiptNumber(model.getSerialNumber());
-        // 已换票
-        receiptManage.setReceiptStatus(2);
+        receiptManage.setReceiptNumber(model.getDepositSerialNumber());
+        // 已开
+        receiptManage.setReceiptStatus(1);
         receiptManageService.add(receiptManage);
         // 更新关联的意向金数据 更新意向金票据关联票号
         ReceiptManageExample receiptManageExample = new ReceiptManageExample();

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

@@ -27,6 +27,7 @@ import com.rockstar.shiro.util.ShiroUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -204,6 +205,7 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
      * @param model
      * @return
      */
+    @Transactional
     public int add(RoomSelectionInfoDto model){
 
         model.setUpdatedAt(new Date());

pro-base/src/main/java/com/idea/invoice/controller/ReceiptManageController.java

@@ -1,6 +1,7 @@
 package com.idea.invoice.controller;
 
 import com.github.pagehelper.PageInfo;
+import com.idea.invoice.dto.ReceiptManageDto;
 import com.idea.invoice.model.ReceiptManage;
 import com.idea.invoice.service.ReceiptManageService;
 import com.rockstar.common.base.BaseController;
@@ -23,9 +24,9 @@ public class ReceiptManageController extends BaseController {
 
     @PostMapping(value = "listByModel",produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public Object listByModel(Tablepar tablepar, ReceiptManage model){
+    public Object listByModel(Tablepar tablepar, ReceiptManageDto model){
         PageInfo page = modelService.listByModel(tablepar, model);
-        return new TableSplitResult<>(page.getPageNum(),page.getTotal(),page.getList());
+        return new TableSplitResult<ReceiptManageDto>(page.getPageNum(),page.getTotal(),page.getList());
     }
 
 

pro-base/src/main/java/com/idea/invoice/dto/ReceiptManageDto.java

@@ -0,0 +1,13 @@
+package com.idea.invoice.dto;
+
+import com.idea.invoice.model.ReceiptManage;
+import lombok.Data;
+
+@Data
+public class ReceiptManageDto extends ReceiptManage {
+
+    private String createdName;
+
+
+
+}

pro-base/src/main/java/com/idea/invoice/mapper/ReceiptManageExtendMapper.java

@@ -0,0 +1,18 @@
+package com.idea.invoice.mapper;
+
+import com.idea.invoice.dto.ReceiptManageDto;
+import com.idea.invoice.model.ReceiptManage;
+import com.idea.invoice.model.ReceiptManageExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface ReceiptManageExtendMapper {
+
+    List<ReceiptManageDto> listByModel(ReceiptManageDto model);
+
+
+
+
+
+}

pro-base/src/main/java/com/idea/invoice/model/ReceiptManage.java

@@ -1,5 +1,8 @@
 package com.idea.invoice.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -31,6 +34,8 @@ public class ReceiptManage implements Serializable {
 
     private String createdId;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createdAt;
 
     private Date updatedAt;

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

@@ -3,6 +3,8 @@ package com.idea.invoice.service;
 import cn.hutool.core.util.IdUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.idea.invoice.dto.ReceiptManageDto;
+import com.idea.invoice.mapper.ReceiptManageExtendMapper;
 import com.idea.invoice.mapper.ReceiptManageMapper;
 import com.idea.invoice.model.InvoiceManage;
 import com.idea.invoice.model.ReceiptManage;
@@ -22,6 +24,9 @@ public class ReceiptManageService implements BaseService<ReceiptManage, ReceiptM
 
     @Autowired
     private ReceiptManageMapper modelMapper;
+    @Autowired
+    private ReceiptManageExtendMapper extendMapper;
+
 
     @Override
     public int deleteByPrimaryKey(String s) {
@@ -80,12 +85,11 @@ public class ReceiptManageService implements BaseService<ReceiptManage, ReceiptM
         return example;
     }
 
-    public PageInfo listByModel(Tablepar tablepar,ReceiptManage model){
+    public PageInfo listByModel(Tablepar tablepar, ReceiptManageDto model){
 
-        ReceiptManageExample example = this.getCondition(model);
         PageHelper.startPage(tablepar.getPageNum(),tablepar.getPageSize());
-        List<ReceiptManage> receiptManages = modelMapper.selectByExample(example);
-        return new PageInfo<ReceiptManage>(receiptManages);
+        List<ReceiptManageDto> receiptManages = extendMapper.listByModel(model);
+        return new PageInfo<ReceiptManageDto>(receiptManages);
     }
 
 

pro-base/src/main/resources/mybatis/invoice/ReceiptManageExtendMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.idea.invoice.mapper.ReceiptManageExtendMapper">
+
+
+    <select id="listByModel" resultType="com.idea.invoice.dto.ReceiptManageDto">
+        select
+        receipt_manage.*,customer_management.house_name houseName, frame_user.truename createdName
+        from receipt_manage
+        left join customer_management on customer_management.id = receipt_manage.customer_management_id
+        left join frame_user on frame_user.id = receipt_manage.created_id
+        <where>
+            <if test="buyerName != null and buyerName != ''">
+                and receipt_manage.buyer_name like concat('%',#{buyerName},'%')
+            </if>
+            <if test="houseName != null and houseName != ''">
+                and customer_management.house_name like concat('%',#{houseName},'%')
+            </if>
+        </where>
+        order by receipt_manage.created_at desc
+    </select>
+</mapper>