Merge remote-tracking branch 'origin/master'

pro-base/src/main/java/com/idea/buildManage/excel/ParkRoomListener.java

@@ -151,6 +151,19 @@ public class ParkRoomListener extends AnalysisEventListener<ParkRoomExcel> {
                     }
                     data.setFloor(excel.getFloor());
 
+                    if (StringUtils.isEmpty(excel.getPredictionShareArea())) {
+                        data.setPredictionShareArea(Double.valueOf(excel.getPredictionShareArea()));
+                    }
+                    if (StringUtils.isEmpty(excel.getPredictionInternalArea())) {
+                        data.setPredictionInternalArea(Double.valueOf(excel.getPredictionInternalArea()));
+                    }
+                    if (StringUtils.isEmpty(excel.getPredictionLandArea())) {
+                        data.setPredictionLandArea(Double.valueOf(excel.getPredictionLandArea()));
+                    }
+                    if (StringUtils.isEmpty(excel.getPredictionBuildArea())) {
+                        data.setPredictionBuildArea(Double.valueOf(excel.getPredictionBuildArea()));
+                    }
+
 
                     // 实测套内面积
                     if (StringUtils.isEmpty(excel.getActualInternalArea())) {
@@ -249,10 +262,7 @@ public class ParkRoomListener extends AnalysisEventListener<ParkRoomExcel> {
                         data.setCreatedId(ShiroUtils.getUserId());
                         data.setCreatedAt(new Date());
                         data.setRoomNumber(excel.getRoomNumber());
-                        data.setPredictionShareArea(Double.valueOf(excel.getPredictionShareArea()));
-                        data.setPredictionInternalArea(Double.valueOf(excel.getPredictionInternalArea()));
-                        data.setPredictionLandArea(Double.valueOf(excel.getPredictionLandArea()));
-                        data.setPredictionBuildArea(Double.valueOf(excel.getPredictionBuildArea()));
+
                         data.setTwoPointTwo(excel.getTwoPointTwo());
                         data.setRoomNumber(excel.getRoomNumber());
                         data.setRemark(excel.getRemark());

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

@@ -2,6 +2,7 @@ package com.idea.customerManagement.controller;
 
 import com.github.pagehelper.PageInfo;
 import com.idea.customerManagement.dto.CustomerManagementDto;
+import com.idea.customerManagement.dto.RoomSelectionInfoDto;
 import com.idea.customerManagement.service.CustomerManagementService;
 import com.rockstar.common.base.BaseController;
 import com.rockstar.common.domain.AjaxResult;
@@ -11,10 +12,13 @@ import com.rockstar.frame.model.extend.Tablepar;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
 
 @Controller
@@ -95,4 +99,14 @@ public class CustomerManagementController extends BaseController {
         return result(result);
     }
 
+    /**
+     * 选房通知单 下载
+     * @param id
+     * @param response
+     */
+    @GetMapping(value = "download",produces = {"application/json;charset=UTF-8"})
+    public void download(String id, HttpServletResponse response) {
+        modelService.downLoad(id,response);
+    }
+
 }

pro-base/src/main/java/com/idea/customerManagement/model/RoomSelectionInfo.java

@@ -54,8 +54,6 @@ public class RoomSelectionInfo implements Serializable {
 
     private String fileList;
 
-    private String depositNumber;
-
     private static final long serialVersionUID = 1L;
 
 }

pro-base/src/main/java/com/idea/customerManagement/model/RoomSelectionInfoExample.java

@@ -526,76 +526,6 @@ public class RoomSelectionInfoExample {
             return (Criteria) this;
         }
 
-        public Criteria andDepositNumberIsNull() {
-            addCriterion("deposit_number is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDepositNumberIsNotNull() {
-            addCriterion("deposit_number is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDepositNumberEqualTo(String value) {
-            addCriterion("deposit_number =", value, "depositNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andDepositNumberNotEqualTo(String value) {
-            addCriterion("deposit_number <>", value, "depositNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andDepositNumberGreaterThan(String value) {
-            addCriterion("deposit_number >", value, "depositNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andDepositNumberGreaterThanOrEqualTo(String value) {
-            addCriterion("deposit_number >=", value, "depositNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andDepositNumberLessThan(String value) {
-            addCriterion("deposit_number <", value, "depositNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andDepositNumberLessThanOrEqualTo(String value) {
-            addCriterion("deposit_number <=", value, "depositNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andDepositNumberLike(String value) {
-            addCriterion("deposit_number like", value, "depositNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andDepositNumberNotLike(String value) {
-            addCriterion("deposit_number not like", value, "depositNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andDepositNumberIn(List<String> values) {
-            addCriterion("deposit_number in", values, "depositNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andDepositNumberNotIn(List<String> values) {
-            addCriterion("deposit_number not in", values, "depositNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andDepositNumberBetween(String value1, String value2) {
-            addCriterion("deposit_number between", value1, value2, "depositNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andDepositNumberNotBetween(String value1, String value2) {
-            addCriterion("deposit_number not between", value1, value2, "depositNumber");
-            return (Criteria) this;
-        }
-
         public Criteria andStatusIsNull() {
             addCriterion("status is null");
             return (Criteria) this;

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

@@ -6,13 +6,19 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.idea.buildManage.mapper.ParkInfoMapper;
 import com.idea.buildManage.mapper.ParkRoomMapper;
+import com.idea.buildManage.model.ParkInfo;
 import com.idea.buildManage.model.ParkRoom;
+import com.idea.buildManage.response.ParkRoomResponse;
 import com.idea.customerManagement.dto.CustomerManagementDto;
+import com.idea.customerManagement.dto.RoomSelectionInfoDto;
 import com.idea.customerManagement.mapper.CustomerManagementExtendMapper;
 import com.idea.customerManagement.mapper.CustomerManagementMapper;
 import com.idea.customerManagement.mapper.RoomSelectionInfoMapper;
 import com.idea.customerManagement.model.*;
+import com.idea.util.DateUtils;
+import com.idea.util.ReplaceWord;
 import com.rockstar.common.base.BaseService;
 import com.rockstar.frame.model.FrameUser;
 import com.rockstar.frame.model.extend.DateTrans;
@@ -25,9 +31,9 @@ import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
 
 @Service
 public class CustomerManagementService implements BaseService<CustomerManagement, CustomerManagementExample> {
@@ -47,6 +53,8 @@ public class CustomerManagementService implements BaseService<CustomerManagement
     private RoomSelectionInfoMapper roomSelectionInfoMapper;
     @Autowired
     private ParkRoomMapper parkRoomMapper;
+    @Autowired
+    private ParkInfoMapper parkInfoMapper;
 
     @Override
     public int deleteByPrimaryKey(String s) {
@@ -295,5 +303,54 @@ public class CustomerManagementService implements BaseService<CustomerManagement
         return result;
     }
 
+    /**
+     * 选房通知单下载
+     * @param id
+     * @param response
+     */
+    public void downLoad(String id, HttpServletResponse response) {
+
+        String filePath = "/home/project/settleDown/tem/houseSelectionNotice.docx";
+        String fileName = "选房通知单.docx";
+        CustomerManagement customerManagement = selectByPrimaryKey(id);
+        BuyerExample buyerExample = new BuyerExample();
+        buyerExample.setOrderByClause("order_num asc");
+        buyerExample.createCriteria().andCustomerManagementIdEqualTo(id);
+        List<Buyer> buyers = buyerService.selectByExample(buyerExample);
+        if(CollectionUtils.isNotEmpty(buyers)){
+            Buyer buyer = buyers.get(0);
+            String name = buyer.getName();
+            String identityCard = buyer.getIdentityCard();
+            String roomSelectionNumber = customerManagement.getRoomSelectionNumber();
+            Date roomSelectionDate = customerManagement.getRoomSelectionDate();
+            String year = DateUtils.parseDateToStr(DateUtils.YYYY, roomSelectionDate);
+            String month = DateUtils.parseDateToStr(DateUtils.MM, roomSelectionDate);
+            String date = DateUtils.parseDateToStr(DateUtils.DD, roomSelectionDate);
+            ParkInfo parkInfo = parkInfoMapper.selectByPrimaryKey(customerManagement.getGroupId());
+            String region = "";
+            String dictLabel = sysDictService.getDictLabel("REGIONALISM_CODE", parkInfo.getRegionalismCode());
+            if(StringUtils.isNotEmpty(dictLabel)){
+                region = dictLabel;
+            }
+            Map<String, Object> data = new HashMap<>();
+            Map<String, Object> picData = new HashMap<>();
+            Map<String, Object> sealData = new HashMap<>();
+            data.put("${name}", name);
+            data.put("${identityCard}", identityCard);
+            data.put("${roomSelectionNumber}", roomSelectionNumber);
+            data.put("${year}", year);
+            data.put("${month}", month);
+            data.put("${date}", date);
+            data.put("${region}", region);
+            ReplaceWord.operateWord(response,filePath,fileName,data, picData,sealData);
+        }
+
+
+
+
+    }
+
+
+
 
 }

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

@@ -267,6 +267,13 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
     @Transactional
     public int toDeposit(IntentionalDeposit model) {
 
+
+        // 转定金
+        model.setStatus(2);
+        model.setHandleId(ShiroUtils.getUserId());
+        model.setHandleDate(new Date());
+        int result = modelMapper.updateByPrimaryKeySelective(model);
+
         String houseId = model.getHouseId();
         String customerManagementId = model.getCustomerManagementId();
 
@@ -288,6 +295,7 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
         // 新增选房信息
         String roomSelectionInfoId = IdUtil.simpleUUID();
         RoomSelectionInfo roomSelectionInfo = new RoomSelectionInfo();
+        roomSelectionInfo.setId(roomSelectionInfoId);
         roomSelectionInfo.setCustomerManagementId(customerManagementId);
         roomSelectionInfo.setHouseId(response.getId());
         roomSelectionInfo.setBuildId(response.getBuildId());
@@ -295,11 +303,13 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
         roomSelectionInfo.setGroupId(response.getGroupId());
         roomSelectionInfo.setCreatedAt(new Date());
         roomSelectionInfo.setCreatedId(ShiroUtils.getUserId());
-        roomSelectionInfo.setReceivableMoney(response.getSubscriptionFunds());
+        roomSelectionInfo.setReceivableMoney(model.getReceivableMoney());
+        roomSelectionInfo.setReceivedAmount(model.getReceivedAmount());
         // 收取状态 意向金转入
         roomSelectionInfo.setStatus(3);
-        roomSelectionInfo.setId(roomSelectionInfoId);
-        roomSelectionInfo.setDepositNumber(model.getDepositSerialNumber());
+        roomSelectionInfo.setSerialNumber(model.getDepositSerialNumber());
+        roomSelectionInfo.setPaymentMethod(model.getPaymentMethod());
+        roomSelectionInfo.setCollectionTime(model.getCollectionTime());
         roomSelectionInfoMapper.insertSelective(roomSelectionInfo);
 
         // 转定金后生产合同
@@ -358,11 +368,7 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
             receiptManageService.updateByPrimaryKeySelective(manage);
         }
 
-        // 转定金
-        model.setStatus(2);
-        model.setHandleId(ShiroUtils.getUserId());
-        model.setHandleDate(new Date());
-        int result = modelMapper.updateByPrimaryKeySelective(model);
+
 
         return result;
 

pro-base/src/main/java/com/idea/paymentManagement/service/PayLogService.java

@@ -35,6 +35,7 @@ import com.rockstar.util.StringUtils;
 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 java.math.BigDecimal;
 import java.util.Date;
@@ -124,6 +125,7 @@ public class PayLogService implements BaseService<PayLog, PayLogExample> {
      * @param model
      * @return
      */
+    @Transactional
     public int add(PayLog model) {
 
         String id = IdUtil.simpleUUID();

pro-base/src/main/java/com/idea/util/DateUtils.java

@@ -17,6 +17,10 @@ import java.util.Date;
 public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
     public static String YYYY = "yyyy";
 
+    public static String MM = "MM";
+
+    public static String DD = "dd";
+
     public static String YYYY_MM = "yyyy-MM";
 
     public static String YYYY_MM_DD = "yyyy-MM-dd";

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

@@ -29,6 +29,6 @@
         </foreach>
       </if>
     </where>
-    order by batch_number desc,room_selection_number asc
+    order by batch_number + 0 desc,room_selection_number + 0 asc
   </select>
 </mapper>

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

@@ -20,6 +20,7 @@
             and customer_management.buyer_name like concat('%',#{buyerName},'%')
         </if>
     </where>
+    order by created_at desc
   </select>
 
 </mapper>

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

@@ -40,5 +40,6 @@
                 and room_selection_info.customer_management_id in (select customer_management_id from buyer where name like concat('%',#{buyerName},'%'))
             </if>
         </where>
+        order by created_at desc
     </select>
 </mapper>

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

@@ -8,7 +8,6 @@
     <result column="disc_id" jdbcType="VARCHAR" property="discId" />
     <result column="build_id" jdbcType="VARCHAR" property="buildId" />
     <result column="house_id" jdbcType="VARCHAR" property="houseId" />
-    <result column="deposit_number" jdbcType="VARCHAR" property="depositNumber" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="receivable_money" jdbcType="DECIMAL" property="receivableMoney" />
     <result column="received_amount" jdbcType="DECIMAL" property="receivedAmount" />
@@ -84,9 +83,9 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, customer_management_id, group_id, disc_id, build_id, house_id, deposit_number,
-    status, receivable_money, received_amount, payment_method, serial_number, collection_id,
-    collection_time, created_id, created_at, updated_at, updated_id
+    id, customer_management_id, group_id, disc_id, build_id, house_id, status, receivable_money,
+    received_amount, payment_method, serial_number, collection_id, collection_time, created_id,
+    created_at, updated_at, updated_id
   </sql>
   <sql id="Blob_Column_List">
     remark, file_list
@@ -142,18 +141,18 @@
   <insert id="insert" parameterType="com.idea.customerManagement.model.RoomSelectionInfo">
     insert into room_selection_info (id, customer_management_id, group_id,
                                      disc_id, build_id, house_id,
-                                     deposit_number, status, receivable_money,
-                                     received_amount, payment_method, serial_number,
-                                     collection_id, collection_time, created_id,
-                                     created_at, updated_at, updated_id,
-                                     remark, file_list)
+                                     status, receivable_money, received_amount,
+                                     payment_method, serial_number, collection_id,
+                                     collection_time, created_id, created_at,
+                                     updated_at, updated_id, remark,
+                                     file_list)
     values (#{id,jdbcType=VARCHAR}, #{customerManagementId,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR},
             #{discId,jdbcType=VARCHAR}, #{buildId,jdbcType=VARCHAR}, #{houseId,jdbcType=VARCHAR},
-            #{depositNumber,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{receivableMoney,jdbcType=DECIMAL},
-            #{receivedAmount,jdbcType=DECIMAL}, #{paymentMethod,jdbcType=INTEGER}, #{serialNumber,jdbcType=VARCHAR},
-            #{collectionId,jdbcType=VARCHAR}, #{collectionTime,jdbcType=TIMESTAMP}, #{createdId,jdbcType=VARCHAR},
-            #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{updatedId,jdbcType=VARCHAR},
-            #{remark,jdbcType=LONGVARCHAR}, #{fileList,jdbcType=LONGVARCHAR})
+            #{status,jdbcType=INTEGER}, #{receivableMoney,jdbcType=DECIMAL}, #{receivedAmount,jdbcType=DECIMAL},
+            #{paymentMethod,jdbcType=INTEGER}, #{serialNumber,jdbcType=VARCHAR}, #{collectionId,jdbcType=VARCHAR},
+            #{collectionTime,jdbcType=TIMESTAMP}, #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP},
+            #{updatedAt,jdbcType=TIMESTAMP}, #{updatedId,jdbcType=VARCHAR}, #{remark,jdbcType=LONGVARCHAR},
+            #{fileList,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.idea.customerManagement.model.RoomSelectionInfo">
     insert into room_selection_info
@@ -176,9 +175,6 @@
       <if test="houseId != null">
         house_id,
       </if>
-      <if test="depositNumber != null">
-        deposit_number,
-      </if>
       <if test="status != null">
         status,
       </if>
@@ -238,9 +234,6 @@
       <if test="houseId != null">
         #{houseId,jdbcType=VARCHAR},
       </if>
-      <if test="depositNumber != null">
-        #{depositNumber,jdbcType=VARCHAR},
-      </if>
       <if test="status != null">
         #{status,jdbcType=INTEGER},
       </if>
@@ -309,9 +302,6 @@
       <if test="record.houseId != null">
         house_id = #{record.houseId,jdbcType=VARCHAR},
       </if>
-      <if test="record.depositNumber != null">
-        deposit_number = #{record.depositNumber,jdbcType=VARCHAR},
-      </if>
       <if test="record.status != null">
         status = #{record.status,jdbcType=INTEGER},
       </if>
@@ -364,7 +354,6 @@
     disc_id = #{record.discId,jdbcType=VARCHAR},
     build_id = #{record.buildId,jdbcType=VARCHAR},
     house_id = #{record.houseId,jdbcType=VARCHAR},
-    deposit_number = #{record.depositNumber,jdbcType=VARCHAR},
     status = #{record.status,jdbcType=INTEGER},
     receivable_money = #{record.receivableMoney,jdbcType=DECIMAL},
     received_amount = #{record.receivedAmount,jdbcType=DECIMAL},
@@ -390,7 +379,6 @@
     disc_id = #{record.discId,jdbcType=VARCHAR},
     build_id = #{record.buildId,jdbcType=VARCHAR},
     house_id = #{record.houseId,jdbcType=VARCHAR},
-    deposit_number = #{record.depositNumber,jdbcType=VARCHAR},
     status = #{record.status,jdbcType=INTEGER},
     receivable_money = #{record.receivableMoney,jdbcType=DECIMAL},
     received_amount = #{record.receivedAmount,jdbcType=DECIMAL},
@@ -424,9 +412,6 @@
       <if test="houseId != null">
         house_id = #{houseId,jdbcType=VARCHAR},
       </if>
-      <if test="depositNumber != null">
-        deposit_number = #{depositNumber,jdbcType=VARCHAR},
-      </if>
       <if test="status != null">
         status = #{status,jdbcType=INTEGER},
       </if>
@@ -476,7 +461,6 @@
         disc_id = #{discId,jdbcType=VARCHAR},
         build_id = #{buildId,jdbcType=VARCHAR},
         house_id = #{houseId,jdbcType=VARCHAR},
-        deposit_number = #{depositNumber,jdbcType=VARCHAR},
         status = #{status,jdbcType=INTEGER},
         receivable_money = #{receivableMoney,jdbcType=DECIMAL},
         received_amount = #{receivedAmount,jdbcType=DECIMAL},
@@ -499,7 +483,6 @@
         disc_id = #{discId,jdbcType=VARCHAR},
         build_id = #{buildId,jdbcType=VARCHAR},
         house_id = #{houseId,jdbcType=VARCHAR},
-        deposit_number = #{depositNumber,jdbcType=VARCHAR},
         status = #{status,jdbcType=INTEGER},
         receivable_money = #{receivableMoney,jdbcType=DECIMAL},
         received_amount = #{receivedAmount,jdbcType=DECIMAL},

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

@@ -10,8 +10,8 @@
            contract_manage.contract_number,
            contract_manage.customer_management_id,
            refund_manage.*
-    from contract_manage
-    left join refund_manage on contract_manage.id = refund_manage.contract_id
+    from refund_manage
+    left join contract_manage on contract_manage.id = refund_manage.contract_id
     <where>
       <if test="houseName != null and houseName != ''">
         and house_name like concat('%',#{houseName},'%')