Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

# Conflicts:
#	src/main/java/com/huiju/estateagents/eContract/controller/TaContractController.java

src/main/java/com/huiju/estateagents/bo/request/ContractRecordRequestBO.java

@@ -1,9 +1,9 @@
 package com.huiju.estateagents.bo.request;
 
 import lombok.Data;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.format.annotation.DateTimeFormat;
 
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 
 /**
  * 查询合同列表请求实体
@@ -64,20 +64,25 @@ public class ContractRecordRequestBO {
     /**
      * 甲方签署开始时间
      */
-    private LocalDateTime signatoryStartTime;
+    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+    private LocalDate signatoryStartTime;
 
     /**
      * 甲方签署结束时间
      */
-    private LocalDateTime signatoryEndTime;
+
+    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+    private LocalDate signatoryEndTime;
 
     /**
      * 结算开始时间
      */
-    private LocalDateTime settlementStartTime;
+    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+    private LocalDate settlementStartTime;
 
     /**
      * 结算结束时间
      */
-    private LocalDateTime settlementEndTime;
+    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+    private LocalDate settlementEndTime;
 }

src/main/java/com/huiju/estateagents/controller/TaRaiseController.java

@@ -7,13 +7,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRaise;
+import com.huiju.estateagents.entity.TaRaiseInvite;
 import com.huiju.estateagents.entity.TaSalesBatch;
-import com.huiju.estateagents.service.ITaRaiseService;
-import com.huiju.estateagents.service.ITaSalesBatchService;
-import com.huiju.estateagents.service.ITaSaveService;
-import com.huiju.estateagents.service.ITdCityService;
+import com.huiju.estateagents.service.*;
+import com.huiju.estateagents.service.impl.TaRaiseInviteServiceImpl;
 import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,7 +21,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Array;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -47,6 +49,9 @@ public class TaRaiseController extends BaseController {
     @Autowired
     public ITaSalesBatchService iTaSalesBatchService;
 
+    @Autowired
+    private TaRaiseInviteServiceImpl iTaRaiseInviteService;
+
     /**
      * 获取认筹列表
      *
@@ -136,20 +141,38 @@ public class TaRaiseController extends BaseController {
                 return responseBean;
             }
 
-            //获取销售批次状态
+            // 获取销售批次状态
             TaSalesBatch taSalesBatch = new TaSalesBatch();
-            if (taRaise.getSalesBatchId() != null){
+            if (taRaise.getSalesBatchId() != null) {
                 QueryWrapper<TaSalesBatch> taSalesBatchQueryWrapper = new QueryWrapper<>();
                 taSalesBatchQueryWrapper.eq("sales_batch_id", taRaise.getSalesBatchId());
                 taSalesBatch = iTaSalesBatchService.getOne(taSalesBatchQueryWrapper);
-
             }
 
             taRaise.setOrgId(orgId);
-            taRaise.setRaisePrice(taRaise.getRaisePrice() != null ? taRaise.getRaisePrice() : null );
+            taRaise.setRaisePrice(taRaise.getRaisePrice() != null ? taRaise.getRaisePrice() : null);
             taRaise.setStatus(taSalesBatch.getStatus());
             taRaise.setCreateDate(LocalDateTime.now());
             if (iTaRaiseService.save(taRaise)) {
+
+                // 为邀请制，添加认筹被邀请清单
+                if (CommConstant.STATUS_NORMAL == taRaise.getIsInvite()) {
+                    TaRaiseInvite taRaiseInvite = new TaRaiseInvite();
+                    taRaiseInvite.setOrgId(orgId);
+                    taRaiseInvite.setRaiseId(taRaise.getRaiseId());
+                    taRaiseInvite.setBuildingId(taRaise.getBuildingId());
+                    taRaiseInvite.setSalesBatchId(taSalesBatch.getSalesBatchId());
+                    taRaiseInvite.setCreateDate(LocalDateTime.now());
+                    List<TaRaiseInvite> taRaiseInviteList = new ArrayList<>();
+                    String[] inviteTelArr = StringUtils.isEmpty(taRaise.getInviteTel()) ?
+                            new String[]{} : taRaise.getInviteTel().replace("，", ",").split(",");
+                    for (String inviteTel : inviteTelArr) {
+                        taRaiseInvite.setInviteTel(inviteTel);
+                        taRaiseInviteList.add(taRaiseInvite);
+                    }
+                    iTaRaiseInviteService.saveBatch(taRaiseInviteList);
+                }
+
                 responseBean.addSuccess(taRaise);
             } else {
                 responseBean.addError("fail");

src/main/java/com/huiju/estateagents/controller/TaRaiseInviteController.java

@@ -0,0 +1,149 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.huiju.estateagents.service.ITaRaiseInviteService;
+import com.huiju.estateagents.entity.TaRaiseInvite;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 认筹被邀请清单  前端控制器
+    * </p>
+ *
+ * @author fxf
+ * @since 2020-03-30
+ */
+@RestController
+@RequestMapping("/")
+public class TaRaiseInviteController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaRaiseInviteController.class);
+
+    @Autowired
+    public ITaRaiseInviteService iTaRaiseInviteService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taRaiseInvite",method= RequestMethod.GET)
+    public ResponseBean taRaiseInviteList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaRaiseInvite> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaRaiseInvite> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaRaiseInvite> result = iTaRaiseInviteService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRaiseInviteList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taRaiseInvite 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taRaiseInvite",method= RequestMethod.POST)
+    public ResponseBean taRaiseInviteAdd(@RequestBody TaRaiseInvite taRaiseInvite){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRaiseInviteService.save(taRaiseInvite)){
+                responseBean.addSuccess(taRaiseInvite);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRaiseInviteAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taRaiseInvite/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taRaiseInviteDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaRaiseInviteService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRaiseInviteDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taRaiseInvite 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taRaiseInvite/{id}",method= RequestMethod.PUT)
+    public ResponseBean taRaiseInviteUpdate(@PathVariable Integer id,
+                                        @RequestBody TaRaiseInvite taRaiseInvite){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRaiseInviteService.updateById(taRaiseInvite)){
+                responseBean.addSuccess(taRaiseInvite);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRaiseInviteUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taRaiseInvite/{id}",method= RequestMethod.GET)
+    public ResponseBean taRaiseInviteGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaRaiseInviteService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRaiseInviteDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/eContract/controller/TaContractController.java

@@ -1,9 +1,6 @@
 package com.huiju.estateagents.eContract.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.bo.request.ContractRecordRequestBO;
@@ -15,6 +12,10 @@ import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaRaiseRecord;
 import com.huiju.estateagents.service.ITaPersonService;
 import org.apache.commons.lang3.StringUtils;
+import com.huiju.estateagents.entity.TaRaise;
+import com.huiju.estateagents.entity.TaSalesBatch;
+import com.huiju.estateagents.service.ITaRaiseService;
+import com.huiju.estateagents.service.ITaSalesBatchService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDate;
 import java.util.List;
+import java.time.LocalDateTime;
 
 
 /**
@@ -41,7 +43,13 @@ public class TaContractController extends BaseController {
     private final Logger logger = LoggerFactory.getLogger(TaContractController.class);
 
     @Autowired
-    public ITaContractService iTaContractService;
+    private ITaContractService iTaContractService;
+
+    @Autowired
+    private ITaRaiseService iTaRaiseService;
+
+    @Autowired
+    private ITaSalesBatchService iTaSalesBatchService;
 
 
     @Autowired
@@ -126,8 +134,9 @@ public class TaContractController extends BaseController {
             // 元转分
             Double price = taContract.getPrice() * 100;
             taContract.getTaContractList().stream().forEach(record -> {
-                record.setSettlementPrice(price.intValue());
                 record.setSettlement(true);
+                record.setSettlementPrice(price.intValue());
+                record.setSettlementTime(LocalDateTime.now());
             });
             responseBean.addSuccess(iTaContractService.updateBatchById(taContract.getTaContractList()));
 
@@ -191,11 +200,14 @@ public class TaContractController extends BaseController {
      * @param taContract 实体对象
      * @return
      */
-    @RequestMapping(value = "/taContract/{id}", method = RequestMethod.PUT)
+    @RequestMapping(value = "/admin/contract/{id}", method = RequestMethod.PUT)
     public ResponseBean taContractUpdate(@PathVariable Integer id,
                                          @RequestBody TaContract taContract) {
         ResponseBean responseBean = new ResponseBean();
         try {
+            if (taContract.getArchives() != null && taContract.getArchives()) {
+                taContract.setArchivesTime(LocalDateTime.now());
+            }
             if (iTaContractService.updateById(taContract)) {
                 responseBean.addSuccess(taContract);
             } else {
@@ -218,7 +230,17 @@ public class TaContractController extends BaseController {
     public ResponseBean taContractGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaContractService.getById(id));
+            TaContract taContract = iTaContractService.getById(id);
+            if(taContract != null){
+                TaRaise taRaise = iTaRaiseService.getById(taContract.getTargetId());
+                if(taRaise != null){
+                    TaSalesBatch taSalesBatch = iTaSalesBatchService.getById(taRaise.getSalesBatchId());
+                    if(taSalesBatch != null){
+                        taContract.setTargetName(taSalesBatch.getSalesBatchName());
+                    }
+                }
+            }
+            responseBean.addSuccess(taContract);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taContractDelete -=- {}", e.toString());

src/main/java/com/huiju/estateagents/eContract/controller/TaContractTemplateController.java

@@ -77,16 +77,17 @@ public class TaContractTemplateController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/contract/template/add", method = RequestMethod.POST)
-    public ResponseBean taContractTemplateAdd(@RequestBody TaContractTemplate taContractTemplate) {
+    public ResponseBean taContractTemplateAdd(@RequestBody TaContractTemplate taContractTemplate,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             taContractTemplate.setCreateDate(LocalDateTime.now());
             taContractTemplate.setStatus(CommConstant.STATUS_NORMAL);
-//            if (iTaContractTemplateService.save(taContractTemplate)) {
-//                responseBean.addSuccess(taContractTemplate);
-//            } else {
-//                responseBean.addError("fail");
-//            }
+            taContractTemplate.setOrgId(getOrgId(request));
+            if (iTaContractTemplateService.save(taContractTemplate)) {
+                responseBean.addSuccess(taContractTemplate);
+            } else {
+                responseBean.addError("fail");
+            }
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taContractTemplateAdd -=- {}", e.toString());

src/main/java/com/huiju/estateagents/eContract/entity/TaContract.java

@@ -186,4 +186,7 @@ public class TaContract implements Serializable {
     @TableField(exist = false)
     private List<TaContract> taContractList;
 
+    @TableField(exist = false)
+    private String targetName;
+
 }

src/main/java/com/huiju/estateagents/entity/TaRaise.java

@@ -166,4 +166,16 @@ public class TaRaise implements Serializable {
      */
     @TableField(exist = false)
     private Integer salesBatchStatus;
+
+    /**
+     * 是否邀请制 1是 0否
+     */
+    @TableField(exist = false)
+    private Integer isInvite;
+
+    /**
+     * 被邀请电话号码
+     */
+    @TableField(exist = false)
+    private String inviteTel;
 }

src/main/java/com/huiju/estateagents/entity/TaRaiseInvite.java

@@ -0,0 +1,60 @@
+package com.huiju.estateagents.entity;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 认筹被邀请清单 
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaRaiseInvite implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 认筹被邀请id
+     */
+    private String raiseInviteId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 认筹id
+     */
+    private Integer raiseId;
+
+    /**
+     * 销售批次id
+     */
+    private Integer salesBatchId;
+
+    /**
+     * 项目id
+     */
+    private String buildingId;
+
+    /**
+     * 被邀请电话号码
+     */
+    private String inviteTel;
+
+
+}

src/main/java/com/huiju/estateagents/mapper/TaRaiseInviteMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.huiju.estateagents.entity.TaRaiseInvite;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 认筹被邀请清单  Mapper 接口
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-30
+ */
+@Mapper
+public interface TaRaiseInviteMapper extends BaseMapper<TaRaiseInvite> {
+
+}

src/main/java/com/huiju/estateagents/service/ITaRaiseInviteService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.huiju.estateagents.entity.TaRaiseInvite;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 认筹被邀请清单  服务类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-30
+ */
+public interface ITaRaiseInviteService extends IService<TaRaiseInvite> {
+
+}

src/main/java/com/huiju/estateagents/service/impl/TaRaiseInviteServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.huiju.estateagents.entity.TaRaiseInvite;
+import com.huiju.estateagents.mapper.TaRaiseInviteMapper;
+import com.huiju.estateagents.service.ITaRaiseInviteService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 认筹被邀请清单  服务实现类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-30
+ */
+@Service
+public class TaRaiseInviteServiceImpl extends ServiceImpl<TaRaiseInviteMapper, TaRaiseInvite> implements ITaRaiseInviteService {
+
+}

src/main/resources/mapper/TaOrgMapper.xml

@@ -14,10 +14,10 @@
             left join ta_channel_proxy t4 on t3.channel_id = t4.channel_id
         <where>
             <if test = "orgName != null and orgName != ''">
-                t.`name` = #{orgName}
+                t.`name` like concat('%',#{orgName},'%')
             </if>
             <if test = "miniAppName != null and miniAppName != ''">
-                AND t2.`name` = #{miniAppName}
+                AND t2.`name` like concat('%',#{miniAppName},'%')
             </if>
         </where>
         ORDER BY

src/main/resources/mapper/TaRaiseInviteMapper.xml

@@ -0,0 +1,5 @@
+<?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.huiju.estateagents.mapper.TaRaiseInviteMapper">
+
+</mapper>

src/main/resources/mapper/eContract/TaContractMapper.xml

@@ -22,10 +22,10 @@
                 AND t.archives = #{archives}
             </if>
             <if test="archivesStartDate != null">
-                AND t.archives &gt;= #{archivesStartDate}
+                AND t.archives_time &gt;= #{archivesStartDate}
             </if>
             <if test="archivesEndDate != null">
-                AND t.archives &lt;= #{archivesEndDate}
+                AND t.archives_time &lt;= #{archivesEndDate}
             </if>
             <choose>
                 <when test="signatoryStatus == 0">