修改企业回收站数据校验

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

@@ -166,7 +166,10 @@ public class Enterprise implements Serializable {
     @TableLogic
     @TableField("show_delete")
     private String showDelete;
-
+    @TableField("management_model")
+    private String managementModel;
+    @TableField("supplier")
+    private String supplier;
 
     public Enterprise(EnterpriseVo enterpriseVo) {
         this.enterpriseUsci = enterpriseVo.getEnterpriseUsci();
@@ -195,5 +198,7 @@ public class Enterprise implements Serializable {
         this.enterTime = enterpriseVo.getEnterTime();
         this.updateTime = enterpriseVo.getUpdateTime();
         this.hash = enterpriseVo.getHash();
+        this.managementModel = enterpriseVo.getManagementModel();
+        this.supplier = enterpriseVo.getSupplier();
     }
 }

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

@@ -40,10 +40,11 @@ public class BrandInfo implements Serializable {
             this.addrCode = enterprise.getAddrCode();
             this.addrInfo = enterprise.getAddrInfo();
         }
-        this.enterpriseName = brand.getBrandName();
         this.contact = brand.getContact();
         this.telephone = brand.getTelephone();
         this.updateTime = brand.getUpdateTime();
+        this.enterpriseUsci = brand.getEnterpriseUsci();
+        this.enterpriseName = brand.getEnterpriseName();
         this.attention = 0;
     }
 }

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

@@ -13,6 +13,7 @@ public class BrandSearch implements Serializable {
     private String brandImg;
     private Float indexScore;
     private String enterpriseName;
+    private String enterpriseUsci;
     private Integer coverCityCount;
     private Integer total;
     private Integer attention;

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

@@ -72,7 +72,7 @@ public class EnterpriseVo {
     /**
      * 成立日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
     /**
      * 纳税人识别号
@@ -126,6 +126,9 @@ public class EnterpriseVo {
      */
     private String hash;
     private Integer showDelete;
+
+    private String managementModel;
+    private String supplier;
     int pageNum = 1;
 
     int pageSize = 10;

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

@@ -309,10 +309,6 @@ public class BrandServiceImpl implements BrandService {
         // 赋予attention字段信息，0：未关注；1：已关注
         if (userId == null || userId.equals("")) { // 用户未登录或无效用户id，都是未关注状态
             for (BrandSearch search : brandSearches.getRecords()) {
-                QueryWrapper<Enterprise> enterpriseQueryWrapper = new QueryWrapper<>();
-                enterpriseQueryWrapper.eq("enterprise_usci", search.getEnterpriseName());
-                Enterprise enterprise = enterpriseMapper.selectOne(enterpriseQueryWrapper);
-                search.setEnterpriseName(enterprise != null ? enterprise.getEnterpriseName() : null);
                 search.setAttention(0);
             }
         } else { // 否则，根据用户潜客池，赋予字段相应的值
@@ -321,10 +317,6 @@ public class BrandServiceImpl implements BrandService {
             for (AttentionPool pool : pools)
                 map.put(pool.getBrandId(), "1");
             for (BrandSearch search : brandSearches.getRecords()) {
-                QueryWrapper<Enterprise> enterpriseQueryWrapper = new QueryWrapper<>();
-                enterpriseQueryWrapper.eq("enterprise_usci", search.getEnterpriseName());
-                Enterprise enterprise = enterpriseMapper.selectOne(enterpriseQueryWrapper);
-                search.setEnterpriseName(enterprise != null ? enterprise.getEnterpriseName() : null);
                 search.setAttention(map.get(search.getBrandId()) == null ? 0 : 1);
             }
         }

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

@@ -63,6 +63,8 @@ public class EnterpriseRecycleServiceImpl implements EnterpriseRecycleService {
             .set("enterprise_type",enterpriseVo.getEnterpriseType())
             .set("credit_score",enterpriseVo.getCreditScore())
             .set("hash",enterpriseVo.getHash())
+            .set("management_model",enterpriseVo.getManagementModel())
+            .set("supplier",enterpriseVo.getSupplier())
             .set("update_time", DateUtils.getTime());
 
         enterpriseMapper.update(null,updateWrapper);

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

@@ -30,7 +30,8 @@
         <result property="brandImg" column="brand_img"/>
         <result property="brandName" column="brand_name"/>
         <result property="indexScore" column="index_score"/>
-        <result property="enterpriseName" column="enterprise_usci"/>
+        <result property="enterpriseName" column="enterprise_name"/>
+        <result property="enterpriseUsci" column="enterprise_usci"/>
         <result property="coverCityCount" column="cover_city_count"/>
         <result property="total" column="total"/>
         <result property="updateTime" column="update_time"/>
@@ -48,6 +49,7 @@
             db.brand_name as brand_name,
             brand_img,
             enterprise_usci,
+            enterprise_name,
             index_score,
             cover_city_count,
             total,