bug fix

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

@@ -5,6 +5,7 @@ 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.StringUtils;
 import com.huiju.estateagents.eContract.entity.TaContractBusiness;
 import com.huiju.estateagents.eContract.service.ITaContractBusinessService;
 import org.slf4j.Logger;
@@ -12,6 +13,9 @@ 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>
     * 合同与业务关系表  前端控制器
@@ -21,7 +25,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2020-03-26
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaContractBusinessController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaContractBusinessController.class);
@@ -36,16 +40,27 @@ public class TaContractBusinessController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taContractBusiness",method= RequestMethod.GET)
-    public ResponseBean taContractBusinessList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value="/admin/taContractBusiness",method= RequestMethod.GET)
+    public ResponseBean taContractBusinessList(@RequestParam(value ="contractName", required = false) String contractName,
+                                               @RequestParam(value ="targetType", required = false) String targetType,
+                                               @RequestParam(value ="targetName", required = false) String targetName,
+                                               @RequestParam(value ="companyName", required = false) String companyName,
+                                               @RequestParam(value ="status", required = false) Integer status,
+                                               @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                               HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            //使用分页插件
-		    IPage<TaContractBusiness> pg = new Page<>(pageNum, pageSize);
+            Integer orgId = getOrgId(request);
+            IPage<TaContractBusiness> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaContractBusiness> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id", orgId);
+            queryWrapper.like(!StringUtils.isEmpty(contractName), "contract_template_name", contractName);
+            queryWrapper.eq(!StringUtils.isEmpty(targetType), "target_type", targetType);
+            queryWrapper.like(!StringUtils.isEmpty(targetName), "target_name", targetName);
+            queryWrapper.like(!StringUtils.isEmpty(companyName), "company_name", companyName);
+            queryWrapper.eq(status != null, "status", status);
             queryWrapper.orderByDesc("create_date");
-
             IPage<TaContractBusiness> result = iTaContractBusinessService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
         }catch (Exception e){
@@ -61,10 +76,13 @@ public class TaContractBusinessController extends BaseController {
      * @param taContractBusiness 实体对象
      * @return
      */
-    @RequestMapping(value="/taContractBusiness",method= RequestMethod.POST)
-    public ResponseBean taContractBusinessAdd(@RequestBody TaContractBusiness taContractBusiness){
+    @RequestMapping(value="/admin/taContractBusiness",method= RequestMethod.POST)
+    public ResponseBean taContractBusinessAdd(@RequestBody TaContractBusiness taContractBusiness, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            taContractBusiness.setOrgId(getOrgId(request));
+            taContractBusiness.setCreateDate(LocalDateTime.now());
+            taContractBusiness.setUpdateDate(LocalDateTime.now());
             if (iTaContractBusinessService.save(taContractBusiness)){
                 responseBean.addSuccess(taContractBusiness);
             }else {

src/main/java/com/huiju/estateagents/eContract/entity/TaContractBusiness.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;
@@ -34,6 +35,11 @@ public class TaContractBusiness implements Serializable {
      */
     private String contractTemplateId;
 
+    /**
+     * 合同模板名称
+     */
+    private String contractTemplateName;
+
     /**
      * 业务类型 raise房源认筹
      */
@@ -44,16 +50,31 @@ public class TaContractBusiness implements Serializable {
      */
     private Integer targetId;
 
+    /**
+     * 业务名称
+     */
+    private String targetName;
+
     /**
      * 企业id
      */
     private Integer companyId;
 
+    /**
+     * 企业标题
+     */
+    private String companyName;
+
     /**
      * 创建时间
      */
     private LocalDateTime createDate;
 
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+
     /**
      * 公司id
      */
@@ -89,5 +110,4 @@ public class TaContractBusiness implements Serializable {
      */
     private Integer status;
 
-
 }