ruoyi-demo/src/main/java/com/ruoyi/demo/controller/EnterpriseRecycleController.java

@@ -0,0 +1,67 @@
+package com.ruoyi.demo.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.demo.entity.Enterprise;
+import com.ruoyi.demo.entity.vo.EnterpriseVo;
+import com.ruoyi.demo.service.EnterpriseRecycleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotBlank;
+import java.util.HashMap;
+
+@RestController
+@RequestMapping("/recycle/enterprise")
+public class EnterpriseRecycleController {
+    @Autowired
+    EnterpriseRecycleService enterpriseRecycleService;
+
+    @GetMapping("/list")
+    public R list(EnterpriseVo enterpriseVo){
+        Page<Enterprise> list = enterpriseRecycleService.list(enterpriseVo);
+        return R.ok(list);
+    }
+
+    @PostMapping("/addEnterprise")
+    public R addEnterprise(@Validated(value = {AddGroup.class}) @RequestBody EnterpriseVo enterpriseVo){
+        enterpriseRecycleService.addEnterprise(enterpriseVo);
+        return R.ok();
+    }
+
+    @DeleteMapping("/deleteEnterprise/{enterpriseUsci}")
+    public R deleteEnterprise(@PathVariable(name = "enterpriseUsci") @NotBlank(message = "enterpriseUsci不能为空") String enterpriseUsci){
+        enterpriseRecycleService.deleteEnterprise(enterpriseUsci);
+        return R.ok();
+    }
+
+    @PutMapping("/updateEnterprise")
+    public R updateEnterprise(@Validated(value = {EditGroup.class}) @RequestBody EnterpriseVo enterpriseVo){
+        enterpriseRecycleService.updateEnterprise(enterpriseVo);
+        return R.ok();
+    }
+
+    /**
+     * 恢复企业
+     * @param hashMap
+     * @return
+     */
+    @PutMapping("/recoverEnterprise")
+    public R recoverEnterprise(@RequestBody HashMap<String,String> hashMap){
+        if(hashMap.get("enterpriseUsci") == null)
+            return R.fail(400,"enterpriseUsci不能为空");
+
+        enterpriseRecycleService.recoverEnterprise(hashMap.get("enterpriseUsci"));
+        return R.ok();
+    }
+
+    @GetMapping("/getEnterprise")
+    public R getEnterprise(String enterpriseUsci){
+        Enterprise enterprise = enterpriseRecycleService.getEnterprise(enterpriseUsci);
+        return R.ok(enterprise);
+    }
+
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/Brand.java

@@ -30,6 +30,8 @@ public class Brand implements Serializable {
 
     @TableField("enterprise_usci")
     private String enterpriseUsci;
+    @TableField("enterprise_name")
+    private String enterpriseName;
 
     @TableField("per_capita_consumption")
     private Float perCapitaConsumption;

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/Enterprise.java

@@ -2,12 +2,19 @@ package com.ruoyi.demo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.demo.entity.vo.EnterpriseVo;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import net.bytebuddy.asm.Advice;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -16,6 +23,7 @@ import java.util.Date;
  * 企业
  */
 @Data
+@NoArgsConstructor
 @TableName("ddt_enterprise")
 public class Enterprise implements Serializable {
     /**
@@ -44,10 +52,15 @@ public class Enterprise implements Serializable {
     @TableField("addr_info")
     private String addrInfo;
     /**
-     * 地区信息
+     * 地区Code
      */
     @TableField("addr_code")
     private String addrCode;
+    /**
+     * 地区信息
+     */
+    @TableField("addr_code_info")
+    private String addrCodeInfo;
     /**
      * 公司简介
      */
@@ -67,7 +80,7 @@ public class Enterprise implements Serializable {
      * 注册资本
      */
     @TableField("registered_capital")
-    private BigDecimal registeredCapital;
+    private String registeredCapital;
     /**
      * 企业法人_id
      */
@@ -147,5 +160,40 @@ public class Enterprise implements Serializable {
      */
     @TableField("hash")
     private String hash;
+    /**
+     * 逻辑删除
+     */
+    @TableLogic
+    @TableField("show_delete")
+    private String showDelete;
+
 
+    public Enterprise(EnterpriseVo enterpriseVo) {
+        this.enterpriseUsci = enterpriseVo.getEnterpriseUsci();
+        this.enterpriseImg = enterpriseVo.getEnterpriseImg();
+        this.enterpriseName = enterpriseVo.getEnterpriseName();
+        this.enterpriseNameShort = enterpriseVo.getEnterpriseNameShort();
+        this.addrInfo = enterpriseVo.getAddrInfo();
+        this.addrCode = enterpriseVo.getAddrCode();
+        this.addrCodeInfo = enterpriseVo.getAddrCodeInfo();
+        this.enterpriseInfo = enterpriseVo.getEnterpriseInfo();
+        this.manageRangeInfo = enterpriseVo.getManageRangeInfo();
+        this.enterpriseScale = enterpriseVo.getEnterpriseScale();
+        this.registeredCapital = enterpriseVo.getRegisteredCapital();
+        this.linkmenId = enterpriseVo.getLinkmenId();
+        this.linkmenName = enterpriseVo.getLinkmenName();
+        this.createTime = DateUtils.getNowDate();
+        this.enterpriseItin = enterpriseVo.getEnterpriseItin();
+        this.businessStatus = enterpriseVo.getBusinessStatus();
+        this.industryCode = enterpriseVo.getIndustryCode();
+        this.enterpriseType = enterpriseVo.getEnterpriseType();
+        this.creditScore = enterpriseVo.getCreditScore();
+        this.audit = enterpriseVo.getAudit();
+        this.collectUserId = enterpriseVo.getCollectUserId();
+        this.collectPerson = enterpriseVo.getCollectPerson();
+        this.collectTime = enterpriseVo.getCollectTime();
+        this.enterTime = enterpriseVo.getEnterTime();
+        this.updateTime = enterpriseVo.getUpdateTime();
+        this.hash = enterpriseVo.getHash();
+    }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/BusinessOpportunitiesClueBo.java

@@ -13,6 +13,7 @@ public class BusinessOpportunitiesClueBo implements Serializable {
     private String attentionId;
     private String wdName;
     private String brandName;
+    private String wdAddrInfo;
     private String contact;
     private String telephone;
     private Integer followUpCount;
@@ -27,6 +28,7 @@ public class BusinessOpportunitiesClueBo implements Serializable {
         this.attentionId = clue.getAttentionId();
         this.wdName = clue.getWdName();
         this.brandName = clue.getBrandName();
+        this.wdAddrInfo = clue.getWdAddrInfo();
         this.contact = clue.getContact();
         this.telephone = clue.getTelephone();
         this.followUpCount = clue.getFollowUpCount();

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/ChannelBo.java

@@ -2,9 +2,14 @@ package com.ruoyi.demo.entity.bo;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class ChannelBo {
     int pageSize = 10;
     int pageNum = 1;
     private String text;
+    private String[] typeCodeBys;
+    private String[] addrCodes;
+    private BigDecimal[] indexScore;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/BrandVo.java

@@ -21,6 +21,8 @@ public class BrandVo implements Serializable {
 
     private String enterpriseUsci;
 
+    private String enterpriseName;
+
     private Float perCapitaConsumption;
 
     private Long commentCount;

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/ChannelVo.java

@@ -3,6 +3,7 @@ package com.ruoyi.demo.entity.vo;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 @Data
 public class ChannelVo implements Serializable {
@@ -10,6 +11,12 @@ public class ChannelVo implements Serializable {
 
     private String wdName;
 
+    private String typeNameBy;
+
+    private String addrInfo;
+
+    private BigDecimal indexScore;
+
     private String contact;
 
     private String telephone;

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/EnterpriseVo.java

@@ -0,0 +1,140 @@
+package com.ruoyi.demo.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.demo.utils.HashUtil;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class EnterpriseVo {
+    /**
+     * 统一社会信用代码
+     */
+    @NotBlank(message = "enterpriseUsci不能为空",groups = {AddGroup.class, EditGroup.class})
+    private String enterpriseUsci;
+    /**
+     * 企业图片
+     */
+    private String enterpriseImg;
+    /**
+     * 企业名称
+     */
+    @NotBlank(message = "enterpriseName不能为空",groups = {AddGroup.class, EditGroup.class})
+    private String enterpriseName;
+    /**
+     * 企业简称
+     */
+    private String enterpriseNameShort;
+    /**
+     * 地址信息
+     */
+    @NotBlank(message = "地址信息不能为空",groups = {AddGroup.class, EditGroup.class})
+    private String addrInfo;
+    /**
+     * 地区Code
+     */
+    @NotBlank(message = "地区Code不能为空",groups = {AddGroup.class, EditGroup.class})
+    private String addrCode;
+    /**
+     * 地区信息
+     */
+    @NotBlank(message = "地区信息不能为空",groups = {AddGroup.class, EditGroup.class})
+    private String addrCodeInfo;
+    /**
+     * 公司简介
+     */
+    private String enterpriseInfo;
+    /**
+     * 经营范围描述
+     */
+    private String manageRangeInfo;
+    /**
+     * 企业规模
+     */
+    private String enterpriseScale;
+    /**
+     * 注册资本
+     */
+    private String registeredCapital;
+    /**
+     * 企业法人_id
+     */
+    private String linkmenId;
+    /**
+     * 法定代表人名字
+     */
+    private String linkmenName;
+    /**
+     * 成立日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    /**
+     * 纳税人识别号
+     */
+    @NotBlank(message = "纳税人识别号不能为空",groups = {AddGroup.class, EditGroup.class})
+    private String enterpriseItin;
+    /**
+     * 经营状态：存续、在业、吊销、注销、迁入、迁出、停业、清算
+     */
+    @NotBlank(message = "经营状态不能为空",groups = {AddGroup.class, EditGroup.class})
+    private String businessStatus;
+    /**
+     * 行业分类（关联行业分类表）
+     */
+    private String industryCode;
+    /**
+     * 企业类型：有限责任公司; 股份公司；股份有限公司
+     */
+    @NotBlank(message = "企业类型不能为空",groups = {AddGroup.class, EditGroup.class})
+    private String enterpriseType;
+    /**
+     * 信用评分
+     */
+    private int creditScore;
+    /**
+     * 验证状态
+     */
+    private int audit;
+    /**
+     * 采集人用户id
+     */
+    private String collectUserId;
+    /**
+     * 采集人
+     */
+    private String collectPerson;
+    /**
+     * 采集时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date collectTime;
+    /**
+     * 入库时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date enterTime;
+    /**
+     * 最近更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+    /**
+     * Hash
+     */
+    private String hash;
+    private Integer showDelete;
+    int pageNum = 1;
+
+    int pageSize = 10;
+
+    public String getHash(){
+        String s = enterpriseUsci+enterpriseName+enterpriseItin+enterpriseScale;
+        return HashUtil.hash(s,"MD5");
+    }
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/EnterpriseMapper.java

@@ -1,9 +1,17 @@
 package com.ruoyi.demo.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.demo.entity.Enterprise;
+import com.ruoyi.demo.entity.vo.EnterpriseVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface EnterpriseMapper extends BaseMapper<Enterprise> {
+    void recoverEnterprise(String enterpriseUsci);
+
+    Page<Enterprise> list(Page<Enterprise> page, @Param("enterprise")EnterpriseVo enterpriseVo);
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/EnterpriseRecycleService.java

@@ -0,0 +1,19 @@
+package com.ruoyi.demo.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.demo.entity.Enterprise;
+import com.ruoyi.demo.entity.vo.EnterpriseVo;
+
+public interface EnterpriseRecycleService {
+    Page<Enterprise> list(EnterpriseVo enterpriseVo);
+
+    void deleteEnterprise(String enterpriseUsci);
+
+    void addEnterprise(EnterpriseVo enterpriseVo);
+
+    void updateEnterprise(EnterpriseVo enterpriseVo);
+
+    void recoverEnterprise(String enterpriseUsci);
+
+    Enterprise getEnterprise(String enterpriseUsci);
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/BrandRecycleServiceImpl.java

@@ -30,7 +30,6 @@ public class BrandRecycleServiceImpl implements BrandRecycleService {
     @Override
     public void deleteBrand(String brandId) {
         int i = brandMapper.deleteById(brandId);
-        return;
     }
 
     @Override

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/BrandServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.demo.entity.*;
 import com.ruoyi.demo.entity.bo.*;
 import com.ruoyi.demo.entity.vo.*;
@@ -590,6 +591,7 @@ public class BrandServiceImpl implements BrandService {
             .set("brand_name",brandVo.getBrandName())
             .set("industry_code",brandVo.getIndustryCode())
             .set("enterprise_usci",brandVo.getEnterpriseUsci())
+            .set("enterprise_name",brandVo.getEnterpriseName())
             .set("per_capita_consumption",brandVo.getPerCapitaConsumption())
             .set("comment_count",brandVo.getCommentCount())
             .set("score",brandVo.getScore())
@@ -597,7 +599,8 @@ public class BrandServiceImpl implements BrandService {
             .set("index_score",brandVo.getIndexScore())
             .set("contact",brandVo.getContact())
             .set("telephone",brandVo.getTelephone())
-            .set("create_date",brandVo.getCreateDate());
+            .set("create_date",brandVo.getCreateDate())
+            .set("update_time", DateUtils.getTime());
         brandMapper.update(null,updateWrapper);
     }
 

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/EnterpriseRecycleServiceImpl.java

@@ -0,0 +1,73 @@
+package com.ruoyi.demo.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.demo.entity.Enterprise;
+import com.ruoyi.demo.entity.vo.EnterpriseVo;
+import com.ruoyi.demo.mapper.EnterpriseMapper;
+import com.ruoyi.demo.service.EnterpriseRecycleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class EnterpriseRecycleServiceImpl implements EnterpriseRecycleService {
+    @Autowired
+    EnterpriseMapper enterpriseMapper;
+    @Override
+    public Page<Enterprise> list(EnterpriseVo enterpriseVo) {
+        Page<Enterprise> page = new Page<>(enterpriseVo.getPageNum(), enterpriseVo.getPageSize());
+        Page<Enterprise> enterprisePage = enterpriseMapper.list(page, enterpriseVo);
+        return enterprisePage;
+    }
+
+    @Override
+    public void deleteEnterprise(String enterpriseUsci) {
+        enterpriseMapper.deleteById(enterpriseUsci);
+    }
+
+    @Override
+    public void addEnterprise(EnterpriseVo enterpriseVo) {
+        Enterprise enterprise = new Enterprise(enterpriseVo);
+        enterpriseMapper.insert(enterprise);
+    }
+
+    @Override
+    public void updateEnterprise(EnterpriseVo enterpriseVo) {
+        UpdateWrapper<Enterprise> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("enterprise_usci",enterpriseVo.getEnterpriseUsci())
+            .set("enterprise_img",enterpriseVo.getEnterpriseImg())
+            .set("enterprise_name",enterpriseVo.getEnterpriseName())
+            .set("enterprise_name_short",enterpriseVo.getEnterpriseNameShort())
+            .set("addr_info",enterpriseVo.getAddrInfo())
+            .set("addr_code",enterpriseVo.getAddrCode())
+            .set("addr_code_info",enterpriseVo.getAddrCodeInfo())
+            .set("enterprise_info",enterpriseVo.getEnterpriseInfo())
+            .set("manage_range_info",enterpriseVo.getManageRangeInfo())
+            .set("enterprise_scale",enterpriseVo.getEnterpriseScale())
+            .set("registered_capital",enterpriseVo.getRegisteredCapital())
+            .set("linkmen_id",enterpriseVo.getLinkmenId())
+            .set("linkmen_name",enterpriseVo.getLinkmenName())
+            .set("create_time",enterpriseVo.getCreateTime())
+            .set("enterprise_itin",enterpriseVo.getEnterpriseItin())
+            .set("business_status",enterpriseVo.getBusinessStatus())
+            .set("industry_code",enterpriseVo.getIndustryCode())
+            .set("enterprise_type",enterpriseVo.getEnterpriseType())
+            .set("credit_score",enterpriseVo.getCreditScore())
+            .set("hash",enterpriseVo.getHash())
+            .set("update_time", DateUtils.getTime());
+
+        enterpriseMapper.update(null,updateWrapper);
+    }
+
+    @Override
+    public void recoverEnterprise(String enterpriseUsci) {
+        enterpriseMapper.recoverEnterprise(enterpriseUsci);
+    }
+
+    @Override
+    public Enterprise getEnterprise(String enterpriseUsci) {
+        return enterpriseMapper.selectById(enterpriseUsci);
+    }
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/WdInfoServiceImpl.java

@@ -149,8 +149,8 @@ public class WdInfoServiceImpl implements WdInfoService {
     @Override
     public Page<ChannelVo> searchChannel(ChannelBo bo) {
         QueryWrapper<WdInfo> wdInfoQueryWrapper = new QueryWrapper<>();
-         wdInfoQueryWrapper.ne("dsw.channel_type", "无");
-        if (bo.getText() != null){
+        wdInfoQueryWrapper.ne("dsw.channel_type", "无");
+        if (bo.getText() != null) {
             wdInfoQueryWrapper.and(wrapper -> {
                 wrapper.like("dwi.wd_name", bo.getText())
                     .or()
@@ -159,28 +159,59 @@ public class WdInfoServiceImpl implements WdInfoService {
                     .like("dsw.telephone", bo.getText());
             });
         }
+        // 网点分类（犇云）
+        List<String> types = new ArrayList<>();
+        if (bo.getTypeCodeBys() != null)
+            if (bo.getTypeCodeBys().length > 0) {
+                for (String type : bo.getTypeCodeBys())
+                    types.addAll(categoryUtil.getAllOtherTypeBy(type));
+            } else
+                types = null;
+        else types = null;
+        if (types != null)
+            wdInfoQueryWrapper.in("type_code_by", types);
+
+        // 地区码
+        List<String> addrs = new ArrayList<>();
+        if (bo.getAddrCodes() != null)
+            if (bo.getAddrCodes().length > 0) {
+                for (String addr : bo.getAddrCodes())
+                    addrs.addAll(categoryUtil.getAllOtherAddrCode(addr));
+            } else
+                addrs = null;
+        else addrs = null;
+        if (addrs != null)
+            wdInfoQueryWrapper.in("addr_code", addrs);
+
+        // 潜力值
+        if (bo.getIndexScore() != null)
+            if (bo.getIndexScore().length == 2)
+                wdInfoQueryWrapper.ge("index_score", bo.getIndexScore()[0])
+                    .le("index_score", bo.getIndexScore()[1]);
+
         Page<WdInfo> page = new Page<>(bo.getPageNum(), bo.getPageSize());
         return wdInfoMapper.selectChannel(page, wdInfoQueryWrapper);
     }
 
     /**
      * 修改网点基本信息
+     *
      * @param wdInfoVo
      */
     @Override
     public void updateWdInfo(WdInfoVo wdInfoVo) {
         //1.修改网点基本信息
         UpdateWrapper<WdInfo> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("wd_id",wdInfoVo.getWdId())
-            .set("wd_name",wdInfoVo.getWdName())
-            .set("addr_info",wdInfoVo.getAddrInfo())
-            .set("addr_code",wdInfoVo.getAddrCode())
-            .set("lat",wdInfoVo.getLat())
-            .set("lng",wdInfoVo.getLng())
-            .set("type_code_by",wdInfoVo.getTypeCodeBy())
-            .set("type_name_by",wdInfoVo.getTypeNameBy())
+        updateWrapper.eq("wd_id", wdInfoVo.getWdId())
+            .set("wd_name", wdInfoVo.getWdName())
+            .set("addr_info", wdInfoVo.getAddrInfo())
+            .set("addr_code", wdInfoVo.getAddrCode())
+            .set("lat", wdInfoVo.getLat())
+            .set("lng", wdInfoVo.getLng())
+            .set("type_code_by", wdInfoVo.getTypeCodeBy())
+            .set("type_name_by", wdInfoVo.getTypeNameBy())
             .set("update_time", DateUtils.getTime());
-        wdInfoMapper.update(null,updateWrapper);
+        wdInfoMapper.update(null, updateWrapper);
 
     }
 }

ruoyi-demo/src/main/resources/mapper/demo/BrandMapper.xml

@@ -81,15 +81,15 @@
     <select id="list" parameterType="com.ruoyi.demo.entity.vo.BrandVo" resultType="com.ruoyi.demo.entity.Brand">
         select * from ddt_brand
         <where>
-            <if test="brand.brandName != null and brand.brandName != ''">
-                and brand_name like concat('%',#{brand.brandName},'%')
-            </if>
             <if test="brand.showDelete != -1">
                 and show_delete = #{brand.showDelete}
             </if>
             <if test="brand.industryCode != null and brand.industryCode != ''">
                 and industry_code = #{brand.industryCode}
             </if>
+            <if test="brand.brandName != null and brand.brandName != ''">
+                and brand_name like concat('%',#{brand.brandName},'%')
+            </if>
         </where>
     </select>
     <update id="recoverBrand" parameterType="java.lang.String" >

ruoyi-demo/src/main/resources/mapper/demo/EnterpriseMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.demo.mapper.EnterpriseMapper">
+    <update id="recoverEnterprise" parameterType="java.lang.String">
+        update ddt_enterprise set show_delete = 0 where enterprise_usci = #{enterpriseUsci}
+    </update>
+    <select id="list" parameterType="com.ruoyi.demo.entity.vo.EnterpriseVo" resultType="com.ruoyi.demo.entity.Enterprise">
+        select * from ddt_enterprise
+        <where>
+            <if test="enterprise.enterpriseUsci != null and enterprise.enterpriseUsci != ''">
+                and enterprise_usci = #{enterprise.enterpriseUsci}
+            </if>
+            <if test="enterprise.addrCode != null and enterprise.addrCode != ''">
+                and addr_code = #{enterprise.addrCode}
+            </if>
+            <if test="enterprise.showDelete != null">
+                and show_delete = #{enterprise.showDelete}
+            </if>
+            <if test="enterprise.enterpriseName != null and enterprise.enterpriseName != ''">
+                and enterprise_name like concat('%',#{enterprise.enterpriseName},'%')
+            </if>
+        </where>
+    </select>
+</mapper>

ruoyi-demo/src/main/resources/mapper/demo/WdInfoMapper.xml

@@ -60,6 +60,9 @@
         SELECT
             dwi.wd_img,
             dwi.wd_name,
+            dwi.addr_info,
+            dwi.type_name_by,
+            dsw.index_score,
             dsw.contact,
             dsw.telephone,
             channel_type