* 新需求

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

@@ -163,7 +163,7 @@ public class TaRaiseRecordController extends BaseController {
      * @param raiseRecord
      * @return
      */
-    @RequestMapping(value = "/admin/raise/checkBeforeInvalidRecord", method = RequestMethod.GET)
+    @RequestMapping(value = "/admin/raise/checkBeforeInvalidRecord", method = RequestMethod.POST)
     public ResponseBean checkBeforeInvalidRecord(@RequestBody TaRaiseRecord raiseRecord) {
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -302,7 +302,7 @@ public class TaRaiseRecordController extends BaseController {
      * @param request
      * @return
      */
-    @RequestMapping(value = "/admin/raise/checkBeforePayOfflineRecord", method = RequestMethod.GET)
+    @RequestMapping(value = "/admin/raise/checkBeforePayOfflineRecord", method = RequestMethod.POST)
     public ResponseBean checkBeforePayOfflineRecord(@RequestBody TaRaiseRecord raiseRecord, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -419,7 +419,7 @@ public class TaRaiseRecordController extends BaseController {
      * @param raiseRecord
      * @return
      */
-    @RequestMapping(value = "/admin/raise/checkBeforeRefundOfflineRecord", method = RequestMethod.GET)
+    @RequestMapping(value = "/admin/raise/checkBeforeRefundOfflineRecord", method = RequestMethod.POST)
     public ResponseBean checkBeforeRefundOfflineRecord(@RequestBody TaRaiseRecord raiseRecord) {
         ResponseBean responseBean = new ResponseBean();
         try {

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

@@ -64,8 +64,8 @@ public class TaCompanyController extends BaseController {
      * @param certifiedStatus
      * @return
      */
-    @RequestMapping(value = "/channel/contract/lisCompany", method = RequestMethod.GET)
-    public ResponseBean lisCompany(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+    @RequestMapping(value = "/channel/contract/listCompany", method = RequestMethod.GET)
+    public ResponseBean listCompany(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                    @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                    String companyName, String companyCode, String certifiedStatus) {
         ResponseBean responseBean = new ResponseBean();
@@ -82,8 +82,7 @@ public class TaCompanyController extends BaseController {
             IPage<TaCompany> result = iTaCompanyService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
         } catch (Exception e) {
-            e.printStackTrace();
-            logger.error("taCompanyList -=- {}", e.toString());
+            logger.error("listCompany -=- {}", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;

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

@@ -2,17 +2,25 @@ 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;
 import com.huiju.estateagents.common.CommonUtils;
 import com.huiju.estateagents.eContract.entity.TaContract;
 import com.huiju.estateagents.eContract.service.ITaContractService;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDate;
+
+
 /**
  * <p>
  * 合同列表  前端控制器
@@ -30,54 +38,56 @@ public class TaContractController extends BaseController {
     @Autowired
     public ITaContractService iTaContractService;
 
-
     /**
-     * 条件查询合同列表
+     * 条件查询合同列表 -- admin端
      *
-     * @param requestBO
+     * @param pageNum
+     * @param pageSize
+     * @param contractName
+     * @param archives
+     * @param signatoryName
+     * @param signatoryStatus   甲方是否签署，1是，0否，2全部
+     * @param customerName
+     * @param customerStatus    乙方是否签署，1是，0否，2全部
+     * @param archivesStartDate
+     * @param archivesEndDate
      * @return
      */
-    @RequestMapping(value = "/channel/contract/list", method = RequestMethod.GET)
-    public ResponseBean listContractForChannel(ContractRecordRequestBO requestBO) {
+    @RequestMapping(value = "/admin/contract/list", method = RequestMethod.GET)
+    public ResponseBean listContractForAdmin(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                             String contractName, Boolean archives,
+                                             String signatoryName, Integer signatoryStatus,
+                                             String customerName, Integer customerStatus,
+                                             @RequestParam(value = "archivesStartDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate archivesStartDate,
+                                             @RequestParam(value = "archivesEndDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate archivesEndDate,
+                                             HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaContractService.listContractForChannel(requestBO);
-            logger.info("TaContractController.listContractForChannel 返回结果:{}", JSONObject.toJSONString(responseBean));
+            responseBean = iTaContractService.listContractForAdmin(pageNum, pageSize, contractName, archives, signatoryName, signatoryStatus, customerName, customerStatus, archivesStartDate, archivesEndDate, getOrgId(request));
+            logger.info("TaContractController.listContractForAdmin 返回结果：{}", JSONObject.toJSONString(responseBean));
         } catch (Exception e) {
-            logger.error("TaContractController.listContractForChannel 异常：", e);
+            logger.error("TaContractController.listContractForAdmin 异常：", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;
     }
 
+
     /**
-     * 批量结算前校验
+     * 条件查询合同列表 -- channel端
      *
+     * @param requestBO
      * @return
      */
-    @RequestMapping(value = "/channel/contract/checkBeforeBatchUpdatePrice", method = RequestMethod.GET)
-    public ResponseBean checkBeforeBatchUpdatePrice(@RequestBody TaContract taContract) {
+    @RequestMapping(value = "/channel/contract/list", method = RequestMethod.GET)
+    public ResponseBean listContractForChannel(ContractRecordRequestBO requestBO) {
         ResponseBean responseBean = new ResponseBean();
-        Integer fitNum = 0;
-        Integer notFitNum = 0;
-        Integer totalNum = taContract.getTaContractList().size();
         try {
-            for (TaContract record : taContract.getTaContractList()) {
-                TaContract contract = iTaContractService.getById(record.getContractId());
-                if (contract == null) {
-                    fitNum++;
-                } else {
-                    notFitNum++;
-                }
-            }
-
-            JSONObject obj = new JSONObject();
-            obj.put("fitNum", fitNum);
-            obj.put("notFitNum", notFitNum);
-            obj.put("totalNum", totalNum);
-            responseBean.addSuccess(obj);
+            responseBean = iTaContractService.listContractForChannel(requestBO);
+            logger.info("TaContractController.listContractForChannel 返回结果:{}", JSONObject.toJSONString(responseBean));
         } catch (Exception e) {
-            logger.error("TaContractController.checkBeforeBatchUpdatePrice 异常：", e);
+            logger.error("TaContractController.listContractForChannel 异常：", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -93,21 +103,22 @@ public class TaContractController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             // 校验参数
-            if (taContract.getSettlementPrice() == null) {
+            if (taContract.getPrice() == null) {
                 responseBean.addError("请填写结算金额");
                 return responseBean;
             }
 
             // 校验金额是否符合要求
-            if (!CommonUtils.isAmount(taContract.getSettlementPrice() + "")) {
+            if (!CommonUtils.isAmount(taContract.getPrice() + "")) {
                 responseBean.addError("结算金额不符合要求");
                 return responseBean;
             }
 
             // 元转分
-            Integer price = taContract.getSettlementPrice() * 100;
+            Double price = taContract.getPrice() * 100;
             taContract.getTaContractList().stream().forEach(record -> {
-                record.setSettlementPrice(price);
+                record.setSettlementPrice(price.intValue());
+                record.setSettlement(true);
             });
             responseBean.addSuccess(iTaContractService.updateBatchById(taContract.getTaContractList()));
 
@@ -194,7 +205,7 @@ public class TaContractController extends BaseController {
      *
      * @param id 实体ID
      */
-    @RequestMapping(value = "/taContract/{id}", method = RequestMethod.GET)
+    @RequestMapping(value = "/admin/contract/{id}", method = RequestMethod.GET)
     public ResponseBean taContractGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {

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

@@ -6,9 +6,10 @@ 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.common.CommConstant;
 import com.huiju.estateagents.eContract.entity.TaContractTemplate;
 import com.huiju.estateagents.eContract.service.ITaContractTemplateService;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +17,9 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
     * 合同模板  前端控制器
@@ -36,6 +40,7 @@ public class TaContractTemplateController extends BaseController {
 
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
      * @return
@@ -67,21 +72,45 @@ public class TaContractTemplateController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taContractTemplate 实体对象
      * @return
      */
-    @RequestMapping(value="/taContractTemplate",method= RequestMethod.POST)
-    public ResponseBean taContractTemplateAdd(@RequestBody TaContractTemplate taContractTemplate){
+    @RequestMapping(value = "/admin/contract/template/add", method = RequestMethod.POST)
+    public ResponseBean taContractTemplateAdd(@RequestBody TaContractTemplate taContractTemplate) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaContractTemplateService.save(taContractTemplate)){
-                responseBean.addSuccess(taContractTemplate);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
+            taContractTemplate.setCreateDate(LocalDateTime.now());
+            taContractTemplate.setStatus(CommConstant.STATUS_NORMAL);
+//            if (iTaContractTemplateService.save(taContractTemplate)) {
+//                responseBean.addSuccess(taContractTemplate);
+//            } else {
+//                responseBean.addError("fail");
+//            }
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taContractTemplateAdd -=- {}",e.toString());
+            logger.error("taContractTemplateAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 批量删除合同模板
+     *
+     * @param taContractTemplateList
+     */
+    @ResponseBody
+    @RequestMapping(value = "/admin/contract/template/batchDelete", method = RequestMethod.PUT)
+    public ResponseBean batchDeleteContractTemplate(@RequestBody List<TaContractTemplate> taContractTemplateList) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taContractTemplateList.stream().forEach(record -> {
+                record.setStatus(CommConstant.STATUS_DELETE);
+            });
+            responseBean.addSuccess(iTaContractTemplateService.updateBatchById(taContractTemplateList));
+        } catch (Exception e) {
+            logger.error("batchDeleteContractTemplate -=- {}", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.eContract.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.List;
@@ -13,7 +14,7 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 合同列表 
+ * 合同列表
  * </p>
  *
  * @author fxf
@@ -41,7 +42,9 @@ public class TaContract implements Serializable {
      * 公司id
      */
     private Integer orgId;
-    /** 楼盘id */
+    /**
+     * 楼盘id
+     */
     private String buildingId;
 
     /**
@@ -139,8 +142,10 @@ public class TaContract implements Serializable {
      */
     private Integer settlementPrice;
 
-    /** 小程序用户id */
-    private String personId ;
+    /**
+     * 小程序用户id
+     */
+    private String personId;
 
     /**
      * 公司名
@@ -172,6 +177,12 @@ public class TaContract implements Serializable {
     @TableField(exist = false)
     private String channelProxyName;
 
+    /**
+     * 前端传的计算价格
+     */
+    @TableField(exist = false)
+    private Double price;
+
     @TableField(exist = false)
     private List<TaContract> taContractList;
 

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

@@ -1,9 +1,12 @@
 package com.huiju.estateagents.eContract.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -54,5 +57,6 @@ public class TaContractTemplate implements Serializable {
      */
     private Integer status;
 
-
+    @TableField(exist = false)
+    private List<TaContractTemplate> taContractTemplateList;
 }

src/main/java/com/huiju/estateagents/eContract/mapper/TaContractMapper.java

@@ -6,6 +6,9 @@ import com.huiju.estateagents.eContract.entity.TaContract;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDate;
 
 /**
  * <p>
@@ -16,8 +19,20 @@ import org.apache.ibatis.annotations.Param;
  * @since 2020-03-26
  */
 @Mapper
+@Component
 public interface TaContractMapper extends BaseMapper<TaContract> {
 
+    IPage<TaContract> listContractForAdmin(IPage<TaContract> pg,
+                                           @Param("contractName") String contractName,
+                                           @Param("archives") Boolean archives,
+                                           @Param("signatoryName") String signatoryName,
+                                           @Param("signatoryStatus") Integer signatoryStatus,
+                                           @Param("customerName") String customerName,
+                                           @Param("customerStatus") Integer customerStatus,
+                                           @Param("archivesStartDate") LocalDate archivesStartDate,
+                                           @Param("archivesEndDate") LocalDate archivesEndDate,
+                                           @Param("orgId") Integer orgId);
+
     IPage<TaContract> listContractForChannel(IPage<TaContract> pg,
                                              @Param("bo") ContractRecordRequestBO bo);
 }

src/main/java/com/huiju/estateagents/eContract/service/ITaContractService.java

@@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.bo.request.ContractRecordRequestBO;
 import com.huiju.estateagents.eContract.entity.TaContract;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.RequestParam;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -17,6 +20,25 @@ import java.time.LocalDateTime;
  */
 public interface ITaContractService extends IService<TaContract> {
 
+    /**
+     * 条件查询合同列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param contractName
+     * @param archives
+     * @param signatoryName
+     * @param signatoryStatus
+     * @param customerName
+     * @param customerStatus
+     * @param archivesStartDate
+     * @param archivesEndDate
+     * @param orgId
+     * @return
+     */
+    ResponseBean listContractForAdmin(Integer pageNum, Integer pageSize, String contractName, Boolean archives, String signatoryName, Integer signatoryStatus,
+                                      String customerName, Integer customerStatus, LocalDate archivesStartDate, LocalDate archivesEndDate, Integer orgId);
+
     /**
      * 条件查询合同列表
      *

src/main/java/com/huiju/estateagents/eContract/service/impl/TaContractServiceImpl.java

@@ -13,6 +13,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+
 /**
  * <p>
  * 合同列表  服务实现类
@@ -28,6 +30,16 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
     @Autowired
     private TaContractMapper taContractMapper;
 
+    @Override
+    public ResponseBean listContractForAdmin(Integer pageNum, Integer pageSize, String contractName, Boolean archives, String signatoryName, Integer signatoryStatus, String customerName, Integer customerStatus, LocalDate archivesStartDate, LocalDate archivesEndDate, Integer orgId) {
+
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaContract> pg = new Page<>(pageNum, pageSize);
+        pg = taContractMapper.listContractForAdmin(pg, contractName, archives, signatoryName, signatoryStatus, customerName, customerStatus, archivesStartDate, archivesEndDate, orgId);
+        responseBean.addSuccess(pg);
+        return responseBean;
+    }
+
     @Override
     public ResponseBean listContractForChannel(ContractRecordRequestBO requestBO) {
         log.info("TaContractServiceImpl.listContractForChannel 接收参数:{}", JSONObject.toJSONString(requestBO));

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

@@ -75,4 +75,10 @@ public class TaOrg implements Serializable {
      */
     @TableField(exist = false)
     private String miniAppName;
+
+    /**
+     * 代理商名称
+     */
+    @TableField(exist = false)
+    private String channelProxyName;
 }

src/main/resources/mapper/TaOrgMapper.xml

@@ -5,10 +5,13 @@
     <select id="listOrgForContract" resultType="com.huiju.estateagents.entity.TaOrg">
         SELECT
             *,
-            t2.`name` miniAppName
+            t2.`name` miniAppName,
+            t4.channel_proxy_name
         FROM
             ta_org t
             LEFT JOIN ta_miniapp t2 ON t.org_id = t2.org_id
+            left join ta_channel_app_relation t3 on t.org_id =t3.org_id
+            left join ta_channel_proxy t4 on t3.channel_id = t4.channel_id
         <where>
             <if test = "orgName != null and orgName != ''">
                 t.`name` = #{orgName}

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

@@ -6,7 +6,6 @@
         SELECT
             t.*,
             t2.company_name,
-            t2.company_id,
             t2.certified_status,
             t3.`name` orgName,
             t4.`name` miniAppName

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

@@ -2,11 +2,58 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.eContract.mapper.TaContractMapper">
 
+    <select id="listContractForAdmin" resultType="com.huiju.estateagents.eContract.entity.TaContract">
+        SELECT
+            *
+        FROM
+            ta_contract t
+        where
+            t.org_id = #{orgId}
+            <if test="contractName != null and contractName != ''">
+                AND t.contract_name LIKE CONCAT( '%', #{contractName}, '%' )
+            </if>
+            <if test="signatoryName != null and signatoryName != ''">
+                AND t.signatory_name LIKE CONCAT( '%', #{signatoryName}, '%' )
+            </if>
+            <if test="customerName != null and customerName != ''">
+                AND t.customer_name LIKE CONCAT( '%', #{customerName}, '%' )
+            </if>
+            <if test="archives != null">
+                AND t.archives = #{archives}
+            </if>
+            <if test="archivesStartDate != null">
+                AND t.archives &gt;= #{archivesStartDate}
+            </if>
+            <if test="archivesEndDate != null">
+                AND t.archives &lt;= #{archivesEndDate}
+            </if>
+            <choose>
+                <when test="signatoryStatus == 0">
+                    AND t.signatory_time = NULL
+                </when>
+                <when test="signatoryStatus == 1">
+                    AND t.signatory_time &lt;&gt; NULL
+                </when>
+                <otherwise></otherwise>
+            </choose>
+            <choose>
+                <when test="signatoryStatus == 0">
+                    AND t.customer_time = NULL
+                </when>
+                <when test="signatoryStatus == 1">
+                    AND t.customer_time &lt;&gt; NULL
+                </when>
+                <otherwise></otherwise>
+            </choose>
+        ORDER BY
+        t.signatory_time DESC
+    </select>
+
     <select id="listContractForChannel" resultType="com.huiju.estateagents.eContract.entity.TaContract">
         SELECT
             t.*,
             t2.company_name,
-            t2.company_number,
+            t2.company_code,
             t3.`name` orgName,
             t4.`name` miniAppName,
             t6.channel_proxy_name
@@ -42,17 +89,17 @@
             <if test=" bo.channelProxyName != null and bo.channelProxyName != ''">
                 AND t6.channel_proxy_name like CONCAT('%',#{bo.channelProxyName} , '%')
             </if>
-            <if test=" bo.signatoryStartTime != null and bo.signatoryStartTime != ''">
+            <if test=" bo.signatoryStartTime != null">
                 AND t.signatory_time &gt;= #{bo.signatoryStartTime}
             </if>
-            <if test=" bo.signatoryEndTime != null and bo.signatoryEndTime != ''">
+            <if test=" bo.signatoryEndTime != null ">
                 AND t.signatory_time &lt;= #{bo.signatoryEndTime}
             </if>
-            <if test=" bo.settlementStartTime != null and bo.settlementStartTime != ''">
+            <if test=" bo.settlementStartTime != null">
                 AND t.settlement_time &gt;= #{bo.settlementStartTime}
             </if>
-            <if test=" bo.settlementEndTime != null and bo.settlementEndTime != ''">
-                AND t.settlement_time &lt;= #{bosettlementEndTime.}
+            <if test=" bo.settlementEndTime != null">
+                AND t.settlement_time &lt;= #{bo.settlementEndTime.}
             </if>
         </where>
         ORDER BY