* 新需求

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

@@ -0,0 +1,78 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.time.LocalDateTime;
+
+/**
+ * 查询合同列表请求实体
+ */
+@Data
+public class ContractRecordRequestBO {
+
+    /**
+     * 页码
+     */
+    private Integer pageNum = 1;
+
+    /**
+     * 分页大小
+     */
+    private Integer pageSize = 10;
+
+    /**
+     * 公司名
+     */
+    private String companyName;
+
+    /**
+     * 公司编码
+     */
+    private String companyNumber;
+
+    /**
+     * 组织名
+     */
+    private String orgName;
+
+    /**
+     * 小程序名
+     */
+    private String miniAppName;
+
+    /**
+     * 合同编号
+     */
+    private Integer contractId;
+
+    /**
+     * 合同名
+     */
+    private String contractName;
+
+    /**
+     * 是否结算
+     */
+    private Boolean settlement;
+
+    /**
+     * 甲方签署开始时间
+     */
+    private LocalDateTime signatoryStartTime;
+
+    /**
+     * 甲方签署结束时间
+     */
+    private LocalDateTime signatoryEndTime;
+
+    /**
+     * 结算开始时间
+     */
+    private LocalDateTime settlementStartTime;
+
+    /**
+     * 结算结束时间
+     */
+    private LocalDateTime settlementEndTime;
+}

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.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;
@@ -14,8 +15,8 @@ import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
-    * 公司表  前端控制器
-    * </p>
+ * 公司表  前端控制器
+ * </p>
  *
  * @author jobob
  * @since 2019-09-11
@@ -32,25 +33,26 @@ public class TaOrgController extends BaseController {
 
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/center/taOrg",method= RequestMethod.GET)
-    public ResponseBean taOrgList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value = "/center/taOrg", method = RequestMethod.GET)
+    public ResponseBean taOrgList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaOrg> pg = new Page<>(pageNum, pageSize);
+            IPage<TaOrg> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaOrg> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaOrg> result = iTaOrgService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taOrgList -=- {}",e.toString());
+            logger.error("taOrgList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -58,21 +60,22 @@ public class TaOrgController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taOrg 实体对象
      * @return
      */
-    @RequestMapping(value="/center/taOrg",method= RequestMethod.POST)
-    public ResponseBean taOrgAdd(@RequestBody TaOrg taOrg){
+    @RequestMapping(value = "/center/taOrg", method = RequestMethod.POST)
+    public ResponseBean taOrgAdd(@RequestBody TaOrg taOrg) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaOrgService.save(taOrg)){
+            if (iTaOrgService.save(taOrg)) {
                 responseBean.addSuccess(taOrg);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taOrgAdd -=- {}",e.toString());
+            logger.error("taOrgAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -80,21 +83,22 @@ public class TaOrgController extends BaseController {
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taOrg/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taOrgDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/taOrg/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taOrgDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaOrgService.removeById(id)){
+            if (iTaOrgService.removeById(id)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taOrgDelete -=- {}",e.toString());
+            logger.error("taOrgDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -102,24 +106,25 @@ public class TaOrgController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id    实体ID
      * @param taOrg 实体对象
      * @return
      */
-    @RequestMapping(value="/taOrg/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/taOrg/{id}", method = RequestMethod.PUT)
     public ResponseBean taOrgUpdate(@PathVariable Integer id,
-                                        @RequestBody TaOrg taOrg){
+                                    @RequestBody TaOrg taOrg) {
         ResponseBean responseBean = new ResponseBean();
         try {
             taOrg.setOrgId(id);
-            if (iTaOrgService.updateById(taOrg)){
+            if (iTaOrgService.updateById(taOrg)) {
                 responseBean.addSuccess(taOrg);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taOrgUpdate -=- {}",e.toString());
+            logger.error("taOrgUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -127,16 +132,41 @@ public class TaOrgController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/center/taOrg/{id}",method= RequestMethod.GET)
-    public ResponseBean taOrgGet(@PathVariable Integer id){
+    @RequestMapping(value = "/center/taOrg/{id}", method = RequestMethod.GET)
+    public ResponseBean taOrgGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaOrgService.getById(id));
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taOrgDelete -=- {}",e.toString());
+            logger.error("taOrgDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 条件查询组织列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param orgName
+     * @param miniAppName
+     * @return
+     */
+    @RequestMapping(value = "/channel/contract/listOrg", method = RequestMethod.GET)
+    public ResponseBean listOrgForContract(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                           String orgName, String miniAppName) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaOrgService.listOrgForContract(pageNum, pageSize, orgName, miniAppName);
+            logger.info("TaOrgController.listOrgForContract 返回结果：", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("TaOrgController.listOrgForContract 异常:", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;

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

@@ -1,10 +1,13 @@
 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.common.CommConstant;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,16 +21,18 @@ import com.huiju.estateagents.eContract.service.ITaCompanyService;
 import com.huiju.estateagents.eContract.entity.TaCompany;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
-    * 企业认证表  前端控制器
-    * </p>
+ * 企业认证表  前端控制器
+ * </p>
  *
  * @author fxf
  * @since 2020-03-26
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaCompanyController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaCompanyController.class);
@@ -37,26 +42,35 @@ public class TaCompanyController extends BaseController {
 
 
     /**
-     * 分页查询列表
+     * 条件查询企业列表
+     *
      * @param pageNum
      * @param pageSize
+     * @param companyName
+     * @param companyNumber
+     * @param certifiedStatus
      * @return
      */
-    @RequestMapping(value="/taCompany",method= RequestMethod.GET)
-    public ResponseBean taCompanyList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value = "/channel/contract/lisCompany", method = RequestMethod.GET)
+    public ResponseBean lisCompany(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                   String companyName, String companyNumber, String certifiedStatus) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaCompany> pg = new Page<>(pageNum, pageSize);
+            IPage<TaCompany> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaCompany> queryWrapper = new QueryWrapper<>();
+            queryWrapper.like(StringUtils.isNotBlank(companyName), "company_name", companyName);
+            queryWrapper.like(StringUtils.isNotBlank(companyNumber), "company_number", companyNumber);
+            queryWrapper.eq(StringUtils.isNotBlank(certifiedStatus), "certified_status", certifiedStatus);
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaCompany> result = iTaCompanyService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taCompanyList -=- {}",e.toString());
+            logger.error("taCompanyList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -64,21 +78,22 @@ public class TaCompanyController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taCompany 实体对象
      * @return
      */
-    @RequestMapping(value="/taCompany",method= RequestMethod.POST)
-    public ResponseBean taCompanyAdd(@RequestBody TaCompany taCompany){
+    @RequestMapping(value = "/taCompany", method = RequestMethod.POST)
+    public ResponseBean taCompanyAdd(@RequestBody TaCompany taCompany) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaCompanyService.save(taCompany)){
+            if (iTaCompanyService.save(taCompany)) {
                 responseBean.addSuccess(taCompany);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taCompanyAdd -=- {}",e.toString());
+            logger.error("taCompanyAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -86,21 +101,22 @@ public class TaCompanyController extends BaseController {
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taCompany/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taCompanyDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/taCompany/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taCompanyDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaCompanyService.removeById(id)){
+            if (iTaCompanyService.removeById(id)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taCompanyDelete -=- {}",e.toString());
+            logger.error("taCompanyDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -108,23 +124,24 @@ public class TaCompanyController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id        实体ID
      * @param taCompany 实体对象
      * @return
      */
-    @RequestMapping(value="/taCompany/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/taCompany/{id}", method = RequestMethod.PUT)
     public ResponseBean taCompanyUpdate(@PathVariable Integer id,
-                                        @RequestBody TaCompany taCompany){
+                                        @RequestBody TaCompany taCompany) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaCompanyService.updateById(taCompany)){
+            if (iTaCompanyService.updateById(taCompany)) {
                 responseBean.addSuccess(taCompany);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taCompanyUpdate -=- {}",e.toString());
+            logger.error("taCompanyUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -132,18 +149,20 @@ public class TaCompanyController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/taCompany/{id}",method= RequestMethod.GET)
-    public ResponseBean taCompanyGet(@PathVariable Integer id){
+    @RequestMapping(value = "/taCompany/{id}", method = RequestMethod.GET)
+    public ResponseBean taCompanyGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaCompanyService.getById(id));
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taCompanyDelete -=- {}",e.toString());
+            logger.error("taCompanyDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
     }
+
 }

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

@@ -1,5 +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;
@@ -7,21 +8,25 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.eContract.entity.TaCompanyOrg;
 import com.huiju.estateagents.eContract.service.ITaCompanyOrgService;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+
 /**
  * <p>
-    * 企业和组织关系表  前端控制器
-    * </p>
+ * 企业和组织关系表  前端控制器
+ * </p>
  *
  * @author fxf
  * @since 2020-03-26
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaCompanyOrgController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaCompanyOrgController.class);
@@ -32,25 +37,26 @@ public class TaCompanyOrgController extends BaseController {
 
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taCompanyOrg",method= RequestMethod.GET)
-    public ResponseBean taCompanyOrgList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value = "/taCompanyOrg", method = RequestMethod.GET)
+    public ResponseBean taCompanyOrgList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaCompanyOrg> pg = new Page<>(pageNum, pageSize);
+            IPage<TaCompanyOrg> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaCompanyOrg> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaCompanyOrg> result = iTaCompanyOrgService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taCompanyOrgList -=- {}",e.toString());
+            logger.error("taCompanyOrgList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -58,21 +64,40 @@ public class TaCompanyOrgController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taCompanyOrg 实体对象
      * @return
      */
-    @RequestMapping(value="/taCompanyOrg",method= RequestMethod.POST)
-    public ResponseBean taCompanyOrgAdd(@RequestBody TaCompanyOrg taCompanyOrg){
+    @RequestMapping(value = "/channel/contract/taCompanyOrg", method = RequestMethod.POST)
+    public ResponseBean taCompanyOrgAdd(@RequestBody TaCompanyOrg taCompanyOrg) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaCompanyOrgService.save(taCompanyOrg)){
+
+            // 校验参数
+            if (taCompanyOrg.getOrgId() == null || taCompanyOrg.getCompanyId() == null) {
+                responseBean.addError("参数错误");
+                return responseBean;
+            }
+
+            // 校验企业是否已经关联组织
+            QueryWrapper<TaCompanyOrg> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",taCompanyOrg.getOrgId());
+            queryWrapper.eq("company_id",taCompanyOrg.getCompanyId());
+            TaCompanyOrg companyOrg = iTaCompanyOrgService.getOne(queryWrapper);
+            if(companyOrg != null){
+                responseBean.addError("所选企业已关联了所选组织，不能重复关联");
+                return responseBean;
+            }
+
+            taCompanyOrg.setCreateDate(LocalDateTime.now());
+            if (iTaCompanyOrgService.save(taCompanyOrg)) {
                 responseBean.addSuccess(taCompanyOrg);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taCompanyOrgAdd -=- {}",e.toString());
+            logger.error("taCompanyOrgAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -80,21 +105,22 @@ public class TaCompanyOrgController extends BaseController {
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taCompanyOrg/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taCompanyOrgDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/taCompanyOrg/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taCompanyOrgDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaCompanyOrgService.removeById(id)){
+            if (iTaCompanyOrgService.removeById(id)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taCompanyOrgDelete -=- {}",e.toString());
+            logger.error("taCompanyOrgDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -102,23 +128,24 @@ public class TaCompanyOrgController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id           实体ID
      * @param taCompanyOrg 实体对象
      * @return
      */
-    @RequestMapping(value="/taCompanyOrg/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/taCompanyOrg/{id}", method = RequestMethod.PUT)
     public ResponseBean taCompanyOrgUpdate(@PathVariable Integer id,
-                                        @RequestBody TaCompanyOrg taCompanyOrg){
+                                           @RequestBody TaCompanyOrg taCompanyOrg) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaCompanyOrgService.updateById(taCompanyOrg)){
+            if (iTaCompanyOrgService.updateById(taCompanyOrg)) {
                 responseBean.addSuccess(taCompanyOrg);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taCompanyOrgUpdate -=- {}",e.toString());
+            logger.error("taCompanyOrgUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -126,16 +153,49 @@ public class TaCompanyOrgController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/taCompanyOrg/{id}",method= RequestMethod.GET)
-    public ResponseBean taCompanyOrgGet(@PathVariable Integer id){
+    @RequestMapping(value = "/taCompanyOrg/{id}", method = RequestMethod.GET)
+    public ResponseBean taCompanyOrgGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaCompanyOrgService.getById(id));
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taCompanyOrgDelete -=- {}",e.toString());
+            logger.error("taCompanyOrgDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 条件查询公司组织列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param companyName
+     * @param companyNumber
+     * @param certifiedStatus
+     * @param orgName
+     * @param miniAppName
+     * @return
+     */
+    @RequestMapping(value = "/channel/contract/listCompanyOrg", method = RequestMethod.GET)
+    public ResponseBean listCompanyAndOrg(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                          String companyName,
+                                          String companyNumber,
+                                          String certifiedStatus,
+                                          String orgName,
+                                          String miniAppName) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaCompanyOrgService.listCompanyOrg(pageNum, pageSize, companyName, companyNumber, certifiedStatus, orgName, miniAppName);
+            logger.info("TaCompanyOrgController.listCompanyOrg 返回结果：{}", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("TaCompanyOrgController.listCompanyOrg 异常：", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;

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

@@ -1,10 +1,10 @@
 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.eContract.entity.TaContract;
 import com.huiju.estateagents.eContract.service.ITaContractService;
 import org.slf4j.Logger;
@@ -14,14 +14,14 @@ import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
-    * 合同列表  前端控制器
-    * </p>
+ * 合同列表  前端控制器
+ * </p>
  *
  * @author fxf
  * @since 2020-03-26
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaContractController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaContractController.class);
@@ -31,26 +31,81 @@ public class TaContractController extends BaseController {
 
 
     /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
+     * 条件查询合同列表
+     *
+     * @param requestBO
      * @return
      */
-    @RequestMapping(value="/taContract",method= RequestMethod.GET)
-    public ResponseBean taContractList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value = "/channel/contract/list", method = RequestMethod.GET)
+    public ResponseBean listContractForChannel(ContractRecordRequestBO requestBO) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            //使用分页插件
-		    IPage<TaContract> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaContract> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+            responseBean = iTaContractService.listContractForChannel(requestBO);
+            logger.info("TaContractController.listContractForChannel 返回结果:{}", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("TaContractController.listContractForChannel 异常：", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 
-            IPage<TaContract> result = iTaContractService.page(pg, queryWrapper);
-            responseBean.addSuccess(result);
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taContractList -=- {}",e.toString());
+    /**
+     * 批量结算前校验
+     *
+     * @return
+     */
+    @RequestMapping(value = "/channel/contract/checkBeforeBatchUpdatePrice", method = RequestMethod.GET)
+    public ResponseBean checkBeforeBatchUpdatePrice(@RequestBody TaContract taContract) {
+        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);
+        } catch (Exception e) {
+            logger.error("TaContractController.checkBeforeBatchUpdatePrice 异常：", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 批量结算
+     *
+     * @return
+     */
+    @RequestMapping(value = "/channel/contract/batchUpdatePrice", method = RequestMethod.PUT)
+    public ResponseBean batchUpdateSettlementPrice(@RequestBody TaContract taContract) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            // 校验参数
+            if (taContract.getSettlementPrice() == null) {
+                responseBean.addError("请填写结算金额");
+                return responseBean;
+            }
+
+            // 元转分
+            Integer price = taContract.getSettlementPrice() * 100;
+            taContract.getTaContractList().stream().forEach(record -> {
+                record.setSettlementPrice(price);
+            });
+            responseBean.addSuccess(iTaContractService.updateBatchById(taContract.getTaContractList()));
+
+        } catch (Exception e) {
+            logger.error("TaContractController.batchUpdateSettlementPrice 异常：", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -58,21 +113,22 @@ public class TaContractController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taContract 实体对象
      * @return
      */
-    @RequestMapping(value="/taContract",method= RequestMethod.POST)
-    public ResponseBean taContractAdd(@RequestBody TaContract taContract){
+    @RequestMapping(value = "/taContract", method = RequestMethod.POST)
+    public ResponseBean taContractAdd(@RequestBody TaContract taContract) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaContractService.save(taContract)){
+            if (iTaContractService.save(taContract)) {
                 responseBean.addSuccess(taContract);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taContractAdd -=- {}",e.toString());
+            logger.error("taContractAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -80,21 +136,22 @@ public class TaContractController extends BaseController {
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taContract/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taContractDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/taContract/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taContractDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaContractService.removeById(id)){
+            if (iTaContractService.removeById(id)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taContractDelete -=- {}",e.toString());
+            logger.error("taContractDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -102,23 +159,24 @@ public class TaContractController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id         实体ID
      * @param taContract 实体对象
      * @return
      */
-    @RequestMapping(value="/taContract/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/taContract/{id}", method = RequestMethod.PUT)
     public ResponseBean taContractUpdate(@PathVariable Integer id,
-                                        @RequestBody TaContract taContract){
+                                         @RequestBody TaContract taContract) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaContractService.updateById(taContract)){
+            if (iTaContractService.updateById(taContract)) {
                 responseBean.addSuccess(taContract);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taContractUpdate -=- {}",e.toString());
+            logger.error("taContractUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -126,16 +184,17 @@ public class TaContractController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/taContract/{id}",method= RequestMethod.GET)
-    public ResponseBean taContractGet(@PathVariable Integer id){
+    @RequestMapping(value = "/taContract/{id}", method = RequestMethod.GET)
+    public ResponseBean taContractGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaContractService.getById(id));
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taContractDelete -=- {}",e.toString());
+            logger.error("taContractDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

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

@@ -1,6 +1,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;
@@ -44,5 +45,34 @@ public class TaCompanyOrg implements Serializable {
      */
     private Integer companyId;
 
+    /**
+     * 企业名称
+     */
+    @TableField(exist = false)
+    private String companyName;
+
+    /**
+     * 企业编号
+     */
+    @TableField(exist = false)
+    private String companyNumber;
+
+    /**
+     * 实名认证状态 实名认证状态
+     */
+    @TableField(exist = false)
+    private String certifiedStatus;
+
+    /**
+     * 组织名称
+     */
+    @TableField(exist = false)
+    private String orgName;
+
+    /**
+     * 小程序名称
+     */
+    @TableField(exist = false)
+    private String miniAppName;
 
 }

src/main/java/com/huiju/estateagents/eContract/entity/TaContract.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;
@@ -134,5 +137,31 @@ public class TaContract implements Serializable {
      */
     private Integer settlementPrice;
 
+    /**
+     * 公司名
+     */
+    @TableField(exist = false)
+    private String companyName;
+
+    /**
+     * 公司编码
+     */
+    @TableField(exist = false)
+    private String companyNumber;
+
+    /**
+     * 组织名
+     */
+    @TableField(exist = false)
+    private String orgName;
+
+    /**
+     * 小程序名
+     */
+    @TableField(exist = false)
+    private String miniAppName;
+
+    @TableField(exist = false)
+    private List<TaContract> taContractList;
 
 }

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

@@ -1,8 +1,11 @@
 package com.huiju.estateagents.eContract.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.eContract.entity.TaCompany;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
 /**
  * <p>
@@ -13,6 +16,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2020-03-26
  */
 @Mapper
+@Component
 public interface TaCompanyMapper extends BaseMapper<TaCompany> {
 
 }

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

@@ -1,8 +1,11 @@
 package com.huiju.estateagents.eContract.mapper;
 
-import com.huiju.estateagents.eContract.entity.TaCompanyOrg;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.eContract.entity.TaCompanyOrg;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
 /**
  * <p>
@@ -13,6 +16,23 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2020-03-26
  */
 @Mapper
+@Component
 public interface TaCompanyOrgMapper extends BaseMapper<TaCompanyOrg> {
-
+    /**
+     * 条件查询组织列表
+     *
+     * @param pg
+     * @param companyName
+     * @param companyNumber
+     * @param certifiedStatus
+     * @param orgName
+     * @param miniAppName
+     * @return
+     */
+    IPage<TaCompanyOrg> listCompanyAndOrg(IPage<TaCompanyOrg> pg,
+                                          @Param("companyName") String companyName,
+                                          @Param("companyNumber") String companyNumber,
+                                          @Param("certifiedStatus") String certifiedStatus,
+                                          @Param("orgName") String orgName,
+                                          @Param("miniAppName") String miniAppName);
 }

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

@@ -1,8 +1,11 @@
 package com.huiju.estateagents.eContract.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.bo.request.ContractRecordRequestBO;
 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;
 
 /**
  * <p>
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaContractMapper extends BaseMapper<TaContract> {
 
+    IPage<TaContract> listContractForChannel(IPage<TaContract> pg, @Param("bo") ContractRecordRequestBO bo);
 }

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.eContract.service;
 
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.eContract.entity.TaCompanyOrg;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +14,18 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaCompanyOrgService extends IService<TaCompanyOrg> {
 
+    /**
+     * 条件查询组织和公司关联信息
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param companyName     企业名称
+     * @param companyNumber   企业编号
+     * @param certifiedStatus 实名认证状态
+     * @param orgName         组织名称
+     * @param miniAppName     小程序名称
+     * @param orgId
+     * @return
+     */
+    ResponseBean listCompanyOrg(Integer pageNum, Integer pageSize, String companyName, String companyNumber, String certifiedStatus, String orgName, String miniAppName);
 }

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

@@ -1,7 +1,11 @@
 package com.huiju.estateagents.eContract.service;
 
-import com.huiju.estateagents.eContract.entity.TaContract;
 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 java.time.LocalDateTime;
 
 /**
  * <p>
@@ -13,4 +17,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaContractService extends IService<TaContract> {
 
+    /**
+     * 条件查询合同列表
+     *
+     * @param requestBO
+     * @return
+     */
+    ResponseBean listContractForChannel(ContractRecordRequestBO requestBO);
 }

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

@@ -1,9 +1,13 @@
 package com.huiju.estateagents.eContract.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.eContract.entity.TaCompanyOrg;
 import com.huiju.estateagents.eContract.mapper.TaCompanyOrgMapper;
 import com.huiju.estateagents.eContract.service.ITaCompanyOrgService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +21,16 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaCompanyOrgServiceImpl extends ServiceImpl<TaCompanyOrgMapper, TaCompanyOrg> implements ITaCompanyOrgService {
 
+    @Autowired
+    private TaCompanyOrgMapper taCompanyOrgMapper;
+
+    public ResponseBean listCompanyOrg(Integer pageNum, Integer pageSize, String companyName, String companyNumber, String certifiedStatus, String orgName, String miniAppName) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 组装分页
+        IPage<TaCompanyOrg> pg = new Page<>(pageNum, pageSize);
+        pg = taCompanyOrgMapper.listCompanyAndOrg(pg,companyName,companyNumber,certifiedStatus,orgName,miniAppName);
+        responseBean.addSuccess(pg);
+        return responseBean;
+    }
 }

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

@@ -1,9 +1,16 @@
 package com.huiju.estateagents.eContract.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.bo.request.ContractRecordRequestBO;
 import com.huiju.estateagents.eContract.entity.TaContract;
 import com.huiju.estateagents.eContract.mapper.TaContractMapper;
 import com.huiju.estateagents.eContract.service.ITaContractService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,6 +22,21 @@ import org.springframework.stereotype.Service;
  * @since 2020-03-26
  */
 @Service
+@Slf4j
 public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContract> implements ITaContractService {
 
+    @Autowired
+    private TaContractMapper taContractMapper;
+
+    @Override
+    public ResponseBean listContractForChannel(ContractRecordRequestBO requestBO) {
+        log.info("TaContractServiceImpl.listContractForChannel 接收参数:{}", JSONObject.toJSONString(requestBO));
+
+        ResponseBean responseBean = new ResponseBean();
+
+        IPage<TaContract> pg = new Page<>(requestBO.getPageNum(), requestBO.getPageSize());
+        pg = taContractMapper.listContractForChannel(pg, requestBO);
+        responseBean.addSuccess(pg);
+        return responseBean;
+    }
 }

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

@@ -13,7 +13,7 @@ import java.time.LocalDateTime;
 
 /**
  * <p>
- * 公司表 
+ * 公司表
  * </p>
  *
  * @author jobob
@@ -57,7 +57,7 @@ public class TaOrg implements Serializable {
      */
     private LocalDateTime createDate;
 
-    @TableField(strategy= FieldStrategy.IGNORED)
+    @TableField(strategy = FieldStrategy.IGNORED)
     private String waterMark;
 
     /**
@@ -69,4 +69,10 @@ public class TaOrg implements Serializable {
      * 默认城市
      */
     private Integer defaultCityId;
+
+    /**
+     * 小程序名称
+     */
+    @TableField(exist = false)
+    private String miniAppName;
 }

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

@@ -1,8 +1,11 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaOrg;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
 /**
  * <p>
@@ -13,6 +16,10 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2019-09-11
  */
 @Mapper
+@Component
 public interface TaOrgMapper extends BaseMapper<TaOrg> {
 
+    IPage<TaOrg> listOrgForContract(IPage<TaOrg> pg,
+                                    @Param("orgName") String orgName,
+                                    @Param("miniAppName") String miniAppName);
 }

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaOrg;
 
 /**
@@ -13,4 +14,14 @@ import com.huiju.estateagents.entity.TaOrg;
  */
 public interface ITaOrgService extends IService<TaOrg> {
 
+    /**
+     * channel端-电子合同-获取组织列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param orgName
+     * @param miniAppName
+     * @return
+     */
+    ResponseBean listOrgForContract(Integer pageNum, Integer pageSize, String orgName, String miniAppName);
 }

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

@@ -1,9 +1,13 @@
 package com.huiju.estateagents.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaOrg;
 import com.huiju.estateagents.mapper.TaOrgMapper;
 import com.huiju.estateagents.service.ITaOrgService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +21,16 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaOrgServiceImpl extends ServiceImpl<TaOrgMapper, TaOrg> implements ITaOrgService {
 
+    @Autowired
+    private TaOrgMapper taOrgMapper;
+
+    @Override
+    public ResponseBean listOrgForContract(Integer pageNum, Integer pageSize, String orgName, String miniAppName) {
+        ResponseBean responseBean = new ResponseBean();
+
+        IPage<TaOrg> pg = new Page<>(pageNum, pageSize);
+        pg = taOrgMapper.listOrgForContract(pg,orgName,miniAppName);
+        responseBean.addSuccess(pg);
+        return responseBean;
+    }
 }

src/main/resources/mapper/TaOrgMapper.xml

@@ -2,4 +2,23 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaOrgMapper">
 
+    <select id="listOrgForContract" resultType="com.huiju.estateagents.entity.TaOrg">
+        SELECT
+            *,
+            t2.`name` miniAppName
+        FROM
+            ta_org t
+            LEFT JOIN ta_miniapp t2 ON t.org_id = t2.org_id
+        <where>
+            <if test = "orgName != null and orgName != ''">
+                t.`name` = #{orgName}
+            </if>
+            <if test = "miniAppName != null and miniAppName != ''">
+                AND t2.`name` = #{miniAppName}
+            </if>
+        </where>
+        ORDER BY
+            t.create_date DESC
+    </select>
+
 </mapper>

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

@@ -2,4 +2,38 @@
 <!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.TaCompanyOrgMapper">
 
+    <select id="listCompanyAndOrg" resultType="com.huiju.estateagents.eContract.entity.TaCompanyOrg">
+        SELECT
+            t.*,
+            t2.company_name,
+            t2.company_id,
+            t2.certified_status,
+            t3.`name` orgName,
+            t4.`name` miniAppName
+        FROM
+            ta_company_org t
+            LEFT JOIN ta_company t2 ON t.company_id = t2.company_id
+            LEFT JOIN ta_org t3 ON t.org_id = t3.org_id
+            LEFT JOIN ta_miniapp t4 ON t3.org_id = t4.org_id
+        WHERE
+            t2.`status` = 1
+            <if test = "companyName != null and companyName != ''">
+                AND t2.company_name like CONCAT('%',#{bo.companyName} , '%')
+            </if>
+            <if test = "companyNumber != null and companyNumber != ''">
+                AND t2.company_number like CONCAT('%',#{bo.companyNumber} , '%')
+            </if>
+            <if test = "certifiedStatus != null and certifiedStatus != ''">
+                AND t2.certified_status = #{certifiedStatus}
+            </if>
+            <if test = "orgName != null and orgName != ''">
+                AND t3.`name` like CONCAT('%',#{bo.orgName} , '%')
+            </if>
+            <if test = "miniAppName != null and miniAppName != ''">
+                AND t4.`name` like CONCAT('%',#{bo.miniAppName} , '%')
+            </if>
+        ORDER BY
+            t.create_date DESC
+    </select>
+
 </mapper>

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

@@ -2,4 +2,54 @@
 <!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="listContractForChannel" resultType="com.huiju.estateagents.eContract.entity.TaContract">
+        SELECT
+            t.*,
+            t2.company_name,
+            t2.company_number,
+            t3.`name` orgName,
+            t4.`name` miniAppName
+        FROM
+            ta_contract t
+            LEFT JOIN ta_company t2 ON t.company_id = t2.company_id
+            LEFT JOIN ta_org t3 ON t.org_id = t3.org_id
+            LEFT JOIN ta_miniapp t4 ON t.org_id = t4.org_id
+        <where>
+            <if test=" companyName != null and companyName != ''">
+                AND t2.company_name like CONCAT('%',#{bo.companyName} , '%')
+            </if>
+            <if test=" settlement != null and settlement != ''">
+                AND t.settlement = #{bo.settlement}
+            </if>
+            <if test=" companyNumber != null and companyNumber != ''">
+                AND t2.company_number like CONCAT('%',#{bo.companyNumber} , '%')
+            </if>
+            <if test=" orgName != null and orgName != ''">
+                AND t3.`name` like CONCAT('%',#{bo.orgName} , '%')
+            </if>
+            <if test=" miniAppName != null and miniAppName != ''">
+                AND t4.`name` like CONCAT('%',#{bo.miniAppName} , '%')
+            </if>
+            <if test=" contractId != null">
+                AND t.contract_id like CONCAT('%',#{bo.contractId} , '%')
+            </if>
+            <if test=" contractName != null and contractName != ''">
+                AND t.contract_name like CONCAT('%',#{bo.contractName} , '%')
+            </if>
+            <if test=" signatoryStartTime != null and signatoryStartTime != ''">
+                AND t.signatory_time &gt;= #{bo.signatoryStartTime}
+            </if>
+            <if test=" signatoryEndTime != null and signatoryEndTime != ''">
+                AND t.signatory_time &lt;= #{bo.signatoryEndTime}
+            </if>
+            <if test=" settlementStartTime != null and settlementStartTime != ''">
+                AND t.settlement_time &gt;= #{bo.settlementStartTime}
+            </if>
+            <if test=" settlementEndTime != null and settlementEndTime != ''">
+                AND t.settlement_time &lt;= #{bosettlementEndTime.}
+            </if>
+        </where>
+        ORDER BY
+            t.signatory_time DESC
+    </select>
 </mapper>