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

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

@@ -7,6 +7,8 @@ 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.eContract.entity.TaCompanySeal;
+import com.huiju.estateagents.eContract.service.ITaCompanySealService;
 import com.huiju.estateagents.config.FadadaProperties;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -23,6 +25,7 @@ import com.huiju.estateagents.eContract.entity.TaCompany;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * <p>
@@ -44,6 +47,8 @@ public class TaCompanyController extends BaseController {
     @Autowired
     public ITaCompanyService iTaCompanyService;
 
+    @Autowired
+    private ITaCompanySealService iTaCompanySealService;
 
     /**
      * 条件查询企业列表
@@ -80,6 +85,44 @@ public class TaCompanyController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 条件查询企业列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param companyName
+     * @return
+     */
+    @RequestMapping(value = "/admin/taCompanyList", method = RequestMethod.GET)
+    public ResponseBean companyList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                   String companyName, String companyCode) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaCompany> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaCompany> queryWrapper = new QueryWrapper<>();
+            queryWrapper.like(StringUtils.isNotBlank(companyName), "company_name", companyName);
+            queryWrapper.like(StringUtils.isNotBlank(companyCode), "company_code", companyCode);
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaCompany> result = iTaCompanyService.page(pg, queryWrapper);
+            List<TaCompany> taCompanyList = result.getRecords();
+            for (TaCompany taCompany : taCompanyList){
+                QueryWrapper<TaCompanySeal> sealQueryWrapper = new QueryWrapper<>();
+                sealQueryWrapper.eq("company_id", taCompany.getCompanyId());
+                taCompany.setSealNum(iTaCompanySealService.count(sealQueryWrapper));
+            }
+            responseBean.addSuccess(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 保存对象
      *

src/main/java/com/huiju/estateagents/eContract/controller/TaCompanySealController.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.TaCompanySeal;
 import com.huiju.estateagents.eContract.service.ITaCompanySealService;
 import org.slf4j.Logger;
@@ -21,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2020-03-26
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaCompanySealController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaCompanySealController.class);
@@ -36,14 +37,16 @@ public class TaCompanySealController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taCompanySeal",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taCompanySeal",method= RequestMethod.GET)
     public ResponseBean taCompanySealList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          @RequestParam(value ="sealName", required = false) String sealName){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaCompanySeal> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaCompanySeal> queryWrapper = new QueryWrapper<>();
+            queryWrapper.like(!StringUtils.isEmpty(sealName), "seal_name", sealName);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaCompanySeal> result = iTaCompanySealService.page(pg, queryWrapper);

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.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.eContract.entity.TaContractBusiness;
 import com.huiju.estateagents.eContract.service.ITaContractBusinessService;
@@ -80,6 +81,17 @@ public class TaContractBusinessController extends BaseController {
     public ResponseBean taContractBusinessAdd(@RequestBody TaContractBusiness taContractBusiness, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            Integer targetId = taContractBusiness.getTargetId();
+            QueryWrapper<TaContractBusiness> taContractBusinessQueryWrapper = new QueryWrapper<>();
+            taContractBusinessQueryWrapper.eq("org_id", getOrgId(request));
+            taContractBusinessQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            taContractBusinessQueryWrapper.eq("target_id", targetId);
+            Integer contractBusinessNum = iTaContractBusinessService.count(taContractBusinessQueryWrapper);
+            if (contractBusinessNum > 0){
+                responseBean.addError("所选业务已有发布的业务配置，无法再新增已发布的业务配置");
+                return responseBean;
+            }
+
             taContractBusiness.setOrgId(getOrgId(request));
             taContractBusiness.setCreateDate(LocalDateTime.now());
             taContractBusiness.setUpdateDate(LocalDateTime.now());
@@ -124,11 +136,24 @@ public class TaContractBusinessController extends BaseController {
      * @param taContractBusiness 实体对象
      * @return
      */
-    @RequestMapping(value="/taContractBusiness/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/taContractBusiness/{id}",method= RequestMethod.PUT)
     public ResponseBean taContractBusinessUpdate(@PathVariable Integer id,
-                                        @RequestBody TaContractBusiness taContractBusiness){
+                                        @RequestBody TaContractBusiness taContractBusiness, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            Integer targetId = taContractBusiness.getTargetId();
+            QueryWrapper<TaContractBusiness> taContractBusinessQueryWrapper = new QueryWrapper<>();
+            taContractBusinessQueryWrapper.eq("org_id", getOrgId(request));
+            taContractBusinessQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            taContractBusinessQueryWrapper.eq("target_id", targetId);
+            taContractBusinessQueryWrapper.ne("contract_business_id", id);
+            Integer contractBusinessNum = iTaContractBusinessService.count(taContractBusinessQueryWrapper);
+            if (contractBusinessNum > 0){
+                responseBean.addError("所选业务已有发布的业务配置，无法再新增已发布的业务配置");
+                return responseBean;
+            }
+
+            taContractBusiness.setContractBusinessId(id);
             if (iTaContractBusinessService.updateById(taContractBusiness)){
                 responseBean.addSuccess(taContractBusiness);
             }else {
@@ -146,7 +171,7 @@ public class TaContractBusinessController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taContractBusiness/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taContractBusiness/{id}",method= RequestMethod.GET)
     public ResponseBean taContractBusinessGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {

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

@@ -5,6 +5,8 @@ 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 com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.eContract.entity.TaContractTemplate;
 import com.huiju.estateagents.eContract.service.ITaContractTemplateService;
 import org.slf4j.Logger;
@@ -12,6 +14,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 合同模板  前端控制器
@@ -21,7 +25,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2020-03-26
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaContractTemplateController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaContractTemplateController.class);
@@ -36,14 +40,19 @@ public class TaContractTemplateController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taContractTemplate",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taContractTemplate",method= RequestMethod.GET)
     public ResponseBean taContractTemplateList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                               @RequestParam(value ="contractTemplateName", required = false) String contractTemplateName,
+                                               HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaContractTemplate> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaContractTemplate> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id", getOrgId(request));
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.like(!StringUtils.isEmpty(contractTemplateName),"contract_template_name", contractTemplateName);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaContractTemplate> result = iTaContractTemplateService.page(pg, queryWrapper);
@@ -128,8 +137,8 @@ public class TaContractTemplateController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taContractTemplate/{id}",method= RequestMethod.GET)
-    public ResponseBean taContractTemplateGet(@PathVariable Integer id){
+    @RequestMapping(value="/admin/taContractTemplate/{id}",method= RequestMethod.GET)
+    public ResponseBean taContractTemplateGet(@PathVariable String id){
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaContractTemplateService.getById(id));

src/main/java/com/huiju/estateagents/eContract/entity/TaCompany.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;
@@ -164,5 +165,6 @@ public class TaCompany implements Serializable {
      */
     private String authorizeViewUrl;
 
-
+    @TableField(exist = false)
+    private Integer sealNum;
 }